diff options
Diffstat (limited to '')
2 files changed, 26 insertions, 3 deletions
diff --git a/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java index 0a4bb8b2db..cfdf0790d2 100644 --- a/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java +++ b/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java @@ -140,13 +140,21 @@ public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implem if(jeeExtension != null) { ComponentType ct = jeeExtension.createImplementationEjbComponentType(ejbModuleInfo, ejbLink); - implementation.getServices().addAll(ct.getServices()); + // TODO - SL - TUSCANY-2944 - these new JEE processors are causing problems with existing contributions + // ct is null if there is no EJBInfo + if (ct != null){ + implementation.getServices().addAll(ct.getServices()); + } } if(jeeOptionalExtension != null) { ComponentType ct = jeeOptionalExtension.createImplementationEjbComponentType(ejbModuleInfo, ejbLink); - implementation.getReferences().addAll(ct.getReferences()); - implementation.getProperties().addAll(ct.getProperties()); + // TODO - SL - TUSCANY-2944 - these new JEE processors are causing problems with existing contributions + // ct is null if there is no EJBInfo + if (ct != null){ + implementation.getReferences().addAll(ct.getReferences()); + implementation.getProperties().addAll(ct.getProperties()); + } } // TODO: Introspection of bean class diff --git a/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java b/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java index 588c014fdf..69590ee80e 100644 --- a/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java +++ b/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java @@ -19,6 +19,8 @@ package test; +import java.io.IOException; + import junit.framework.Assert; import junit.framework.TestCase; @@ -28,6 +30,7 @@ import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher; import org.apache.tuscany.sca.node.launcher.NodeLauncher; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.Ignore; @@ -76,6 +79,18 @@ public class StoreSupplierTestCase { domainManager.stop(); } +/* + @Test + public void testWaitForInput() { + try { + System.out.println("press enter to continue)"); + System.in.read(); + } catch (IOException e) { + e.printStackTrace(); + } + } +*/ + @Test public void testShop() { SCAClient client = (SCAClient)storeClientNode; |