Author: isuru Date: Sat Jun 6 00:46:00 2009 New Revision: 37959 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=37959
Log: fixing jaxws sample Removed: trunk/wsas/java/modules/samples/JAXWS/conf/services.xml 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/pom.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/Calculator.java trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java trunk/wsas/java/modules/samples/JAXWS/wsdl/CalculatorService.wsdl Modified: trunk/wsas/java/modules/samples/JAXWS/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/JAXWS/build.xml?rev=37959&r1=37958&r2=37959&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/JAXWS/build.xml (original) +++ trunk/wsas/java/modules/samples/JAXWS/build.xml Sat Jun 6 00:46:00 2009 @@ -24,7 +24,6 @@ <property name="classes" value="${temp.dir}/classes"/> <property name="src" value="src"/> <property name="services" value="services"/> - <property name="aarName" value="calculator-jaxws-sample.aar"/> <property name="jarName" value="calculator-jaxws-sample.jar"/> <property name="target.dir" value="target"/> <property name="generated.dir" value="${target.dir}/generated"/> @@ -105,33 +104,26 @@ <property name="jaxws.dir" value="${temp.dir}/jaxws"/> <mkdir dir="${jaxws.dir}"/> - <mkdir dir="${jaxws.dir}/META-INF"/> - <copy file="conf/services.xml" tofile="${jaxws.dir}/META-INF/services.xml"/> - <copy file="wsdl/CalculatorService.wsdl" tofile="${jaxws.dir}/META-INF/service.wsdl"/> + <copy file="wsdl/CalculatorService.wsdl" toDir="${jaxws.dir}"/> <copy toDir="${jaxws.dir}"> <fileset dir="${classes}"> <include name="**/*.class"/> </fileset> </copy> - <jar destfile="${services}/${aarName}"> + <jar destfile="${services}/${jarName}"> <fileset dir="${jaxws.dir}"/> </jar> - <jar destfile="${services}/${jarName}"> - <fileset dir="${classes}"> - <include name="**/*.class"/> - </fileset> - </jar> </target> <target name="build-all" depends="build-service"> <echo message="Copying the classes to lib directory"/> - <echo message="Copying the created aar files in to the repository"/> - <copy toDir="${repo.location}/services"> + <echo message="Copying the created jar file in to the repository"/> + <copy toDir="${repo.location}/servicejars"> <fileset dir="${services}"> - <include name="**/*.aar"/> + <include name="**/*.jar"/> </fileset> </copy> Deleted: trunk/wsas/java/modules/samples/JAXWS/conf/services.xml URL: http://wso2.org/svn/browse/wso2/None?pathrev=37958 Modified: trunk/wsas/java/modules/samples/JAXWS/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/JAXWS/pom.xml?rev=37959&r1=37958&r2=37959&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/JAXWS/pom.xml (original) +++ trunk/wsas/java/modules/samples/JAXWS/pom.xml Sat Jun 6 00:46:00 2009 @@ -16,11 +16,6 @@ <build> <sourceDirectory>src</sourceDirectory> <testSourceDirectory>test</testSourceDirectory> - <!--<resources> - <resource> - <directory>resources</directory> - </resource> - </resources>--> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -30,17 +25,6 @@ <target>1.5</target> </configuration> </plugin> - <!--<plugin> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-aar-maven-plugin</artifactId> - <version>1.3</version> - <extensions>true</extensions> - <configuration> - <servicesXmlFile>resources/META-INF/services.xml</servicesXmlFile> - <wsdlFile>resources/META-INF/CalculatorService.wsdl</wsdlFile> - <includeDependencies>false</includeDependencies> - </configuration> - </plugin>--> <plugin> <inherited>false</inherited> <groupId>org.apache.maven.plugins</groupId> Modified: trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/client/CalculatorClient.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/client/CalculatorClient.java?rev=37959&r1=37958&r2=37959&view=diff ============================================================================== --- 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 Sat Jun 6 00:46:00 2009 @@ -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.CalculatorStub; import java.rmi.RemoteException; import java.util.Random; @@ -33,7 +33,7 @@ public static void main(String[] args) { try { //Instantiate the Calculator Stub - CalculatorServiceStub stub = new CalculatorServiceStub(); + CalculatorStub stub = new CalculatorStub(); doAdd(stub); } catch (Exception e) { e.printStackTrace(); @@ -43,7 +43,7 @@ /** * Invoke the Calculator Service Add */ - private static void doAdd(CalculatorServiceStub stub) throws RemoteException { + private static void doAdd(CalculatorStub stub) throws RemoteException { //Generate two random values between 0 to 100 Random rand = new Random(); Modified: trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Add.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Add.java?rev=37959&r1=37958&r2=37959&view=diff ============================================================================== --- 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 Sat Jun 6 00:46:00 2009 @@ -53,7 +53,7 @@ "value1", "value2" }) -...@xmlrootelement(name = "add") +...@xmlrootelement(name = "add", namespace = "http://calculator.jaxws.sample.wsas.wso2.org";) public class Add { @XmlElement(namespace = "http://calculator.jaxws.sample.wsas.wso2.org";) Modified: trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Calculator.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/Calculator.java?rev=37959&r1=37958&r2=37959&view=diff ============================================================================== --- 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 Sat Jun 6 00:46:00 2009 @@ -23,8 +23,10 @@ import javax.jws.WebParam; import javax.jws.WebResult; import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; +import javax.xml.bind.annotation.XmlSeeAlso; /** @@ -33,25 +35,22 @@ * Generated source version: 2.0 * */ -//@WebService(name = "Calculator", targetNamespace = "http://service.calculator.sample.jaxws.wsas.wso2.org";) +...@webservice(name = "Calculator", targetNamespace = "http://service.calculator.sample.jaxws.wsas.wso2.org";) +...@xmlseealso({ObjectFactory.class}) +...@soapbinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public interface Calculator { /** * - * @param value1 - * @param value2 + * @param addInstance - Add object containing input values * @return - * returns int + * returns AddResponse with the total */ @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); + @WebResult(name = "AddResponse", targetNamespace = "http://calculator.jaxws.sample.wsas.wso2.org";) + public AddResponse add( + @WebParam(name = "Add", targetNamespace = "http://calculator.jaxws.sample.wsas.wso2.org";) + Add addInstance); } Modified: trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/JAXWSCalculatorService.java?rev=37959&r1=37958&r2=37959&view=diff ============================================================================== --- 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 Sat Jun 6 00:46:00 2009 @@ -22,10 +22,13 @@ import javax.jws.WebService; import javax.xml.ws.WebServiceContext; -...@webservice(serviceName = "Calculator", - endpointInterface = "org.wso2.wsas.sample.jaxws.calculator.service.Calculator", - targetNamespace = "http://calculator.jaxws.sample.wsas.wso2.org";) -public class JAXWSCalculatorService implements Calculator { + @WebService(serviceName = "Calculator", + portName = "CalculatorSOAP", + endpointInterface = "org.wso2.wsas.sample.jaxws.calculator.service.Calculator", + wsdlLocation = "CalculatorService.wsdl", + targetNamespace = "http://calculator.jaxws.sample.wsas.wso2.org";) + + public class JAXWSCalculatorService implements Calculator { @Resource private WebServiceContext context; @@ -39,13 +42,19 @@ } /** - * @param value1 - * @param value2 + * @param addInstance - Add object with two input values * @return - * returns int + * returns AddResponse with the total */ - public int add(int value1, int value2) { - System.out.println("value1: " + value1 + " value2: " + value2); - return value1 + value2; + public AddResponse add(Add addInstance) { + int value1 = addInstance.getValue1(); + int value2 = addInstance.getValue2(); + + System.out.println("value1: " + value1); + System.out.println("value2: " + value2); + + AddResponse ar = new AddResponse(); + ar.setReturn(value1 + value2); + return ar; } } \ No newline at end of file Deleted: trunk/wsas/java/modules/samples/JAXWS/src/org/wso2/wsas/sample/jaxws/calculator/service/package-info.java URL: http://wso2.org/svn/browse/wso2/None?pathrev=37958 Modified: trunk/wsas/java/modules/samples/JAXWS/wsdl/CalculatorService.wsdl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/JAXWS/wsdl/CalculatorService.wsdl?rev=37959&r1=37958&r2=37959&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/JAXWS/wsdl/CalculatorService.wsdl (original) +++ trunk/wsas/java/modules/samples/JAXWS/wsdl/CalculatorService.wsdl Sat Jun 6 00:46:00 2009 @@ -33,15 +33,15 @@ <xsd:element name="add"> <xsd:complexType> <xsd:sequence> - <xsd:element name="value1" type="xsd:int"/> - <xsd:element name="value2" type="xsd:int"/> + <xsd:element name="value1" type="xsd:int" minOccurs="1" maxOccurs="1"/> + <xsd:element name="value2" type="xsd:int" minOccurs="1" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> </xsd:element> <xsd:element name="addResponse"> <xsd:complexType> <xsd:sequence> - <xsd:element name="return" type="xsd:int"/> + <xsd:element name="return" type="xsd:int" minOccurs="1" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> </xsd:element> @@ -53,12 +53,14 @@ <wsdl:message name="addResponse"> <wsdl:part name="addResponse" element="tns:addResponse"/> </wsdl:message> + <wsdl:portType name="Calculator"> <wsdl:operation name="add"> <wsdl:input name="add" message="tns:add"/> <wsdl:output name="addResponse" message="tns:addResponse"/> </wsdl:operation> </wsdl:portType> + <wsdl:binding name="CalculatorSoapBinding" type="tns:Calculator"> <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> <wsdl:operation name="add"> @@ -71,9 +73,11 @@ </wsdl:output> </wsdl:operation> </wsdl:binding> - <wsdl:service name="CalculatorService"> - <wsdl:port name="Calculator" binding="tns:CalculatorSoapBinding"> - <soap:address location="http://localhost:9763/services/CalculatorService"/> + + <wsdl:service name="Calculator"> + <wsdl:port name="CalculatorSOAP" binding="tns:CalculatorSoapBinding"> + <soap:address location="http://localhost:9763/services/Calculator.CalculatorSOAP"/> </wsdl:port> </wsdl:service> + </wsdl:definitions> _______________________________________________ Wsas-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
