You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/12/04 15:00:46 UTC
svn commit: r1416943 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
tck/cdi-tomee/src/test/resources/passing.xml
Author: rmannibucau
Date: Tue Dec 4 14:00:44 2012
New Revision: 1416943
URL: http://svn.apache.org/viewvc?rev=1416943&view=rev
Log:
assembler can be null
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
openejb/trunk/openejb/tck/cdi-tomee/src/test/resources/passing.xml
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1416943&r1=1416942&r2=1416943&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Tue Dec 4 14:00:44 2012
@@ -155,11 +155,13 @@ public class OpenEjbContainer extends EJ
}
final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
- for (AppInfo info : assembler.getDeployedApplications()) {
- try {
- assembler.destroyApplication(info);
- } catch (UndeployException e) {
- logger.error(e.getMessage(), e);
+ if (assembler != null) { // if startup failed
+ for (AppInfo info : assembler.getDeployedApplications()) {
+ try {
+ assembler.destroyApplication(info);
+ } catch (UndeployException e) {
+ logger.error(e.getMessage(), e);
+ }
}
}
Modified: openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java?rev=1416943&r1=1416942&r2=1416943&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java (original)
+++ openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java Tue Dec 4 14:00:44 2012
@@ -93,6 +93,8 @@ public class ResourceRef implements Jndi
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
protected String id;
+ @XmlTransient
+ protected String origin;
public ResourceRef() {
}
@@ -251,6 +253,14 @@ public class ResourceRef implements Jndi
this.id = value;
}
+ public String getOrigin() {
+ return origin;
+ }
+
+ public void setOrigin(String origin) {
+ this.origin = origin;
+ }
+
@Override
public String toString() {
return "ResourceRef{" +
Modified: openejb/trunk/openejb/tck/cdi-tomee/src/test/resources/passing.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/src/test/resources/passing.xml?rev=1416943&r1=1416942&r2=1416943&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/src/test/resources/passing.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/src/test/resources/passing.xml Tue Dec 4 14:00:44 2012
@@ -17,43 +17,8 @@
-->
<suite name="CDI TCK" verbose="0">
<test name="CDI TCK">
- <packages>
- <package name="org.jboss.jsr299.tck.tests.*"/>
- <package name="org.jboss.jsr299.tck.interceptors.tests.*"/>
- </packages>
<classes>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.EnterpriseBeanWithNonPassivatingDecoratorTest">
- <methods>
- <exclude name="testEnterpriseBeanWithNonPassivatingDecoratorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
- <methods>
- <exclude name="testCreateSFSB"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
- <methods>
- <exclude name="testInjectionIntoWebServiceEndpoint"/>
- </methods>
- </class>
- <!-- see CDI-140 -->
- <class
- name="org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter.PassivatingProducerMethodWithNonPassivatingParameterTest">
- <methods>
- <exclude name="testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails"></exclude>
- </methods>
- </class>
+ <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest" />
</classes>
</test>
</suite>