Author: sandakith
Date: Mon Jan  7 05:16:42 2008
New Revision: 11963

Log:

1) Correct the namespaces of the JAXWS sample 
2) modified the inteface that confliced the annotations with imple annotations 
when it comes to work with the Axis2 JAXWS 
3) accrding changes to the codegen.xml and the service impl class



Added:
   
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java
      - copied, changed from r11819, 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/CalculatorService.java
Removed:
   
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/CalculatorService.java
Modified:
   trunk/wsas/java/modules/samples/JAXWS/conf/codegen.xml
   trunk/wsas/java/modules/samples/JAXWS/conf/services.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/package-info.java

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      Mon Jan  7 
05:16:42 2008
@@ -20,7 +20,7 @@
     <set>
         <uri>./wsdl/CalculatorService.wsdl</uri>
         <o>./target/generated</o>
-        <p>org.wso2.wsas.sample.jaxws.services</p>
+        <p>org.wso2.wsas.sample.jaxws.calculator.service</p>
         <d>adb</d>
         <ss/>
         <ssi/>
@@ -31,7 +31,7 @@
     <set>
         <uri>./wsdl/CalculatorService.wsdl</uri>
         <o>./target/generated</o>
-        <p>org.wso2.wsas.sample.jaxws.services</p>
+        <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/conf/services.xml
==============================================================================
--- trunk/wsas/java/modules/samples/JAXWS/conf/services.xml     (original)
+++ trunk/wsas/java/modules/samples/JAXWS/conf/services.xml     Mon Jan  7 
05:16:42 2008
@@ -23,7 +23,7 @@
             <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out";
                              
class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
         </messageReceivers>
-        <parameter 
name="ServiceClass">org.wso2.wsas.jaxws.calculator.CalculatorService</parameter>
+        <parameter 
name="ServiceClass">org.wso2.wsas.sample.jaxws.calculator.service.JAXWSCalculatorService</parameter>
         <operation name="add" mep="http://www.w3.org/2004/08/wsdl/in-out";>
             <actionMapping/>
         </operation>

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
        Mon Jan  7 05:16:42 2008
@@ -20,7 +20,7 @@
 
 import org.wso2.wsas.sample.jaxws.calculator.Add;
 import org.wso2.wsas.sample.jaxws.calculator.AddResponse;
-import org.wso2.wsas.sample.jaxws.services.CalculatorServiceStub;
+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
    Mon Jan  7 05:16:42 2008
@@ -56,9 +56,9 @@
 @XmlRootElement(name = "add")
 public class Add {
 
-    @XmlElement(namespace = "http://calculator.jaxws.wsas.wso2.org";)
+    @XmlElement(namespace = 
"http://service.calculator.sample.jaxws.wsas.wso2.org";)
     protected int value1;
-    @XmlElement(namespace = "http://calculator.jaxws.wsas.wso2.org";)
+    @XmlElement(namespace = 
"http://service.calculator.sample.jaxws.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
    Mon Jan  7 05:16:42 2008
@@ -54,7 +54,7 @@
 @XmlRootElement(name = "addResponse")
 public class AddResponse {
 
-    @XmlElement(name = "return", namespace = 
"http://calculator.jaxws.wsas.wso2.org";)
+    @XmlElement(name = "return", namespace = 
"http://service.calculator.sample.jaxws.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
     Mon Jan  7 05:16:42 2008
@@ -33,10 +33,8 @@
  * Generated source version: 2.0
  * 
  */
[EMAIL PROTECTED](name = "Calculator", targetNamespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";)
 public interface Calculator {
 
-
     /**
      * 
      * @param value1
@@ -44,14 +42,7 @@
      * @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.Add")
-    @ResponseWrapper(localName = "addResponse", targetNamespace = 
"http://calculator.jaxws.sample.wsas.wso2.org";, className = 
"org.wso2.wsas.sample.jaxws.calculator.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);
-
 }

Copied: 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java
 (from r11819, 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/CalculatorService.java)
==============================================================================
--- 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/CalculatorService.java
      (original)
+++ 
trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java
 Mon Jan  7 05:16:42 2008
@@ -23,9 +23,9 @@
 import javax.xml.ws.WebServiceContext;
 
 @WebService(serviceName = "Calculator",
-            endpointInterface = 
"org.wso2.wsas.sample.jaxws.calculator.Calculator",
-            targetNamespace = "http://calculator.jaxws.sample.wsas.wso2.org";)
-public class CalculatorService implements Calculator {
+            endpointInterface = 
"org.wso2.wsas.sample.jaxws.calculator.service.Calculator",
+            targetNamespace = 
"http://service.calculator.sample.jaxws.wsas.wso2.org";)
+public class JAXWSCalculatorService implements Calculator {
 
     @Resource
     private WebServiceContext context;

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
   Mon Jan  7 05:16:42 2008
@@ -17,5 +17,5 @@
  * under the License.
  */
 
[EMAIL PROTECTED](namespace = "http://calculator.jaxws.sample.wsas.wso2.org";)
-package org.wso2.wsas.sample.jaxws.calculator;
[EMAIL PROTECTED](namespace = 
"http://service.calculator.sample.jaxws.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