You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2009/10/31 16:23:26 UTC
svn commit: r831551 - in /openejb/trunk/openejb3/container/openejb-core/src:
main/java/org/apache/openejb/assembler/classic/Assembler.java
test/java/org/apache/openejb/iTest.java
Author: jlaskowski
Date: Sat Oct 31 15:23:25 2009
New Revision: 831551
URL: http://svn.apache.org/viewvc?rev=831551&view=rev
Log:
Fix the issue with OpenEJB.deploy throwing NPE because setComponent set Assembler the class not Assembler the interface
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=831551&r1=831550&r2=831551&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Sat Oct 31 15:23:25 2009
@@ -200,7 +200,7 @@
SystemInstance system = SystemInstance.get();
- system.setComponent(Assembler.class, this);
+ system.setComponent(org.apache.openejb.spi.Assembler.class, this);
containerSystem = new CoreContainerSystem(jndiFactory);
system.setComponent(ContainerSystem.class, containerSystem);
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java?rev=831551&r1=831550&r2=831551&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java Sat Oct 31 15:23:25 2009
@@ -60,7 +60,7 @@
// Copied from org.apache.openejb.SomeoneBrokeSurefireAndThisIsADirtyHackForItTest that's now gone
System.setProperty("openejb.assembler", org.apache.openejb.assembler.classic.Assembler.class.getName());
- System.setProperty("openejb.deployments.classpath.include", ".*openejb-itests-*.*");
+ System.setProperty("openejb.deployments.classpath.include", ".*openejb-itests-[^a].*-.*");
System.setProperty("openejb.deployments.classpath.filter.descriptors", "true");
System.setProperty("openejb.deployments.classpath.filter.systemapps", "false");
System.setProperty("openejb.deployments.classpath.ear", "false");