Merge branch 'jaxrs' into trunk

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

2 files changed, 8 insertions, 5 deletions

diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
index 42acda4714..5e77ac2b91 100644
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
@@ -24,9 +24,9 @@
     <component name="CallBackBasicClient">
 		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
 		<reference name="aCallBackService" target="CallBackBasicService">
-		  <callback>
-		     <binding.ws uri="http://localhost:8084/aCallBackService"/>
-		  </callback>
+		    <callback>
+		      <binding.ws uri="http://localhost:8084/aCallBackService"/>
+		    </callback>
 		</reference>
     </component> 
     
@@ -34,6 +34,9 @@
       <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
       <service name="CallBackBasicService">
          <binding.ws uri="http://localhost:8085/CallBackBasicService"/>
+         <callback>
+            <binding.ws uri="http://localhost:8084/aCallBackService"/>
+         </callback>
       </service>
     </component>  
   
diff --git a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
index e2f28f0bb1..e70fc4086d 100644
--- a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
+++ b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
@@ -47,7 +47,7 @@ public class ContributionTestCase {
     @Test

     public void testRead() throws Exception {

         Deployer deployer = new DefaultDeployer();

-        File file = new File("../../samples/calculator/target/sample-calculator.jar");

+        File file = new File("../../samples/contribution-binding-sca-calculator/target/sample-contribution-binding-sca-calculator.jar");

         URL url = file.toURI().toURL();

         Monitor monitor = deployer.createMonitor();

         Contribution contribution = deployer.loadContribution(url.toURI(), url, monitor);

@@ -56,7 +56,7 @@ public class ContributionTestCase {
         // Ferkle around in the contribution verifying it looks as expected

         Assert.assertNotNull(contribution);

         List<Composite> deployables = contribution.getDeployables();

-        Assert.assertEquals(1, deployables.size());

+        Assert.assertEquals(2, deployables.size());

         Composite calculatorComposte = deployables.get(0);

         Assert.assertEquals("Calculator", calculatorComposte.getName().getLocalPart());

         Assert.assertEquals(5, calculatorComposte.getComponents().size());