Author: sandakith
Date: Wed Jan  9 04:42:35 2008
New Revision: 12077

Log:

Fixied the JAXWS sample, namespaces, ant build and runclient

Modified:
   trunk/wsas/java/modules/samples/JAXWS/build.xml
   trunk/wsas/java/modules/samples/JAXWS/conf/codegen.xml
   
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/client/CalculatorClient.java
   
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Add.java
   
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/AddResponse.java
   
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Calculator.java
   
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java
   
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/package-info.java

Modified: trunk/wsas/java/modules/samples/JAXWS/build.xml
==============================================================================
--- trunk/wsas/java/modules/samples/JAXWS/build.xml     (original)
+++ trunk/wsas/java/modules/samples/JAXWS/build.xml     Wed Jan  9 04:42:35 2008
@@ -46,9 +46,12 @@
                        <include name="*.jar" />
                        <include name="endorsed/*.jar" />
                </fileset>
-               <fileset dir="${generated.dir}/lib">
+               <fileset dir="services">
                        <include name="*.jar" />
                </fileset>
+                <fileset dir="${generated.lib.dir}">
+                        <include name="*.jar" />
+                </fileset>
     </path>
 
     <target name="init" depends="clean">
@@ -112,11 +115,6 @@
 
     <target name="build-all" depends="build-service">
         <echo message="Copying the classes to lib directory"/>
-        <copy todir="${lib}">
-            <fileset dir="${services}">
-                <include name="**/*.jar"/>
-            </fileset>
-        </copy>
         <echo message="Copying the created aar files in to the repository"/>
         <copy toDir="${repo.location}/services">
             <fileset dir="${services}">

Modified: trunk/wsas/java/modules/samples/JAXWS/conf/codegen.xml
==============================================================================
--- trunk/wsas/java/modules/samples/JAXWS/conf/codegen.xml      (original)
+++ trunk/wsas/java/modules/samples/JAXWS/conf/codegen.xml      Wed Jan  9 
04:42:35 2008
@@ -31,7 +31,6 @@
     <set>
         <uri>./wsdl/CalculatorService.wsdl</uri>
         <o>./target/generated</o>
-        <p>org.wso2.wsas.sample.jaxws.calculator.service</p>
         <d>adb</d>
         <u/>
         <ns2p>http://www.wso2.org/types=org.wso2.www.types.services</ns2p>

Modified: 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/client/CalculatorClient.java
==============================================================================
--- 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/client/CalculatorClient.java
        (original)
+++ 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/client/CalculatorClient.java
        Wed Jan  9 04:42:35 2008
@@ -18,9 +18,9 @@
  */
 package org.wso2.wsas.sample.jaxws.calculator.client;
 
+import org.wso2.wsas.sample.jaxws.calculator.CalculatorServiceStub;
 import org.wso2.wsas.sample.jaxws.calculator.Add;
 import org.wso2.wsas.sample.jaxws.calculator.AddResponse;
-import org.wso2.wsas.sample.jaxws.calculator.service.CalculatorServiceStub;
 
 import java.rmi.RemoteException;
 import java.util.Random;

Modified: 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Add.java
==============================================================================
--- 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Add.java
    (original)
+++ 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Add.java
    Wed Jan  9 04:42:35 2008
@@ -56,9 +56,9 @@
 @XmlRootElement(name = "add")
 public class Add {
 
-    @XmlElement(namespace = 
"http://service.calculator.sample.jaxws.wsas.wso2.org";)
+    @XmlElement(namespace = "http://calculator.jaxws.sample.wsas.wso2.org";)
     protected int value1;
-    @XmlElement(namespace = 
"http://service.calculator.sample.jaxws.wsas.wso2.org";)
+    @XmlElement(namespace = "http://calculator.jaxws.sample.wsas.wso2.org";)
     protected int value2;
 
     /**

Modified: 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/AddResponse.java
==============================================================================
--- 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/AddResponse.java
    (original)
+++ 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/AddResponse.java
    Wed Jan  9 04:42:35 2008
@@ -51,10 +51,10 @@
 @XmlType(name = "", propOrder = {
     "_return"
 })
[EMAIL PROTECTED](name = "addResponse")
[EMAIL PROTECTED](name = "addResponse", namespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";)
 public class AddResponse {
 
-    @XmlElement(name = "return", namespace = 
"http://service.calculator.sample.jaxws.wsas.wso2.org";)
+    @XmlElement(name = "return", namespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";)
     protected int _return;
 
     /**

Modified: 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Calculator.java
==============================================================================
--- 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Calculator.java
     (original)
+++ 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Calculator.java
     Wed Jan  9 04:42:35 2008
@@ -31,18 +31,27 @@
  * This class was generated by the JAXWS SI.
  * JAX-WS RI 2.0_01-b59-fcs
  * Generated source version: 2.0
- * 
+ *
  */
+//@WebService(name = "Calculator", targetNamespace = 
"http://service.calculator.sample.jaxws.wsas.wso2.org";)
 public interface Calculator {
 
+
     /**
-     * 
+     *
      * @param value1
      * @param value2
      * @return
      *     returns int
      */
+    @WebMethod(action = "add")
+    @WebResult(targetNamespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";)
+    @RequestWrapper(localName = "add", targetNamespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";, className = 
"org.wso2.wsas.sample.jaxws.calculator.service.Add")
+    @ResponseWrapper(localName = "addResponse", targetNamespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";, className = 
"org.wso2.wsas.sample.jaxws.calculator.service.AddResponse")
     public int add(
+        @WebParam(name = "value1", targetNamespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";)
         int value1,
+        @WebParam(name = "value2", targetNamespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";)
         int value2);
+
 }

Modified: 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java
==============================================================================
--- 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java
 (original)
+++ 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java
 Wed Jan  9 04:42:35 2008
@@ -24,7 +24,7 @@
 
 @WebService(serviceName = "Calculator",
             endpointInterface = 
"org.wso2.wsas.sample.jaxws.calculator.service.Calculator",
-            targetNamespace = 
"http://service.calculator.sample.jaxws.wsas.wso2.org";)
+            targetNamespace = "http://calculator.jaxws.sample.wsas.wso2.org";)
 public class JAXWSCalculatorService implements Calculator {
 
     @Resource
@@ -45,7 +45,6 @@
      *     returns int
      */
     public int add(int value1, int value2) {
-        System.out.println("User Principal: " + context.getUserPrincipal());
         System.out.println("value1: " + value1 + " value2: " + value2);
         return value1 + value2;
     }

Modified: 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/package-info.java
==============================================================================
--- 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/package-info.java
   (original)
+++ 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/package-info.java
   Wed Jan  9 04:42:35 2008
@@ -17,5 +17,5 @@
  * under the License.
  */
 
[EMAIL PROTECTED](namespace = 
"http://service.calculator.sample.jaxws.wsas.wso2.org";)
[EMAIL PROTECTED](namespace = "http://calculator.jaxws.sample.wsas.wso2.org";)
 package org.wso2.wsas.sample.jaxws.calculator;
\ No newline at end of file

_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev

Reply via email to