You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/10/20 12:29:46 UTC

svn commit: r466053 - in /incubator/tuscany/branches/sca-java-M2/samples: ./ standalone/helloworldwsclient-async/ standalone/helloworldwsclient-async/src/ standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/ webapp/helloworldws-async/

Author: rineholt
Date: Fri Oct 20 03:29:42 2006
New Revision: 466053

URL: http://svn.apache.org/viewvc?view=rev&rev=466053
Log:
helloword async varity work for me with the TUSCANY-871 workaround in place.

Added:
    incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/
      - copied from r464866, incubator/tuscany/java/samples/sca/helloworldwsclient-async/
    incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml
      - copied, changed from r465663, incubator/tuscany/java/samples/sca/helloworldwsclient-async/pom.xml
    incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/run.bat
      - copied unchanged from r465663, incubator/tuscany/java/samples/sca/helloworldwsclient-async/run.bat
    incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/run_celtix.bat
      - copied unchanged from r465663, incubator/tuscany/java/samples/sca/helloworldwsclient-async/run_celtix.bat
    incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/
      - copied from r465663, incubator/tuscany/java/samples/sca/helloworldwsclient-async/src/
    incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/
      - copied from r464866, incubator/tuscany/java/samples/sca/helloworldws-async/
Modified:
    incubator/tuscany/branches/sca-java-M2/samples/pom.xml
    incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl
    incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml

Modified: incubator/tuscany/branches/sca-java-M2/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/pom.xml?view=diff&rev=466053&r1=466052&r2=466053
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/pom.xml Fri Oct 20 03:29:42 2006
@@ -39,7 +39,8 @@
     </properties>
 
     <modules>
-      <module>applications\bigbank</module>
+      <module>applications/bigbank</module>
+      <module>webapp/helloworldws-async</module>
     </modules>
 
     <build>

Copied: incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml (from r465663, incubator/tuscany/java/samples/sca/helloworldwsclient-async/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml?view=diff&rev=466053&p1=incubator/tuscany/java/samples/sca/helloworldwsclient-async/pom.xml&r1=465663&p2=incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml&r2=466053
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient-async/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml Fri Oct 20 03:29:42 2006
@@ -19,7 +19,7 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-M2-SNAPSHOT</version>
     </parent>
@@ -28,67 +28,67 @@
     <packaging>jar</packaging>
     <name>Tuscany HelloWorld Web Service Async Client Sample</name>
     <description>A sample client for a HelloWorld Web Service.</description>
-    <properties>
-        <ws.type>axis2</ws.type>
-    </properties>
+
+
 
     <dependencies>
     
         <dependency>
             <groupId>commonj</groupId>
             <artifactId>sdo-api-r2.0.1</artifactId>
-            <version>${tuscanyVersion}</version>
+            <version>${scaVersion}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.osoa</groupId>
             <artifactId>sca-api-r0.95</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>compile</scope>
+            <version>1.0-incubator-M2</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-api</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>compile</scope> 
+            <version>${scaVersion}</version>
+            <scope>provided</scope> 
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>core</artifactId>
-            <version>${tuscanyVersion}</version>
+            <version>${scaVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.services.bindings</groupId>
             <artifactId>axis2</artifactId>
-            <version>${tuscanyVersion}</version>
+            <version>${scaVersion}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>test</artifactId>
-            <version>${tuscanyVersion}</version>
+            <version>${scaVersion}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca.services.databinding</groupId>
             <artifactId>databinding-sdo</artifactId>
-            <version>${tuscanyVersion}</version>
+            <version>${scaVersion}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca.services.databinding</groupId>
             <artifactId>databinding-axiom</artifactId>
-            <version>${tuscanyVersion}</version>
+            <version>${scaVersion}</version>
             <scope>test</scope>
         </dependency>
                         
     </dependencies>
     
      <build>
+        <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -97,6 +97,7 @@
                     <archive>
                         <manifest>
                             <mainClass>helloworld.HelloWorldClient</mainClass>
+                            <addClasspath>true</addClasspath>
                         </manifest>
                     </archive>
                 </configuration>

Modified: incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=466053&r1=465663&r2=466053
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl Fri Oct 20 03:29:42 2006
@@ -19,9 +19,16 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
-           name="helloworldwsclient">
+          name="helloworldwsclient">
+          
+    <dependency xmlns="http://incubator.apache.org/tuscany/xmlns/1.0-incubator-M2">
+        <group>org.apache.tuscany.sca.services.databinding</group>
+        <name>databinding-sdo</name>
+        <version>1.0-incubator-M2-SNAPSHOT</version>
+    </dependency>
+           
     
-    <dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" location="wsdl/helloworld.wsdl"/>
+    <dbsdo:import.sdo xmlns:dbsdo="http://incubator.apache.org/tuscany/xmlns/databinding/sdo/1.0-incubator-M2" location="wsdl/helloworld.wsdl"/>
     
     <component name="HelloWorldServiceComponent">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>

Modified: incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml?view=diff&rev=466053&r1=464866&r2=466053
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml Fri Oct 20 03:29:42 2006
@@ -19,7 +19,7 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-M2-SNAPSHOT</version>
     </parent>
@@ -37,13 +37,13 @@
         <dependency>
             <groupId>org.osoa</groupId>
             <artifactId>sca-api-r0.95</artifactId>
-            <version>1.0-incubator-M2-SNAPSHOT</version>
+            <version>${scaVersion}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-api</artifactId>
-            <version>${pom.version}</version>
+            <version>${scaVersion}</version>
             <scope>compile</scope> <!-- runtime is need for webapp integration to include jar -->
         </dependency>
         
@@ -117,6 +117,7 @@
     </dependencies>
     
     <build>
+        <defaultGoal>install</defaultGoal>
         <finalName>sample-helloworldws-async-1.0-incubator-M2-SNAPSHOT</finalName>
         <plugins>
             <plugin>
@@ -132,5 +133,5 @@
                 </executions>
             </plugin>
         </plugins>
-    </build>    
+    </build>
 </project>



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