You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/12 09:20:58 UTC

svn commit: r527809 - in /incubator/tuscany/java/sca/itest: properties/src/main/resources/ spec-api/src/main/resources/

Author: jsdelfino
Date: Thu Apr 12 00:20:57 2007
New Revision: 527809

URL: http://svn.apache.org/viewvc?view=rev&rev=527809
Log:
Fixed various errors in .composite files in spec-api itest.

Modified:
    incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
    incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite
    incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
    incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite
    incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
    incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite
    incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite

Modified: incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite?view=diff&rev=527809&r1=527808&r2=527809
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite Thu Apr 12 00:20:57 2007
@@ -65,8 +65,8 @@
 
     <component name="ABCDComponent">
         <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/>
-        <reference name="ab">ABComponent</reference>
-        <reference name="cd">CDComponent</reference>
+        <reference name="ab" target="ABComponent">
+        <reference name="cd" target="CDComponent">
     </component>
 
     <component name="ABComponent">

Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite?view=diff&rev=527809&r1=527808&r2=527809
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myListService.composite Thu Apr 12 00:20:57 2007
@@ -24,8 +24,8 @@
    
     <component name="MyNewListService">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyListServiceImpl"/>
-	<reference name="myListServiceList">MyNCService/MyListService</reference>
-	<reference name="myListServiceArray">MyListServiceFor2006/MyListService</reference>
+	<reference name="myListServiceList" target="MyNCService/MyListService"/>
+	<reference name="myListServiceArray" target="MyListServiceFor2006/MyListService"/>
 	<property name="serviceYear">2007</property>
     </component>
     

Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite?view=diff&rev=527809&r1=527808&r2=527809
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite Thu Apr 12 00:20:57 2007
@@ -22,8 +22,8 @@
 	   targetNamespace="http://foo"
            name="MySimpleServiceInRecursive2">
    
-    <service name="MySimpleServiceDefault">
-        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService" promote="MySimpleServiceInRecursiveComponent/MySimpleService"/>
+    <service name="MySimpleServiceDefault"  promote="MySimpleServiceInRecursiveComponent/MySimpleService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
     </service>
 
     <service name="MySimpleServiceNo" promote="MySimpleServiceInRecursiveComponent/MySimpleServiceNo">

Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite?view=diff&rev=527809&r1=527808&r2=527809
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalService.composite Thu Apr 12 00:20:57 2007
@@ -20,14 +20,14 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
 	xmlns:foo="http://foo" 
 	targetNamespace="http://foo"
-    name="MyTotalServiceTest">
+    name="myTotalService">
    
     <include name="myservice"/>
     
     <component name="MyTotalService">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-        <reference name="myService">MyNCService/MyService</reference>
-        <reference name="myListService">MyNCService/MyListService</reference>
+        <reference name="myService" target="MyNCService/MyService"/>
+        <reference name="myListService" target="MyNCService/MyListService"/>
     </component>
     
 </composite>

Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite?view=diff&rev=527809&r1=527808&r2=527809
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite Thu Apr 12 00:20:57 2007
@@ -28,8 +28,8 @@
    
     <component name="MyTotalServiceComponentNo">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-		<reference name="myService">MyServiceRefNo</reference>
-		<reference name="myListService">MyListServiceRefNo</reference>
+		<reference name="myService" target="MyServiceRefNo"/>
+		<reference name="myListService" target="MyListServiceRefNo"/>
     </component>
     
     <reference name="MyServiceRefNo" promote="MyTotalServiceComponentNo/myService">

Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite?view=diff&rev=527809&r1=527808&r2=527809
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite Thu Apr 12 00:20:57 2007
@@ -20,7 +20,7 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
 	   xmlns:foo="http://foo" 
 	   targetNamespace="http://foo"
-           name="MyTotalServiceInRecursiveTest">
+           name="myTotalServiceInRecursive">
    
     <component name="MyServiceInComposite">
         <implementation.composite name="foo:myServiceInComposite"/>
@@ -28,8 +28,8 @@
     
     <component name="MyTotalServiceFromRecursive">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-		<reference name="myService">MyServiceInComposite/MyService</reference>
-		<reference name="myListService">MyServiceInComposite/MyListService</reference>
+		<reference name="myService" target="MyServiceInComposite/MyService"/>
+		<reference name="myListService" target="MyServiceInComposite/MyListService"/>
     </component>
     
  	<service name="MyTotalServiceInCompositeWithRecursiveUseService" promote="MyTotalServiceInCompositeWithRecursive">
@@ -42,14 +42,14 @@
     
     <component name="MyTotalServiceInCompositeWithRecursive">
         <implementation.composite name="foo:myTotalServiceInComposite"/>
-		<reference name="MyServiceRef">MyServiceInComposite/MyService</reference>
-		<reference name="MyListServiceRef">MyServiceInComposite/MyListService</reference>
+		<reference name="MyServiceRef" target="MyServiceInComposite/MyService"/>
+		<reference name="MyListServiceRef" target="MyServiceInComposite/MyListService"/>
     </component>
 
     <component name="MyTotalServiceInCompositeWithComponentService">
         <implementation.composite name="foo:myTotalServiceInComposite"/>
-		<reference name="MyServiceRef">MyServiceInComponent/MyService</reference>
-		<reference name="MyListServiceRef">MyServiceInComponent/MyListService</reference>
+		<reference name="MyServiceRef" target="MyServiceInComponent/MyService"/>
+		<reference name="MyListServiceRef" target="MyServiceInComponent/MyListService"/>
     </component>
 
     <component name="MyServiceInComponent">

Modified: incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite?view=diff&rev=527809&r1=527808&r2=527809
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite Thu Apr 12 00:20:57 2007
@@ -20,7 +20,7 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
 	   xmlns:foo="http://foo" 
 	   targetNamespace="http://foo"
-           name="MyTotalServiceInRecursiveTest">
+           name="myTotalServiceInRecursiveForReferenceOverride">
    
 	<service name="MyTotalServiceNo" promote="MyTotalServiceForReferenceComponent/MyTotalServiceNo">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
@@ -36,12 +36,12 @@
       
     <component name="MyTotalServiceForReferenceComponent">
         <implementation.composite name="foo:myTotalServiceInCompositeForReferenceOverride"/>
-		<reference name="MyServiceRefNo">MyServiceInComposite/MyService</reference>
-		<reference name="MyListServiceRefNo">MyServiceInComposite/MyListService</reference>
-		<reference name="MyServiceRefMay">MyServiceInComposite/MyService</reference>
-		<reference name="MyListServiceRefMay">MyServiceInComposite/MyListService</reference>
-		<reference name="MyServiceRefMust">MyServiceInComposite/MyService</reference>
-		<reference name="MyListServiceRefMust">MyServiceInComposite/MyListService</reference>
+		<reference name="MyServiceRefNo" target="MyServiceInComponent/MyService"/>
+		<reference name="MyListServiceRefNo" target="MyServiceInComponent/MyListService"/>
+		<reference name="MyServiceRefMay" target="MyServiceInComponent/MyService"/>
+		<reference name="MyListServiceRefMay" target="MyServiceInComponent/MyListService"/>
+		<reference name="MyServiceRefMust" target="MyServiceInComponent/MyService"/>
+		<reference name="MyListServiceRefMust" target="MyServiceInComponent/MyListService"/>
     </component>
 
     <component name="MyServiceInComponent">



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org