You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/02/25 00:50:34 UTC
svn commit: r511376 - in /incubator/tuscany/java/sca/integration-test:
propertyTest/src/test/resources/ specTest/src/main/resources/META-INF/sca/
Author: jmarino
Date: Sat Feb 24 15:50:33 2007
New Revision: 511376
URL: http://svn.apache.org/viewvc?view=rev&rev=511376
Log:
update integration tests to support SCA 1.0 reference target syntax
Modified:
incubator/tuscany/java/sca/integration-test/propertyTest/src/test/resources/itest.scdl
incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalService.scdl
incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInComposite.scdl
incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInCompositeForReferenceOverride.scdl
incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursive.scdl
incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursiveForReferenceOverride.scdl
Modified: incubator/tuscany/java/sca/integration-test/propertyTest/src/test/resources/itest.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/integration-test/propertyTest/src/test/resources/itest.scdl?view=diff&rev=511376&r1=511375&r2=511376
==============================================================================
--- incubator/tuscany/java/sca/integration-test/propertyTest/src/test/resources/itest.scdl (original)
+++ incubator/tuscany/java/sca/integration-test/propertyTest/src/test/resources/itest.scdl Sat Feb 24 15:50:33 2007
@@ -25,41 +25,41 @@
<component name="testConstructorPrimitives">
<tuscany:junit class="org.apache.tuscany.sca.test.property.primitives.PrimitiveTestComponent"/>
- <reference name="primitives">ConstructorPrimitives</reference>
+ <reference name="primitives" target="ConstructorPrimitives"/>
<property name='expectedImplementation'>ConstructorPrimitives</property>
</component>
<component name="testPublicFieldPrimitives">
<tuscany:junit class="org.apache.tuscany.sca.test.property.primitives.PrimitiveTestComponent"/>
- <reference name="primitives">PublicFieldPrimitives</reference>
+ <reference name="primitives" target="PublicFieldPrimitives"/>
<property name='expectedImplementation'>PublicFieldPrimitives</property>
</component>
<component name="testProtectedFieldPrimitives">
<tuscany:junit class="org.apache.tuscany.sca.test.property.primitives.PrimitiveTestComponent"/>
- <reference name="primitives">ProtectedFieldPrimitives</reference>
+ <reference name="primitives" target="ProtectedFieldPrimitives"/>
<property name='expectedImplementation'>ProtectedFieldPrimitives</property>
</component>
<component name="testPublicSetterPrimitives">
<tuscany:junit class="org.apache.tuscany.sca.test.property.primitives.PrimitiveTestComponent"/>
- <reference name="primitives">PublicSetterPrimitives</reference>
+ <reference name="primitives" target="PublicSetterPrimitives"/>
<property name='expectedImplementation'>PublicSetterPrimitives</property>
</component>
<component name="testProtectedSetterPrimitives">
<tuscany:junit class="org.apache.tuscany.sca.test.property.primitives.PrimitiveTestComponent"/>
- <reference name="primitives">ProtectedSetterPrimitives</reference>
+ <reference name="primitives" target="ProtectedSetterPrimitives"/>
<property name='expectedImplementation'>ProtectedSetterPrimitives</property>
</component>
<!--
<component name="testComponent">
<tuscany:junit class="org.apache.tuscany.sca.test.property.PropertyTestComponent"/>
- <reference name="abService">ABComponent</reference>
- <reference name="cdService">CDComponent</reference>
- <reference name="abcdService">ABCDComponent</reference>
- <reference name="propertyService">PropertyComponent</reference>
+ <reference name="abService" target="ABComponent"/>
+ <reference name="cdService" target="CDComponent"/>
+ <reference name="abcdService" target="ABCDComponent"/>
+ <reference name="propertyService" target="PropertyComponent"/>
</component>
-->
</composite>
Modified: incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=511376&r1=511375&r2=511376
==============================================================================
--- incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/default.scdl Sat Feb 24 15:50:33 2007
@@ -22,7 +22,7 @@
<component name="ComponentContextTester">
<implementation.java class="org.apache.tuscany.sca.test.spec.ComponentContextTesterImpl"/>
- <reference name="getServiceTest">ReferencedService</reference>
+ <reference name="getServiceTest" target="ReferencedService"/>
</component>
<component name="ReferencedService">
Modified: incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalService.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalService.scdl?view=diff&rev=511376&r1=511375&r2=511376
==============================================================================
--- incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalService.scdl (original)
+++ incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalService.scdl Sat Feb 24 15:50:33 2007
@@ -25,8 +25,8 @@
<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/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInComposite.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInComposite.scdl?view=diff&rev=511376&r1=511375&r2=511376
==============================================================================
--- incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInComposite.scdl (original)
+++ incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInComposite.scdl Sat Feb 24 15:50:33 2007
@@ -23,13 +23,13 @@
<service name="MyTotalService">
<interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
- <reference>MyTotalServiceComponent</reference>
+ <reference target="MyTotalServiceComponent"/>
</service>
<component name="MyTotalServiceComponent">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
- <reference name="myService">MyServiceRef</reference>
- <reference name="myListService">MyListServiceRef</reference>
+ <reference name="myService" target="MyServiceRef"/>
+ <reference name="myListService" target="MyListServiceRef"/>
</component>
<reference name="MyServiceRef">
Modified: incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInCompositeForReferenceOverride.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInCompositeForReferenceOverride.scdl?view=diff&rev=511376&r1=511375&r2=511376
==============================================================================
--- incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInCompositeForReferenceOverride.scdl (original)
+++ incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInCompositeForReferenceOverride.scdl Sat Feb 24 15:50:33 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" override="no">
@@ -47,8 +47,8 @@
<component name="MyTotalServiceComponentMay">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
- <reference name="myService">MyServiceRefMay</reference>
- <reference name="myListService">MyListServiceRefMay</reference>
+ <reference name="myService" target="MyServiceRefMay"/>
+ <reference name="myListService" target="MyListServiceRefMay"/>
</component>
<reference name="MyServiceRefMay" override="may">
@@ -66,8 +66,8 @@
<component name="MyTotalServiceComponentMust">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
- <reference name="myService">MyServiceRefMust</reference>
- <reference name="myListService">MyListServiceRefMust</reference>
+ <reference name="myService" target="MyServiceRefMust"/>
+ <reference name="myListService" target="MyListServiceRefMust"/>
</component>
<reference name="MyServiceRefMust" override="must">
Modified: incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursive.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursive.scdl?view=diff&rev=511376&r1=511375&r2=511376
==============================================================================
--- incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursive.scdl (original)
+++ incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursive.scdl Sat Feb 24 15:50:33 2007
@@ -27,7 +27,7 @@
<component name="MyTotalServiceFromRecursive">
<implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
- <reference name="myService">MyServiceInComposite/MyService</reference>
+ <reference name="myService" target="MyServiceInComposite/MyService"/>
<reference name="myListService">MyServiceInComposite/MyListService</reference>
</component>
@@ -43,14 +43,14 @@
<component name="MyTotalServiceInCompositeWithRecursive">
<implementation.composite scdlLocation="myTotalServiceInComposite.scdl"/>
- <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 scdlLocation="myTotalServiceInComposite.scdl"/>
- <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/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursiveForReferenceOverride.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursiveForReferenceOverride.scdl?view=diff&rev=511376&r1=511375&r2=511376
==============================================================================
--- incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursiveForReferenceOverride.scdl (original)
+++ incubator/tuscany/java/sca/integration-test/specTest/src/main/resources/META-INF/sca/myTotalServiceInRecursiveForReferenceOverride.scdl Sat Feb 24 15:50:33 2007
@@ -38,12 +38,12 @@
<component name="MyTotalServiceForReferenceComponent">
<implementation.composite scdlLocation="myTotalServiceInCompositeForReferenceOverride.scdl"/>
- <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="MyServiceInComposite/MyService"/>
+ <reference name="MyListServiceRefNo" target="MyServiceInComposite/MyListService"/>
+ <reference name="MyServiceRefMay" target="MyServiceInComposite/MyService"/>
+ <reference name="MyListServiceRefMay" target="MyServiceInComposite/MyListService"/>
+ <reference name="MyServiceRefMust" target="MyServiceInComposite/MyService"/>
+ <reference name="MyListServiceRefMust" target="MyServiceInComposite/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