Add in a second EJB component to show how the model is constructed.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@790916 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 1 deletions

diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
index 68bad37326..b131d375b0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
+++ b/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
@@ -32,10 +32,24 @@
         <property name="hwProperty">EJB</property>
     </component>
     
+    <component name="HelloworldServiceComponent2">
+        <implementation.ejb ejb-link="itest-contribution-jee-samples-08-ejb-enhanced.jar#HelloworldService8Bean"/>
+        <service name="HelloworldService8">
+            <interface.java interface="sample.ejb3.HelloworldService8"/>
+            <binding.sca/>
+        </service>
+        <reference name="hwReference" target="HelloworldServiceJavaComponent"/>
+        <property name="hwProperty">EJB</property>
+    </component>    
+    
     <service name="TheService" promote="HelloworldServiceComponent/HelloworldService8"/>
     
     <reference name="TheReference" promote="HelloworldServiceComponent/hwReference"/>
     
+    <service name="TheService2" promote="HelloworldServiceComponent2/HelloworldService8"/>
+    
+    <reference name="TheReference2" promote="HelloworldServiceComponent2/hwReference"/>
+    
     <component name="HelloworldServiceJavaComponent">
         <implementation.java class="sample.java.HelloworldServiceJavaImpl"/>
         <property name="hwProperty">Java</property>
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
index 0200677a92..64c31b4393 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
+++ b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
@@ -103,7 +103,7 @@ public class SCAJarEarAppcompTestCase {
         domain.getDomainComposite().getIncludes().add(composite);
         
         Assert.assertEquals(3, composite.getComponents().size());
-        Assert.assertEquals(2, composite.getComponents().get(1).getImplementation().getServices().size());            
+        Assert.assertEquals(3, composite.getComponents().get(1).getImplementation().getServices().size());            
         Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName());
         
         domain.buildComposite(composite);