Author: jsdelfino
Date: Tue May  9 02:50:11 2006
New Revision: 405364

URL: http://svn.apache.org/viewcvs?rev=405364&view=rev
Log:
Cleanup helloworldwsclient sample

Removed:
    
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/axis2.xml
Modified:
    incubator/tuscany/java/sca/samples/helloworldwsclient/pom.xml
    
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
    
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl

Modified: incubator/tuscany/java/sca/samples/helloworldwsclient/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/samples/helloworldwsclient/pom.xml?rev=405364&r1=405363&r2=405364&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworldwsclient/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworldwsclient/pom.xml Tue May  9 
02:50:11 2006
@@ -32,19 +32,26 @@
             <groupId>org.apache.tuscany</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.containers</groupId>
             <artifactId>tuscany-container-java</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.bindings</groupId>
             <artifactId>tuscany-binding-axis2</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>

Modified: 
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java?rev=405364&r1=405363&r2=405364&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
 (original)
+++ 
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
 Tue May  9 02:50:11 2006
@@ -41,7 +41,7 @@
         MonitorFactory monitorFactory = new JavaLoggingMonitorFactory(levels, 
Level.FINEST, "MonitorMessages");
 
         // Create a Tuscany runtime for the sample module component
-        TuscanyRuntime tuscany = new 
TuscanyRuntime("HelloWorldModuleComponent", null, monitorFactory);
+        TuscanyRuntime tuscany = new 
TuscanyRuntime("HelloWorldModuleComponent", "http://helloworld";, 
monitorFactory);
 
         // Start the Tuscany runtime and associate it with this thread
         tuscany.start();
@@ -58,7 +58,7 @@
         System.out.println(value);
         System.out.flush();
 
-        // Disassociate the application module component
+        // Disassociate the runtime from this thread
         tuscany.stop();
 
         // Shut down the runtime

Modified: 
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl?rev=405364&r1=405363&r2=405364&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
 (original)
+++ 
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
 Tue May  9 02:50:11 2006
@@ -14,18 +14,20 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  -->
-<wsdl:definitions 
targetNamespace="http://helloworldaxis.samples.tuscany.apache.org"; 
xmlns:apachesoap="http://xml.apache.org/xml-soap"; 
xmlns:impl="http://helloworldaxis.samples.tuscany.apache.org"; 
xmlns:intf="http://helloworldaxis.samples.tuscany.apache.org"; 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; name="helloworld">
-    <!--WSDL created by Apache Axis version: 1.2.1
-Built on Jun 14, 2005 (09:15:57 EDT)-->
+<wsdl:definitions targetNamespace="http://helloworld"; 
xmlns:tns="http://helloworld"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+       name="helloworld">
+
     <wsdl:types>
-        <schema elementFormDefault="qualified" 
targetNamespace="http://helloworldaxis.samples.tuscany.apache.org"; 
xmlns="http://www.w3.org/2001/XMLSchema";>
+        <schema elementFormDefault="qualified" 
targetNamespace="http://helloworld"; xmlns="http://www.w3.org/2001/XMLSchema";>
+
             <element name="getGreetings">
                 <complexType>
                     <sequence>
-                        <element name="in0" type="xsd:string"/>
+                        <element name="name" type="xsd:string"/>
                     </sequence>
                 </complexType>
             </element>
+
             <element name="getGreetingsResponse">
                 <complexType>
                     <sequence>
@@ -37,67 +39,37 @@
     </wsdl:types>
 
     <wsdl:message name="getGreetingsRequest">
-
-        <wsdl:part element="impl:getGreetings" name="parameters"/>
-
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
     </wsdl:message>
 
     <wsdl:message name="getGreetingsResponse">
-
-        <wsdl:part element="impl:getGreetingsResponse" name="parameters"/>
-
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
     </wsdl:message>
 
-    <wsdl:portType name="HelloWorldServiceImpl">
-
+    <wsdl:portType name="HelloWorld">
         <wsdl:operation name="getGreetings">
-
-            <wsdl:input message="impl:getGreetingsRequest" 
name="getGreetingsRequest"/>
-
-            <wsdl:output message="impl:getGreetingsResponse" 
name="getGreetingsResponse"/>
-
+            <wsdl:input message="tns:getGreetingsRequest" 
name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" 
name="getGreetingsResponse"/>
         </wsdl:operation>
-
     </wsdl:portType>
 
-    <wsdl:binding name="helloworldSoapBinding" 
type="impl:HelloWorldServiceImpl">
-
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
         <wsdlsoap:binding style="document" 
transport="http://schemas.xmlsoap.org/soap/http"/>
-
         <wsdl:operation name="getGreetings">
-
             <wsdlsoap:operation soapAction=""/>
-
             <wsdl:input name="getGreetingsRequest">
-
                 <wsdlsoap:body use="literal"/>
-
             </wsdl:input>
-
             <wsdl:output name="getGreetingsResponse">
-
                 <wsdlsoap:body use="literal"/>
-
             </wsdl:output>
-
         </wsdl:operation>
-
     </wsdl:binding>
 
-    <wsdl:service name="HelloWorldServiceImplService">
-
-        <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
-
-            <!-- Tuscany SCA Service -->
-            <wsdlsoap:address 
location="http://localhost:8080/helloworldws-SNAPSHOT/services/HelloWorldService"/>
-
-            <!-- Axis Web Service -->
-            <!--
-            <wsdlsoap:address 
location="http://localhost:8081/helloworldaxissvc-SNAPSHOT/services/helloworld"/>
-            -->
-
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapPort" 
name="HelloWorldSoapBinding">
+            <wsdlsoap:address 
location="http://localhost:8080/helloworldws-SNAPSHOT/services/HelloWorldService"/>
         </wsdl:port>
-
     </wsdl:service>
 
 </wsdl:definitions>


Reply via email to