svn commit: r1485597 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
Author: rmannibucau
Date: Thu May 23 07:27:49 2013
New Revision: 1485597
URL: http://svn.apache.org/r1485597
Log:
cdi extension events shouldn't be propagated to parent extensions in an ear
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java?rev=1485597&r1=1485596&r2=1485597&view=diff
==
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
Thu May 23 07:27:49 2013
@@ -22,6 +22,7 @@ import org.apache.webbeans.container.Bea
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.event.EventMetadata;
import org.apache.webbeans.util.ClassUtil;
+import org.apache.webbeans.util.WebBeansUtil;
import javax.el.ELResolver;
import javax.el.ExpressionFactory;
@@ -30,6 +31,7 @@ import javax.enterprise.context.spi.Cont
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.ObserverMethod;
@@ -51,23 +53,31 @@ public class WebappBeanManager extends B
@Override
public void fireEvent(final Object event, final EventMetadata metadata) {
-if (ClassUtil.isDefinitionContainsTypeVariables(event.getClass())) {
+final Class eventClass = event.getClass();
+
if(ClassUtil.isDefinitionContainsTypeVariables(ClassUtil.getClass(metadata.getType(
{
throw new IllegalArgumentException("Event class : " +
event.getClass().getName() + " can not be defined as generic type");
}
getNotificationManager().fireEvent(event, metadata);
-getParentBm().getNotificationManager().fireEvent(event, metadata);
+if (isEvent(eventClass)) {
+getParentBm().getNotificationManager().fireEvent(event, metadata);
+}
}
@Override
public Set> resolveObserverMethods(T event,
EventMetadata metadata) {
+final Class eventClass = event.getClass();
if(ClassUtil.isDefinitionContainsTypeVariables(ClassUtil.getClass(metadata.getType(
{
-throw new IllegalArgumentException("Event type can not contain
type variables. Event class is : " + event.getClass());
+throw new IllegalArgumentException("Event type can not contain
type variables. Event class is : " + eventClass);
}
final Set> set = new
HashSet>();
set.addAll(getNotificationManager().resolveObservers(event, metadata));
-
set.addAll(getParentBm().getNotificationManager().resolveObservers(event,
metadata));
+
+if (isEvent(eventClass)) {
+
set.addAll(getParentBm().getNotificationManager().resolveObservers(event,
metadata));
+} // else nothing since extensions are loaded by classloader so we
already have it
+
return set;
}
@@ -262,4 +272,8 @@ public class WebappBeanManager extends B
public void beforeStop() {
// no-op
}
+
+private static boolean isEvent(final Class eventClass) {
+return !WebBeansUtil.isDefaultExtensionBeanEventType(eventClass) &&
!WebBeansUtil.isExtensionEventType(eventClass);
+}
}
buildbot success in ASF Buildbot on tomee-trunk-ubuntu
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/387 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomee/tomee/trunk] 1485586 Blamelist: rmannibucau Build succeeded! sincerely, -The Buildbot
[jira] [Created] (TOMEE-946) rest in ear can lead to NPE
Romain Manni-Bucau created TOMEE-946: Summary: rest in ear can lead to NPE Key: TOMEE-946 URL: https://issues.apache.org/jira/browse/TOMEE-946 Project: TomEE Issue Type: Improvement Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 1.6.0 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1485773 - /tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Author: rmannibucau
Date: Thu May 23 16:40:34 2013
New Revision: 1485773
URL: http://svn.apache.org/r1485773
Log:
TOMEE-946 avoiding npe for rest integration and ears
Modified:
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Modified:
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1485773&r1=1485772&r2=1485773&view=diff
==
---
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
(original)
+++
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Thu May 23 16:40:34 2013
@@ -623,6 +623,10 @@ public abstract class RESTService implem
for (final EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) {
if (bean.restService) {
final BeanContext beanContext =
containerSystem.getBeanContext(bean.ejbDeploymentId);
+if (beanContext == null) { // ear
+continue;
+}
+
if
(containsJaxRsConfiguration(beanContext.getProperties())) {
appInfo.properties.setProperty(OPENEJB_USE_APPLICATION_PROPERTY, "false");
logOldDeploymentUsage(bean.ejbClass);
@@ -653,7 +657,9 @@ public abstract class RESTService implem
final Map restEjbs = new HashMap();
for (final WebAppInfo webApp : appInfo.webApps) {
for (final String ejb : webApp.ejbRestServices) {
-restEjbs.put(ejb, new EJBRestServiceInfo(webApp.contextRoot,
beanContexts.get(ejb)));
+if (beanContexts.containsKey(ejb)) {
+restEjbs.put(ejb, new
EJBRestServiceInfo(webApp.contextRoot, beanContexts.get(ejb)));
+} // else ear probably
}
}
for (final Map.Entry ejbs :
beanContexts.entrySet()) {
[jira] [Resolved] (TOMEE-946) rest in ear can lead to NPE
[ https://issues.apache.org/jira/browse/TOMEE-946?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-946. -- Resolution: Fixed > rest in ear can lead to NPE > --- > > Key: TOMEE-946 > URL: https://issues.apache.org/jira/browse/TOMEE-946 > Project: TomEE > Issue Type: Improvement >Reporter: Romain Manni-Bucau >Assignee: Romain Manni-Bucau > Fix For: 1.6.0 > > -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1485786 - /tomee/tomee/trunk/pom.xml
Author: andygumbrecht
Date: Thu May 23 17:45:51 2013
New Revision: 1485786
URL: http://svn.apache.org/r1485786
Log:
Use property
Modified:
tomee/tomee/trunk/pom.xml
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1485786&r1=1485785&r2=1485786&view=diff
==
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu May 23 17:45:51 2013
@@ -90,7 +90,7 @@
-4.6.0-SNAPSHOT
+${project.version}
1.6.0-SNAPSHOT
buildbot failure in ASF Buildbot on tomee-trunk-ubuntu
The Buildbot has detected a new failure on builder tomee-trunk-ubuntu while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomee-trunk-ubuntu/builds/390 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomee/tomee/trunk] 1485786 Blamelist: andygumbrecht BUILD FAILED: failed compile sincerely, -The Buildbot
buildbot failure in ASF Buildbot on tomee-trunk-deploy
The Buildbot has detected a new failure on builder tomee-trunk-deploy while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomee-trunk-deploy/builds/127 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: The Nightly scheduler named 'tomee-trunk-deploy' triggered this build Build Source Stamp: [branch tomee/tomee/trunk] HEAD Blamelist: BUILD FAILED: failed deploy sincerely, -The Buildbot
svn commit: r1485937 - /tomee/tomee/trunk/pom.xml
Author: rmannibucau
Date: Fri May 24 06:01:53 2013
New Revision: 1485937
URL: http://svn.apache.org/r1485937
Log:
using back openejb.version in plain text
Modified:
tomee/tomee/trunk/pom.xml
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1485937&r1=1485936&r2=1485937&view=diff
==
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Fri May 24 06:01:53 2013
@@ -90,7 +90,7 @@
-${project.version}
+4.6.0-SNAPSHOT
1.6.0-SNAPSHOT
