svn commit: r790916 - in /tuscany/branches/sca-java-1.x/itest: contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/ contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/

[slaws]

Author: slaws
Date: Fri Jul  3 13:51:07 2009
New Revision: 790916

URL: http://svn.apache.org/viewvc?rev=790916&view=rev
Log:
Add in a second EJB component to show how the model is constructed. 

Modified:
    
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
    
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java

Modified: 
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite?rev=790916&r1=790915&r2=790916&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
 (original)
+++ 
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
 Fri Jul  3 13:51:07 2009
@@ -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>

Modified: 
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java?rev=790916&r1=790915&r2=790916&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
 (original)
+++ 
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
 Fri Jul  3 13:51:07 2009
@@ -103,7 +103,7 @@
         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);