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/02/11 03:16:58 UTC

svn commit: r505823 - in /incubator/tuscany/branches/sca-java-integration: sampleapps/ samples/ samples/sca/ samples/sca/bigbank/ samples/sca/calculator/ samples/sca/inner.composite/ samples/sca/loanappconversation/ samples/sca/loanappconversationWS/ s...

Author: jsdelfino
Date: Sat Feb 10 18:16:56 2007
New Revision: 505823

URL: http://svn.apache.org/viewvc?view=rev&rev=505823
Log:
Adjusted pom.xml files to reference the 1.0 spec module. Included all the modules that build in a top-down build. Fixed the specTest integration test to reference the correct SCDL files.

Modified:
    incubator/tuscany/branches/sca-java-integration/sampleapps/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/simplecallback/pom.xml
    incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterws-oneway/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterwsclient-oneway/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-async/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-async/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/samples/helloworld/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/helloworld/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/spring/samples/simple/pom.xml
    incubator/tuscany/branches/sca-java-integration/spec/pom.xml
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/default.scdl
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/myServiceInRecursive.scdl
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java

Modified: incubator/tuscany/branches/sca-java-integration/sampleapps/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sampleapps/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sampleapps/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sampleapps/pom.xml Sat Feb 10 18:16:56 2007
@@ -41,7 +41,7 @@
         <axis2Version>1.1.1</axis2Version>
         <dasVersion>1.0-incubator-SNAPSHOT</dasVersion>
         <tuscanyVersion>0.1-integration-incubating-SNAPSHOT</tuscanyVersion>
-        <specVersion>0.95</specVersion>
+        <specVersion>1.0</specVersion>
     </properties>
 
     <!-- definition of repositories where the parent pom can be found -->
@@ -183,7 +183,9 @@
         </pluginManagement>
     </build>
     <modules>
+<!--
         <module>bigbank</module>
         <module>das.pojo.service</module>
+-->
     </modules>
 </project>

Modified: incubator/tuscany/branches/sca-java-integration/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/pom.xml Sat Feb 10 18:16:56 2007
@@ -36,7 +36,7 @@
         <scaKernelVersion>0.1-integration-incubating-SNAPSHOT</scaKernelVersion>
         <axis2Version>1.1.1</axis2Version>
         <tuscanyVersion>0.1-integration-incubating-SNAPSHOT</tuscanyVersion>
-        <specVersion>0.95</specVersion>
+        <specVersion>1.0</specVersion>
     </properties>
 
     <!-- definition of repositories where the parent pom can be found -->

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/inner.composite/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversation/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWS/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanappconversationWSClient/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
 
     <properties>
         <tuscanyVersion>0.1-integration-incubating-SNAPSHOT</tuscanyVersion>
-        <specVersion>0.95</specVersion>
+        <specVersion>1.0</specVersion>
 
         <scaVersion>0.1-integration-incubating-SNAPSHOT</scaVersion>
         <scaImplVersion>0.1-integration-incubating-SNAPSHOT</scaImplVersion>
@@ -68,15 +68,19 @@
 
     <modules>
         <module>calculator</module>
+<!--
         <module>webapp</module>
-        <!-- module>echo.databinding</module -->
+        <module>echo.databinding</module>
+-->
         <module>supplychain</module>
         <module>bigbank</module>
         <module>echo.binding</module>
         <module>inner.composite</module>
         <module>loanappconversation</module>
+<!--
         <module>loanappconversationWS</module>
         <module>loanappconversationWSClient</module>
+-->
     </modules>
 
     <dependencyManagement>

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/simplecallback/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/simplecallback/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/simplecallback/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/simplecallback/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterws-oneway/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterws-oneway/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterws-oneway/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterws-oneway/pom.xml Sat Feb 10 18:16:56 2007
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
             <version>0.1-integration-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterwsclient-oneway/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterwsclient-oneway/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterwsclient-oneway/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/greeterwsclient-oneway/pom.xml Sat Feb 10 18:16:56 2007
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
             <version>${tuscanyVersion}</version>
             <scope>compile</scope>
         </dependency>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-async/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-async/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-async/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws-async/pom.xml Sat Feb 10 18:16:56 2007
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
             <version>0.1-integration-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/pom.xml Sat Feb 10 18:16:56 2007
@@ -35,7 +35,7 @@
         <!-- SCA API dependencies -->
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         
         <!-- Tuscany API dependencies -->

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml Sat Feb 10 18:16:56 2007
@@ -35,7 +35,7 @@
         <!-- SCA API dependencies -->
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         
         <!-- Tuscany API dependencies -->

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-async/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-async/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-async/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient-async/pom.xml Sat Feb 10 18:16:56 2007
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
             <version>${tuscanyVersion}</version>
             <scope>compile</scope>
         </dependency>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclient/pom.xml Sat Feb 10 18:16:56 2007
@@ -34,7 +34,7 @@
 
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
 
         <dependency>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml Sat Feb 10 18:16:56 2007
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
 
         <dependency>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/samples/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/samples/helloworld/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/samples/helloworld/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/samples/helloworld/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/helloworld/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/helloworld/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/helloworld/pom.xml Sat Feb 10 18:16:56 2007
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml Sat Feb 10 18:16:56 2007
@@ -84,7 +84,7 @@
 
             <dependency>
                 <groupId>org.osoa</groupId>
-                <artifactId>sca-api-r0.95</artifactId>
+                <artifactId>sca-api-r1.0</artifactId>
                <version>${scaVersion}</version>
                 <scope>compile</scope>
             </dependency>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/spring/samples/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/spring/samples/simple/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/spring/samples/simple/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/spring/samples/simple/pom.xml Sat Feb 10 18:16:56 2007
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
+            <artifactId>sca-api-r1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: incubator/tuscany/branches/sca-java-integration/spec/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/pom.xml Sat Feb 10 18:16:56 2007
@@ -44,7 +44,6 @@
 
     <modules>
        <module>commonj</module>
-       <module>sca-api-r0.95</module>
        <module>sca-api-r1.0</module>
     </modules>
 </project>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml Sat Feb 10 18:16:56 2007
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>commonj</groupId>
             <artifactId>sdo-api-r2.1</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
+            <version>1.0-incubator-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
+            <version>1.0-incubator-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml Sat Feb 10 18:16:56 2007
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>commonj</groupId>
             <artifactId>sdo-api-r2.1</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
+            <version>1.0-incubator-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
+            <version>1.0-incubator-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml Sat Feb 10 18:16:56 2007
@@ -35,13 +35,17 @@
         <module>specTest</module>
         <module>propertyTest</module>
         <module>bindingsTest</module>
+<!--
 	<module>callBackAPITest</module>
+-->
 	<module>callBackBasicTest</module>
 	<module>callBackCTypeTest</module>
 	<module>callBackIDTest</module>
 	<module>callBackSetCallbackTest</module>
 	<module>callBackSetCallbackConvTest</module>
+<!--
 	<module>conversationsTest</module>
+-->
     </modules>
 
     <dependencyManagement>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/default.scdl Sat Feb 10 18:16:56 2007
@@ -26,8 +26,8 @@
     <include name="mySimpleServiceInRecursive" scdlLocation="mySimpleServiceInRecursive.scdl"/>
     <include name="myServiceInRecursive" scdlLocation="myServiceInRecursive.scdl"/>
     <include name="mySimpleServiceInRecursive2" scdlLocation="mySimpleServiceInRecursive2.scdl"/>
-    <include name="MyTotalServiceInRecursive" scdlLocation="MyTotalServiceInRecursive.scdl"/>
-    <include name="MyTotalServiceInRecursiveForReferenceOverride" scdlLocation="MyTotalServiceInRecursiveForReferenceOverride.scdl"/>
+    <include name="MyTotalServiceInRecursive" scdlLocation="myTotalServiceInRecursive.scdl"/>
+    <include name="MyTotalServiceInRecursiveForReferenceOverride" scdlLocation="myTotalServiceInRecursiveForReferenceOverride.scdl"/>
     
     
 </composite>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/myServiceInRecursive.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/myServiceInRecursive.scdl?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/myServiceInRecursive.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/sca/myServiceInRecursive.scdl Sat Feb 10 18:16:56 2007
@@ -46,7 +46,7 @@
 
    
     <component name="MyServiceInRecursive">
-        <implementation.composite scdlLocation="MyServiceInComposite.scdl"/>
+        <implementation.composite scdlLocation="myServiceInComposite.scdl"/>
     </component>
     
     

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java Sat Feb 10 18:16:56 2007
@@ -70,7 +70,7 @@
     private void display(RequestContext context) {
         System.out.println("\tService name:" + context.getServiceName());
         System.out.println("\tSecurity subject:" + context.getSecuritySubject());
-        System.out.println("\tService reference:" + context.getServiceReference());
+        //System.out.println("\tService reference:" + context.getServiceReference());
 
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java Sat Feb 10 18:16:56 2007
@@ -90,7 +90,7 @@
     private void display(RequestContext context) {
         System.out.println("\tService name:" + context.getServiceName());
         System.out.println("\tSecurity subject:" + context.getSecuritySubject());
-        System.out.println("\tService reference:" + context.getServiceReference());
+        //System.out.println("\tService reference:" + (Object)context.getServiceReference());
 
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java Sat Feb 10 18:16:56 2007
@@ -107,7 +107,7 @@
     private void display(RequestContext context) {
         System.out.println("\tService name:" + context.getServiceName());
         System.out.println("\tSecurity subject:" + context.getSecuritySubject());
-        System.out.println("\tService reference:" + context.getServiceReference());
+        //System.out.println("\tService reference:" + (Object)context.getServiceReference());
 
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java Sat Feb 10 18:16:56 2007
@@ -66,7 +66,7 @@
     private void display(RequestContext context) {
         System.out.println("\tService name:" + context.getServiceName());
         System.out.println("\tSecurity subject:" + context.getSecuritySubject());
-        System.out.println("\tService reference:" + context.getServiceReference());
+        //System.out.println("\tService reference:" + context.getServiceReference());
 
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java?view=diff&rev=505823&r1=505822&r2=505823
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java Sat Feb 10 18:16:56 2007
@@ -77,7 +77,7 @@
     private void display(RequestContext context) {
         System.out.println("\tService name:" + context.getServiceName());
         System.out.println("\tSecurity subject:" + context.getSecuritySubject());
-        System.out.println("\tService reference:" + context.getServiceReference());
+        //System.out.println("\tService reference:" + (Object)context.getServiceReference());
 
     }
 



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