November 2006 - jbossws-commits - Jboss List Archives

JBossWS SVN: r1416 - trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-09 08:33:03 -0500 (Thu, 09 Nov 2006) New Revision: 1416 Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java Log: JBW samples Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java 2006-11-09 13:32:51 UTC (rev 1415) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java 2006-11-09 13:33:03 UTC (rev 1416) @@ -21,13 +21,14 @@ */ package org.jboss.test.ws.jaxws.samples.retail; +import javax.xml.bind.annotation.XmlType; import java.io.Serializable; -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Nov 7, 2006 - */ +@XmlType(name="customer", namespace = "http://org.jboss.ws/samples/retail", propOrder = { + "creditCardDetails", + "firstName", + "lastName" +}) public class Customer implements Serializable { private String firstName; private String lastName;

18 years, 1 month

1
0
0 / 0

JBossWS SVN: r1415 - trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-09 08:32:51 -0500 (Thu, 09 Nov 2006) New Revision: 1415 Added: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl Log: JBW samples Added: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl =================================================================== --- trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl 2006-11-09 13:32:13 UTC (rev 1414) +++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl 2006-11-09 13:32:51 UTC (rev 1415) @@ -0,0 +1,65 @@ +<definitions name="OrderMgmtService" targetNamespace="http://org.jboss.ws/samples/retail" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://org.jboss.ws/samples/retail" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <types> + <xs:schema targetNamespace="http://org.jboss.ws/samples/retail" version="1.0" xmlns:tns="http://org.jboss.ws/samples/retail" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="prepareOrder" nillable="true" type="tns:order"/> + <xs:element name="prepareOrderResponse" nillable="true" type="tns:orderStatus"/> + <xs:complexType name="order"> + <xs:sequence> + <xs:element minOccurs="0" name="customer" type="tns:customer"/> + <xs:element name="orderNum" type="xs:long"/> + <xs:element minOccurs="0" name="state" type="tns:orderState"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="customer"> + <xs:sequence> + <xs:element minOccurs="0" name="creditCardDetails" type="xs:string"/> + <xs:element minOccurs="0" name="firstName" type="xs:string"/> + <xs:element minOccurs="0" name="lastName" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="orderStatus"> + <xs:sequence> + <xs:element name="orderNum" type="xs:long"/> + <xs:element minOccurs="0" name="status" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:simpleType name="orderState"> + <xs:restriction base="xs:string"> + <xs:enumeration value="PROCESSED"/> + <xs:enumeration value="VERIFIED"/> + <xs:enumeration value="PREPARED"/> + <xs:enumeration value="TRANSIENT"/> + </xs:restriction> + </xs:simpleType> + </xs:schema> + </types> + <message name="OrderMgmt_prepareOrderResponse"> + <part element="tns:prepareOrderResponse" name="prepareOrderResponse"/> + </message> + <message name="OrderMgmt_prepareOrder"> + <part element="tns:prepareOrder" name="prepareOrder"/> + </message> + <portType name="OrderMgmt"> + <operation name="prepareOrder" parameterOrder="prepareOrder"> + <input message="tns:OrderMgmt_prepareOrder"/> + <output message="tns:OrderMgmt_prepareOrderResponse"/> + </operation> + </portType> + <binding name="OrderMgmtBinding" type="tns:OrderMgmt"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="prepareOrder"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="OrderMgmtService"> + <port binding="tns:OrderMgmtBinding" name="OrderMgmtPort"> + <soap:address location="http://D1XC662J:8080/jaxws-samples-retail/OrderMgmtBean"/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl =================================================================== --- trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2006-11-09 13:32:13 UTC (rev 1414) +++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2006-11-09 13:32:51 UTC (rev 1415) @@ -0,0 +1,64 @@ +<definitions name='ProfileMgmtService' targetNamespace='http://org.jboss.ws/samples/retail/profile' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/samples/retail' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/retail/profile' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.ws/samples/retail/profile' version='1.0' xmlns:ns1='http://org.jboss.ws/samples/retail' xmlns:tns='http://org.jboss.ws/samples/retail/profile' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:import namespace='http://org.jboss.ws/samples/retail'/> + <xs:element name='getCustomerDiscount' nillable='true' type='tns:discountRequest'/> + <xs:element name='getCustomerDiscountResponse' nillable='true' type='tns:discountResponse'/> + <xs:complexType name='discountRequest'> + <xs:sequence> + <xs:element minOccurs='0' name='customer' type='ns1:customer'/> + + </xs:sequence> + </xs:complexType> + <xs:complexType name='discountResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='customer' type='ns1:customer'/> + <xs:element name='discount' type='xs:double'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + + <xs:schema targetNamespace='http://org.jboss.ws/samples/retail' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:complexType name='customer'> + <xs:sequence> + <xs:element minOccurs='0' name='creditCardDetails' type='xs:string'/> + <xs:element minOccurs='0' name='firstName' type='xs:string'/> + <xs:element minOccurs='0' name='lastName' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + + </types> + <message name='ProfileMgmt_getCustomerDiscount'> + <part element='tns:getCustomerDiscount' name='getCustomerDiscount'/> + </message> + <message name='ProfileMgmt_getCustomerDiscountResponse'> + <part element='tns:getCustomerDiscountResponse' name='getCustomerDiscountResponse'/> + </message> + <portType name='ProfileMgmt'> + <operation name='getCustomerDiscount' parameterOrder='getCustomerDiscount'> + + <input message='tns:ProfileMgmt_getCustomerDiscount'/> + <output message='tns:ProfileMgmt_getCustomerDiscountResponse'/> + </operation> + </portType> + <binding name='ProfileMgmtBinding' type='tns:ProfileMgmt'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='getCustomerDiscount'> + <soap:operation soapAction=''/> + <input> + + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='ProfileMgmtService'> + <port binding='tns:ProfileMgmtBinding' name='ProfileMgmtPort'> + + <soap:address location='http://D1XC662J:8080/jaxws-samples-retail/ProfileMgmtBean'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 1 month

1
0
0 / 0

JBossWS SVN: r1414 - in trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail: . profile

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-09 08:32:13 -0500 (Thu, 09 Nov 2006) New Revision: 1414 Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountRequest.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountResponse.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmt.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java Log: JBW samples Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountRequest.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountRequest.java 2006-11-09 12:09:32 UTC (rev 1413) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountRequest.java 2006-11-09 13:32:13 UTC (rev 1414) @@ -0,0 +1,29 @@ + +package org.jboss.test.ws.jaxws.samples.retail.profile; + +import org.jboss.test.ws.jaxws.samples.retail.Customer; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +public class DiscountRequest { + + protected Customer customer; + + public DiscountRequest() { + } + + public DiscountRequest(Customer customer) { + this.customer = customer; + } + + public Customer getCustomer() { + return customer; + } + + public void setCustomer(Customer value) { + this.customer = value; + } + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountRequest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountResponse.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountResponse.java 2006-11-09 12:09:32 UTC (rev 1413) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountResponse.java 2006-11-09 13:32:13 UTC (rev 1414) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.samples.retail.profile; + +import org.jboss.test.ws.jaxws.samples.retail.Customer; + + +public class DiscountResponse { + + protected Customer customer; + protected double discount; + + public DiscountResponse() { + } + + public DiscountResponse(Customer customer, double discount) { + this.customer = customer; + this.discount = discount; + } + + public Customer getCustomer() { + return customer; + } + + public void setCustomer(Customer value) { + this.customer = value; + } + + public double getDiscount() { + return discount; + } + + public void setDiscount(double value) { + this.discount = value; + } + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmt.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmt.java 2006-11-09 12:09:32 UTC (rev 1413) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmt.java 2006-11-09 13:32:13 UTC (rev 1414) @@ -0,0 +1,17 @@ + +package org.jboss.test.ws.jaxws.samples.retail.profile; + +import javax.ejb.Remote; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@Remote +@WebService(name = "ProfileMgmt", targetNamespace = "http://org.jboss.ws/samples/retail/profile") +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface ProfileMgmt { + + @WebMethod + public DiscountResponse getCustomerDiscount( DiscountRequest request); + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2006-11-09 12:09:32 UTC (rev 1413) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2006-11-09 13:32:13 UTC (rev 1414) @@ -0,0 +1,34 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail.profile; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +@Stateless +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt") +public class ProfileMgmtBean implements ProfileMgmt { + + public DiscountResponse getCustomerDiscount(DiscountRequest request) { + return new DiscountResponse(request.getCustomer(), 10.00); + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 1 month

1
0
0 / 0

JBossWS SVN: r1413 - trunk/src/main/java/org/jboss/ws/deployment

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-09 07:09:32 -0500 (Thu, 09 Nov 2006) New Revision: 1413 Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java Log: Fix JBCTS-391 Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-09 12:07:52 UTC (rev 1412) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-09 12:09:32 UTC (rev 1413) @@ -371,15 +371,20 @@ if (webMethodCount == 0) { Class superClass = wsClass.getSuperclass(); - while (superClass != null) + boolean isJDKClass = superClass.getPackage().getName().startsWith("java"); + + if(!isJDKClass) { - for (Method method : superClass.getMethods()) + while (superClass != null) { - processWebMethod(epMetaData, method); - webMethodCount++; + for (Method method : superClass.getMethods()) + { + processWebMethod(epMetaData, method); + webMethodCount++; + } + + superClass = superClass.getSuperclass(); } - - superClass = superClass.getSuperclass(); } }

18 years, 1 month

1
0
0 / 0

JBossWS SVN: r1412 - in trunk/src: ant test/ant test/resources/jaxws/samples test/resources/jaxws/samples/retail test/resources/jaxws/samples/retail/META-INF test/resources/jaxws/samples/retail/META-INF/wsdl

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-09 07:07:52 -0500 (Thu, 09 Nov 2006) New Revision: 1412 Added: trunk/src/test/resources/jaxws/samples/retail/ trunk/src/test/resources/jaxws/samples/retail/META-INF/ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl Modified: trunk/src/ant/build-samples.xml trunk/src/test/ant/build-jars-jaxws.xml Log: JBW samples Modified: trunk/src/ant/build-samples.xml =================================================================== --- trunk/src/ant/build-samples.xml 2006-11-09 12:07:31 UTC (rev 1411) +++ trunk/src/ant/build-samples.xml 2006-11-09 12:07:52 UTC (rev 1412) @@ -238,18 +238,18 @@ <fileset dir="${test.resources.dir}/jaxrpc/samples/swa"/> </copy> -  - <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java"> - <fileset dir="${test.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" /> +  + <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/java"/> + <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/> + + <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java"> + <fileset dir="${test.java.dir}"> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/> + </fileset> </copy> + <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"> + <fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" /> + </copy>  <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/java"/> @@ -317,7 +317,21 @@ <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/resources"> <fileset dir="${test.resources.dir}/jaxws/samples/wsaddressing"/> </copy> - + + +  + <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/> + <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/> + + <copy todir="${build.src.samples.dir}/jaxws/retail/java"> + <fileset dir="${test.java.dir}"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**"/> + </fileset> + </copy> + <copy todir="${build.src.samples.dir}/jaxws/retail/resources"> + <fileset dir="${test.resources.dir}/jaxws/samples/retail"/> + </copy> +  <zip destfile="${build.dir}/${samples.target}.zip"> <fileset dir="${build.dir}" includes="${samples.target}/**"/> Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-09 12:07:31 UTC (rev 1411) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-09 12:07:52 UTC (rev 1412) @@ -399,6 +399,27 @@ <include name="wsdl/**"/> </metainf> </jar> + +  + <jar jarfile="${build.test.dir}/libs/jaxws-samples-retail.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="wsdl/*"/> + </metainf> + </jar> + <jar jarfile="${build.test.dir}/libs/jaxws-samples-retail-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar>  <war warfile="${build.test.dir}/libs/jaxws-webserviceref.war" webxml="${build.test.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> Added: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl =================================================================== --- trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl 2006-11-09 12:07:31 UTC (rev 1411) +++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl 2006-11-09 12:07:52 UTC (rev 1412) @@ -0,0 +1,47 @@ +<definitions name="CCVerificationService" targetNamespace="http://org.jboss.ws/samples/retail/cc" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://org.jboss.ws/samples/retail/cc" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <types> + <xs:schema targetNamespace="http://org.jboss.ws/samples/retail/cc" version="1.0" xmlns:tns="http://org.jboss.ws/samples/retail/cc" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="verify" nillable="true" type="tns:verificationRequest"/> + <xs:element name="verifyResponse" nillable="true" type="tns:verificationResponse"/> + <xs:complexType name="verificationRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="creditCardNumber" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="verificationResponse"> + <xs:sequence> + <xs:element name="verified" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name="CCVerification_verify"> + <part element="tns:verify" name="verify"/> + </message> + <message name="CCVerification_verifyResponse"> + <part element="tns:verifyResponse" name="verifyResponse"/> + </message> + <portType name="CCVerification"> + <operation name="verify" parameterOrder="verify"> + <input message="tns:CCVerification_verify"/> + <output message="tns:CCVerification_verifyResponse"/> + </operation> + </portType> + <binding name="CCVerificationBinding" type="tns:CCVerification"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="verify"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="CCVerificationService"> + <port binding="tns:CCVerificationBinding" name="CCVerificationPort"> + <soap:address location="http://D1XC662J:8080/jaxws-samples-retail/CCVerificationBean"/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 1 month

1
0
0 / 0

JBossWS SVN: r1411 - in trunk/src/main/resources/samples/jaxws: . retail

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-09 07:07:31 -0500 (Thu, 09 Nov 2006) New Revision: 1411 Added: trunk/src/main/resources/samples/jaxws/retail/ trunk/src/main/resources/samples/jaxws/retail/build.xml Log: JBW samples Added: trunk/src/main/resources/samples/jaxws/retail/build.xml =================================================================== --- trunk/src/main/resources/samples/jaxws/retail/build.xml 2006-11-09 12:07:09 UTC (rev 1410) +++ trunk/src/main/resources/samples/jaxws/retail/build.xml 2006-11-09 12:07:31 UTC (rev 1411) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project default="main" basedir="../.." name="JBossWS Examples"> + + <property name="chapter" value="jaxws/retail"/> + <property name="sample.path" value="jaxws/samples/retail"/> + <property name="java.dir" value="${basedir}/${chapter}/java"/> + <property name="resources.dir" value="${basedir}/${chapter}/resources"/> + + <import file="${basedir}/common/imported-build.xml"/> + +  + <target name="jars" depends="compile15,copy-resources" + description="build the deployments" if="HAVE_JDK_1.5"> + +  + <jar jarfile="${build.test.dir}/libs/jaxws-samples-retail.ejb3"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/samples/retail/EJB3RemoteInterface.class"/> + </fileset> + <fileset dir="${build.test.dir}/resources/jaxws/samples/retail"> + <include name="config/ServerHandlers.xml"/> + </fileset> + </jar> + <jar jarfile="${build.test.dir}/libs/jaxws-samples-retail-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/EndpointInterface.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + + </target> + +  + <target name="tests" depends="jars" description="run the testsuite" if="only-on-jboss-jdk15"> + <antcall target="test"> + <param name="test" value="${sample.path}"/> + </antcall> + </target> + +</project> \ No newline at end of file Property changes on: trunk/src/main/resources/samples/jaxws/retail/build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 1 month

1
0
0 / 0

JBossWS SVN: r1410 - in trunk/src/test/java/org/jboss/test/ws/jaxws/samples: . retail retail/cc

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-09 07:07:09 -0500 (Thu, 09 Nov 2006) New Revision: 1410 Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Order.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderItem.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerification.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/ObjectFactory.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationRequest.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationResponse.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/package-info.java Log: JBW samples Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,60 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail; + +import java.io.Serializable; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Nov 7, 2006 + */ +public class Customer implements Serializable { + private String firstName; + private String lastName; + private String creditCardDetails; + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getCreditCardDetails() { + return creditCardDetails; + } + + public void setCreditCardDetails(String creditCardDetails) { + this.creditCardDetails = creditCardDetails; + } +} + Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Order.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Order.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Order.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,83 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail; + +import java.util.List; +import java.util.ArrayList; +import java.io.Serializable; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Nov 7, 2006 + */ +public class Order implements Serializable { + + public enum OrderState {TRANSIENT, PREPARED, VERIFIED, PROCESSED} + + private OrderState state; + private long orderNum; + private Customer customer; + private List<OrderItem> items; + + public Order(Customer customer) { + this.customer = customer; + } + + public Order() { + this.state = OrderState.TRANSIENT; + } + + public long getOrderNum() { + return orderNum; + } + + public void setOrderNum(long orderNum) { + this.orderNum = orderNum; + } + + public Customer getCustomer() { + return customer; + } + + public void setCustomer(Customer customer) { + this.customer = customer; + } + + public List<OrderItem> getItems() { + if(null==items) + items = new ArrayList<OrderItem>(); + return items; + } + + public OrderState getState() { + return state; + } + + public void setState(OrderState state) { + this.state = state; + } + + public String toString() { + return "Order {num="+orderNum+"}"; + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Order.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderItem.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderItem.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderItem.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,58 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail; + +import java.io.Serializable; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Nov 7, 2006 + */ +public class OrderItem implements Serializable { + private String name; + private double price; + + public OrderItem() { + } + + public OrderItem(String name, double price) { + this.name = name; + this.price = price; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderItem.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,36 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.ejb.Remote; + +@Remote +@WebService(name = "OrderMgmt", targetNamespace = "http://org.jboss.ws/samples/retail", serviceName = "OrderMgmtService") +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface OrderMgmt { + + @WebMethod + public OrderStatus prepareOrder(Order order); +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,68 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail; + +import org.jboss.test.ws.jaxws.samples.retail.cc.CCVerificationService; +import org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification; +import org.jboss.logging.Logger; + +import javax.annotation.PostConstruct; +import javax.ejb.Stateless; +import javax.jws.WebService; +import javax.xml.ws.WebServiceRef; + +@Stateless +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.OrderMgmt") +public class OrderMgmtBean implements OrderMgmt { + + private static final Logger log = Logger.getLogger(OrderMgmtBean.class); + + @WebServiceRef + private CCVerificationService verificationService; + + private CCVerification verificationPort; + + @PostConstruct + public void initialize(){ + verificationPort = verificationService.getCCVerificationPort(); + } + + public OrderStatus prepareOrder(Order order) { + + log.info("Preparing order " + order); + + return checkOrderDetails(order); + } + + private OrderStatus checkOrderDetails(Order order) + { + // verify creditcard + String creditCardDetails = order.getCustomer().getCreditCardDetails(); + boolean validCC = verificationPort.verify(creditCardDetails); + + log.info(creditCardDetails + " valid? " + validCC); + + // transition to prepared state + order.setState(Order.OrderState.PREPARED); + return new OrderStatus("PREPARED", order.getOrderNum()); + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,58 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail; + +import java.io.Serializable; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Nov 8, 2006 + */ +public class OrderStatus implements Serializable { + private String status; + private long orderNum; + + public OrderStatus() { + } + + public OrderStatus(String status, long orderNum) { + this.status = status; + this.orderNum = orderNum; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public long getOrderNum() { + return orderNum; + } + + public void setOrderNum(long orderNum) { + this.orderNum = orderNum; + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderStatus.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,102 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail; + +import junit.framework.Test; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import java.net.MalformedURLException; +import java.net.URL; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Nov 8, 2006 + */ +public class RetailSampleTestCase extends JBossWSTest { + + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-retail/OrderMgmtBean"; + + private static Order ORDER; + private static Customer CUSTOMER; + + static { + + CUSTOMER = new Customer(); + CUSTOMER.setFirstName("Chuck"); + CUSTOMER.setLastName("Norris"); + CUSTOMER.setCreditCardDetails("1000-4567-3456-XXXX"); + + ORDER = new Order(CUSTOMER); + ORDER.setOrderNum(12345); + ORDER.getItems().add( new OrderItem("Introduction to Web Services", 39.99) ); + } + + private OrderMgmt orderMgmtWS; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(RetailSampleTestCase.class, "jaxws-samples-retail.jar, jaxws-samples-retail-client.jar"); + } + + protected void setUp() throws Exception + { + + QName serviceName = new QName("http://org.jboss.ws/samples/retail", "OrderMgmtService"); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS+"?wsdl"); + + javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName); + orderMgmtWS = (OrderMgmt)service.getPort(OrderMgmt.class); + + } + + public void testRemoteAccess() throws Exception + { + InitialContext iniCtx = getInitialContext(); + OrderMgmt orderMgmtEJB = (OrderMgmt)iniCtx.lookup("/OrderMgmtBean/remote"); + assertNotNull(orderMgmtEJB); + + OrderStatus result = orderMgmtEJB.prepareOrder(ORDER); + assertEquals("PREPARED", result.getStatus()); + } + + public void testWebService() throws Exception + { + assertWSDLAccess(); + + OrderStatus result = orderMgmtWS.prepareOrder(ORDER); + assertEquals("PREPARED", result.getStatus()); + } + + private void assertWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerification.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerification.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerification.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.samples.retail.cc; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.1-10/21/2006 12:56 AM(vivek)-EA2 + * Generated source version: 2.0 + * + */ +@WebService(name = "CCVerification", targetNamespace = "http://org.jboss.ws/samples/retail/cc") +public interface CCVerification { + + + /** + * + * @param creditCardNumber + * @return + * returns boolean + */ + @WebMethod + @WebResult(name = "verified", targetNamespace = "") + @RequestWrapper(localName = "verify", targetNamespace = "http://org.jboss.ws/samples/retail/cc", className = "org.jboss.test.ws.jaxws.samples.retail.cc.VerificationRequest") + @ResponseWrapper(localName = "verifyResponse", targetNamespace = "http://org.jboss.ws/samples/retail/cc", className = "org.jboss.test.ws.jaxws.samples.retail.cc.VerificationResponse") + public boolean verify( + @WebParam(name = "creditCardNumber", targetNamespace = "") + String creditCardNumber); + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerification.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,42 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.samples.retail.cc; + +import org.jboss.logging.Logger; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +@Stateless +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification") +public class CCVerificationBean implements CCVerification { + + private static final Logger log = Logger.getLogger(CCVerificationBean.class); + + public boolean verify(String creditcard) { + + log.info("Verifying credit card: " + creditcard); + + return true; + } + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,51 @@ + +package org.jboss.test.ws.jaxws.samples.retail.cc; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.1-10/21/2006 12:56 AM(vivek)-EA2 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "CCVerificationService", targetNamespace = "http://org.jboss.ws/samples/retail/cc", wsdlLocation = "resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl") +public class CCVerificationService + extends Service +{ + + private final static URL CCVERIFICATIONSERVICE_WSDL_LOCATION; + + static { + URL url = null; + try { + url = new URL("file:/C:/dev/prj/jbossws/trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + CCVERIFICATIONSERVICE_WSDL_LOCATION = url; + } + + public CCVerificationService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public CCVerificationService() { + super(CCVERIFICATIONSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/samples/retail/cc", "CCVerificationService")); + } + + /** + * + * @return + * returns CCVerification + */ + @WebEndpoint(name = "CCVerificationPort") + public CCVerification getCCVerificationPort() { + return (CCVerification)super.getPort(new QName("http://org.jboss.ws/samples/retail/cc", "CCVerificationPort"), CCVerification.class); + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/ObjectFactory.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/ObjectFactory.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/ObjectFactory.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.jaxws.samples.retail.cc; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.samples.retail.cc package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _VerifyResponse_QNAME = new QName("http://org.jboss.ws/samples/retail/cc", "verifyResponse"); + private final static QName _Verify_QNAME = new QName("http://org.jboss.ws/samples/retail/cc", "verify"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.retail.cc + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link VerificationRequest } + * + */ + public VerificationRequest createVerificationRequest() { + return new VerificationRequest(); + } + + /** + * Create an instance of {@link VerificationResponse } + * + */ + public VerificationResponse createVerificationResponse() { + return new VerificationResponse(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link VerificationResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/samples/retail/cc", name = "verifyResponse") + public JAXBElement<VerificationResponse> createVerifyResponse(VerificationResponse value) { + return new JAXBElement<VerificationResponse>(_VerifyResponse_QNAME, VerificationResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link VerificationRequest }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/samples/retail/cc", name = "verify") + public JAXBElement<VerificationRequest> createVerify(VerificationRequest value) { + return new JAXBElement<VerificationRequest>(_Verify_QNAME, VerificationRequest.class, null, value); + } + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/ObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationRequest.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationRequest.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationRequest.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,60 @@ + +package org.jboss.test.ws.jaxws.samples.retail.cc; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for verificationRequest complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="verificationRequest"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="creditCardNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "verificationRequest", propOrder = { + "creditCardNumber" +}) +public class VerificationRequest { + + protected String creditCardNumber; + + /** + * Gets the value of the creditCardNumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCreditCardNumber() { + return creditCardNumber; + } + + /** + * Sets the value of the creditCardNumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCreditCardNumber(String value) { + this.creditCardNumber = value; + } + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationRequest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationResponse.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationResponse.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationResponse.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,52 @@ + +package org.jboss.test.ws.jaxws.samples.retail.cc; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for verificationResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="verificationResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="verified" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "verificationResponse", propOrder = { + "verified" +}) +public class VerificationResponse { + + protected boolean verified; + + /** + * Gets the value of the verified property. + * + */ + public boolean isVerified() { + return verified; + } + + /** + * Sets the value of the verified property. + * + */ + public void setVerified(boolean value) { + this.verified = value; + } + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/VerificationResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/package-info.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/package-info.java 2006-11-08 06:22:20 UTC (rev 1409) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/package-info.java 2006-11-09 12:07:09 UTC (rev 1410) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.ws/samples/retail/cc") +package org.jboss.test.ws.jaxws.samples.retail.cc; Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 1 month

1
0
0 / 0

JBossWS SVN: r1409 - trunk/src/main/java/org/jboss/ws/integration/jboss50

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2006-11-08 01:22:20 -0500 (Wed, 08 Nov 2006) New Revision: 1409 Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java Log: Fix JBWS-1334 Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2006-11-07 13:42:25 UTC (rev 1408) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2006-11-08 06:22:20 UTC (rev 1409) @@ -34,7 +34,7 @@ /** - * Build container independent deployment info. + * Build container independent deployment info. * * @author Thomas.Diesler(a)jboss.org * @since 05-May-2006 @@ -55,10 +55,19 @@ udi.shortName = getShortName(unit); udi.url = getDeploymentURL(unit); udi.metaData = buildMetaData(unit); - udi.classLoader = unit.getClassLoader(); + // FIXME - parent deployments really don't need a classloader since the classpath + // is built via the VFS + try + { + udi.classLoader = unit.getClassLoader(); + } + catch (IllegalStateException e) + { + } + log.debug("UnifiedDeploymentInfo:\n" + udi); - + return udi; } @@ -68,7 +77,7 @@ return shortName; } - private static URL getDeploymentURL(DeploymentUnit unit) + private static URL getDeploymentURL(DeploymentUnit unit) { try { @@ -80,7 +89,7 @@ throw new IllegalStateException("Cannot get deployment url", ex); } } - + private static Object buildMetaData(DeploymentUnit unit) { Object metaData = null; @@ -88,7 +97,7 @@ { metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(unit); } - else + else { Set<? extends WebMetaData> allMetaData = unit.getAllMetaData(WebMetaData.class); if (allMetaData.size() > 0)

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1408 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/server main/java/org/jboss/ws/soap main/java/org/jboss/ws/xop test/resources/jaxrpc/marshall-doclit/META-INF test/resources/jaxrpc/marshall-doclit/WEB-INF test/resources/jaxrpc/marshall-rpclit/META-INF test/resources/jaxrpc/marshall-rpclit/WEB-INF

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-07 08:42:25 -0500 (Tue, 07 Nov 2006) New Revision: 1408 Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/CreateAttachmentVisitor.java Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpoint.java branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPMessageImpl.java branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/RestoreXOPElementVisitor.java branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml Log: Fix JBWS-1333 Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpoint.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-11-07 13:42:25 UTC (rev 1408) @@ -38,6 +38,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; +import org.jboss.ws.xop.XOPContext; import org.jboss.ws.binding.BindingException; import org.jboss.ws.common.CommonMessageContext; import org.jboss.ws.jaxrpc.SOAPFaultExceptionHelper; @@ -249,6 +250,7 @@ // Set the outbound headers if (headerSource != null) { + XOPContext.eagerlyCreateAttachments(); resMessage.saveChanges(); headerSource.setMimeHeaders(resMessage.getMimeHeaders()); } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-11-07 13:42:25 UTC (rev 1408) @@ -23,21 +23,6 @@ // $Id$ -import java.net.MalformedURLException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; - -import javax.xml.rpc.Stub; -import javax.xml.soap.MimeHeader; -import javax.xml.soap.MimeHeaders; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.addressing.EndpointReference; - import org.jboss.logging.Logger; import org.jboss.remoting.Client; import org.jboss.remoting.InvokerLocator; @@ -45,7 +30,17 @@ import org.jboss.ws.binding.soap.SOAPMessageMarshaller; import org.jboss.ws.binding.soap.SOAPMessageUnMarshaller; import org.jboss.ws.jaxrpc.StubExt; +import org.jboss.ws.xop.XOPContext; +import javax.xml.rpc.Stub; +import javax.xml.soap.*; +import javax.xml.ws.addressing.EndpointReference; +import java.net.MalformedURLException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; + /** * SOAPConnection implementation * @@ -113,14 +108,11 @@ throw new IllegalArgumentException("Given SOAPMessage cannot be null"); if (endpoint == null) throw new IllegalArgumentException("Given endpoint cannot be null"); - if (closed) throw new SOAPException("SOAPConnection is already closed"); - InvokerLocator locator; - Client remotingClient; String targetAddress; - Map callProps; + Map callProps = null; if (endpoint instanceof EndpointInfo) { @@ -139,83 +131,92 @@ { EndpointReference epr = (EndpointReference)endpoint; targetAddress = epr.getAddress().toString(); - callProps = null; } else { targetAddress = endpoint.toString(); - callProps = null; } - try - { - // Get the invoker from Remoting for a given endpoint address - log.debug("Get locator for: " + endpoint); - locator = new InvokerLocator(targetAddress); - } - catch (MalformedURLException e) - { - throw new SOAPException("Malformed endpoint address", e); - } + // enforce xop transitions + // TODO: there should be a clear transition to an immutable object model + XOPContext.eagerlyCreateAttachments(); - Map metadata = getRemotingMetaData(reqMessage, targetAddress, callProps); + // save object model changes + if (reqMessage.saveRequired()) reqMessage.saveChanges(); - try - { - remotingClient = new Client(locator, "saaj", config); - remotingClient.setMarshaller(new SOAPMessageMarshaller()); - remotingClient.setUnMarshaller(oneway == false ? new SOAPMessageUnMarshaller() : null); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new SOAPException("Could not setup remoting client", e); - } + // setup remoting client + Map metadata = createRemotingMetaData(reqMessage, callProps); + Client client = createRemotingClient(endpoint, targetAddress, oneway); try { // debug the outgoing message - if(msgLog.isTraceEnabled()) - { - SOAPEnvelope soapReqEnv = reqMessage.getSOAPPart().getEnvelope(); - String envStr = SOAPElementWriter.writeElement((SOAPElementImpl)soapReqEnv, true); - msgLog.trace("Remoting meta data: " + metadata); - msgLog.trace("Outgoing SOAPMessage\n" + envStr); - } + traceRequest(reqMessage, metadata); SOAPMessage resMessage = null; if (oneway == true) { - remotingClient.invokeOneway(reqMessage, metadata, false); + client.invokeOneway(reqMessage, metadata, false); } else { - resMessage = (SOAPMessage)remotingClient.invoke(reqMessage, metadata); + resMessage = (SOAPMessage)client.invoke(reqMessage, metadata); } // debug the incomming response message - if (resMessage != null && msgLog.isTraceEnabled()) - { - SOAPEnvelope soapResEnv = resMessage.getSOAPPart().getEnvelope(); - String envStr = SOAPElementWriter.writeElement((SOAPElementImpl)soapResEnv, true); - msgLog.trace("Incoming Response SOAPMessage\n" + envStr); - } + traceResponse(resMessage); return resMessage; + } - catch (RuntimeException rte) - { - throw rte; - } catch (Throwable t) { throw new SOAPException("Could not transmit message", t); } } + private void traceResponse(SOAPMessage resMessage) throws SOAPException { + if (resMessage != null && msgLog.isTraceEnabled()) + { + SOAPEnvelope soapResEnv = resMessage.getSOAPPart().getEnvelope(); + String envStr = SOAPElementWriter.writeElement((SOAPElementImpl)soapResEnv, true); + msgLog.trace("Incoming Response SOAPMessage\n" + envStr); + } + } + + private void traceRequest(SOAPMessage reqMessage, Map metadata) throws SOAPException { + if(msgLog.isTraceEnabled()) + { + SOAPEnvelope soapReqEnv = reqMessage.getSOAPPart().getEnvelope(); + String envStr = SOAPElementWriter.writeElement((SOAPElementImpl)soapReqEnv, true); + msgLog.trace("Remoting meta data: " + metadata); + msgLog.trace("Outgoing SOAPMessage\n" + envStr); + } + } + + private Client createRemotingClient(Object endpoint, String targetAddress, boolean oneway) throws SOAPException { + Client remotingClient; + try + { + // Get the invoker from Remoting for a given endpoint address + log.debug("Get locator for: " + endpoint); + InvokerLocator locator = new InvokerLocator(targetAddress); + + remotingClient = new Client(locator, "saaj", config); + remotingClient.setMarshaller(new SOAPMessageMarshaller()); + remotingClient.setUnMarshaller(oneway == false ? new SOAPMessageUnMarshaller() : null); + } + catch (MalformedURLException e) + { + throw new SOAPException("Malformed endpoint address", e); + } + catch (Exception e) + { + throw new SOAPException("Could not setup remoting client", e); + } + return remotingClient; + } + /** Closes this SOAPConnection */ public void close() throws SOAPException @@ -226,7 +227,7 @@ closed = true; } - private Map getRemotingMetaData(SOAPMessage reqMessage, String targetAddress, Map callProps) throws SOAPException + private Map createRemotingMetaData(SOAPMessage reqMessage, Map callProps) throws SOAPException { // R2744 A HTTP request MESSAGE MUST contain a SOAPAction HTTP header field // with a quoted value equal to the value of the soapAction attribute of @@ -236,7 +237,7 @@ // with a quoted empty string value, if in the corresponding WSDL description, // the soapAction attribute of soapbind:operation is either not present, or // present with an empty string as its value. - + MimeHeaders mimeHeaders = reqMessage.getMimeHeaders(); String[] action = mimeHeaders.getHeader("SOAPAction"); if (action != null && action.length > 0) @@ -254,9 +255,6 @@ mimeHeaders.setHeader("SOAPAction", "\"\""); } - if (reqMessage.saveRequired()) - reqMessage.saveChanges(); - Map<String, Object> metadata = new HashMap<String, Object>(); Properties props = new Properties(); metadata.put("HEADER", props); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPMessageImpl.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPMessageImpl.java 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPMessageImpl.java 2006-11-07 13:42:25 UTC (rev 1408) @@ -129,8 +129,8 @@ String contentId = part.getContentId(); if (contentId.equals(cid)) { - attachments.remove(part); - return part; + attachments.remove(part); + return part; } } @@ -213,27 +213,32 @@ { try { - if (isXOPMessage() && !XOPContext.isMTOMEnabled() && attachments.size() > 0) + boolean hasAttachments = attachments.size() > 0; + + if (isXOPMessage() && !XOPContext.isMTOMEnabled() && hasAttachments) throw new IllegalStateException("XOP parameter not properly inlined"); - - String contentType; - if (isXOPMessage() && XOPContext.isMTOMEnabled()) + + // default content-type + String contentType = MimeConstants.TYPE_SOAP11 + "; charset=" + getCharSetEncoding(); + + if (hasAttachments) { - multipartRelatedEncoder = new MultipartRelatedXOPEncoder(this); - multipartRelatedEncoder.encodeMultipartRelatedMessage(); - contentType = multipartRelatedEncoder.getContentType(); + if (isXOPMessage() && XOPContext.isMTOMEnabled()) + { + multipartRelatedEncoder = new MultipartRelatedXOPEncoder(this); + multipartRelatedEncoder.encodeMultipartRelatedMessage(); + contentType = multipartRelatedEncoder.getContentType(); + } + else + { + multipartRelatedEncoder = new MultipartRelatedSwAEncoder(this); + multipartRelatedEncoder.encodeMultipartRelatedMessage(); + contentType = multipartRelatedEncoder.getContentType(); + } } - else if (attachments.size() > 0) - { - multipartRelatedEncoder = new MultipartRelatedSwAEncoder(this); - multipartRelatedEncoder.encodeMultipartRelatedMessage(); - contentType = multipartRelatedEncoder.getContentType(); - } - else - { - contentType = MimeConstants.TYPE_SOAP11 + "; charset=" + getCharSetEncoding(); - } + mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, contentType); + } catch (MessagingException ex) { Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/CreateAttachmentVisitor.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/CreateAttachmentVisitor.java 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/CreateAttachmentVisitor.java 2006-11-07 13:42:25 UTC (rev 1408) @@ -0,0 +1,89 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.xop; + +import org.jboss.ws.soap.SAAJVisitor; +import org.jboss.ws.soap.SOAPElementImpl; +import org.jboss.ws.soap.SOAPContentElement; + +import java.util.Iterator; +import java.io.Writer; +import java.io.IOException; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Nov 7, 2006 + */ +public class CreateAttachmentVisitor implements SAAJVisitor { + public void visitXOPElements(SOAPElementImpl root) + { + boolean isSCE = (root instanceof SOAPContentElement); + + // don't expand SOAPContentElements + if(isSCE) + { + root.accept(this); + } + else + { + Iterator it = root.getChildElements(); + while(it.hasNext()) + { + final Object o = it.next(); + if(o instanceof SOAPElementImpl) + visitXOPElements((SOAPElementImpl)o); + } + } + } + + public void visitSOAPElement(SOAPElementImpl soapElement) { + // nada + } + + public void visitSOAPContentElement(SOAPContentElement scElement) { + // Calling writeElement will enforce marshalling of this object + // Any attachment will be created while doiong this. + try + { + scElement.writeElement( new NoopWriter() ); + } + catch (IOException e) + { + // + } + } + + class NoopWriter extends Writer { + public void write(char cbuf[], int off, int len) throws IOException { + + } + + public void flush() throws IOException { + + } + + public void close() throws IOException { + + } + } +} Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/CreateAttachmentVisitor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/RestoreXOPElementVisitor.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/RestoreXOPElementVisitor.java 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/RestoreXOPElementVisitor.java 2006-11-07 13:42:25 UTC (rev 1408) @@ -58,7 +58,9 @@ Iterator it = root.getChildElements(); while(it.hasNext()) { - visitXOPElements((SOAPElementImpl)it.next()); + final Object o = it.next(); + if(o instanceof SOAPElementImpl) + visitXOPElements((SOAPElementImpl)o); } } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java 2006-11-07 13:42:25 UTC (rev 1408) @@ -40,10 +40,7 @@ import javax.activation.DataHandler; import javax.xml.namespace.QName; -import javax.xml.soap.AttachmentPart; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; +import javax.xml.soap.*; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Iterator; @@ -176,6 +173,38 @@ } /** + * The XOP attachments need to be created before the actual message is written + * to an output stream. This is necessary because it changes the overall message content-type. + * If we would do this lazily (i.e. upon remoting callback) the previous content-type + * would already have been written. + * + * @see org.jboss.ws.soap.SOAPConnectionImpl#callInternal(javax.xml.soap.SOAPMessage, Object, boolean) + * @see org.jboss.ws.binding.soap.SOAPMessageMarshaller#write(Object, java.io.OutputStream) + */ + public static void eagerlyCreateAttachments() + { + if(!isXOPMessage()) + return; + + try + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + SOAPMessage soapMessage = msgContext != null ? msgContext.getSOAPMessage() : null; + SOAPBody body = soapMessage!=null ? soapMessage.getSOAPBody() : null; + + if(body!=null) + { + CreateAttachmentVisitor visitor = new CreateAttachmentVisitor(); + visitor.visitXOPElements((SOAPElementImpl)body); + } + } + catch (SOAPException e) + { + throw new WSException("Failed to eagerly create XOP attachments", e); + } + } + + /** * Visit the soap object model elements and restore xop data. */ public static void visitAndRestoreXOPData() Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml 2006-11-07 13:42:25 UTC (rev 1408) @@ -8,8 +8,7 @@ <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/StandardTypes</service-ref-name> - <config-name>Standard MTOM disabled client</config-name> + <service-ref-name>service/StandardTypes</service-ref-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-doclit?wsdl</wsdl-override> </service-ref> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml 2006-11-07 13:42:25 UTC (rev 1408) @@ -5,11 +5,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <context-param> - <param-name>jbossws-config-name</param-name> - <param-value>Standard MTOM disabled endpoint</param-value> - </context-param> - <servlet> <servlet-name>StandardTypes</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.marshall.StandardTypesBean</servlet-class> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-11-07 13:42:25 UTC (rev 1408) @@ -8,8 +8,7 @@ <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/StandardTypes</service-ref-name> - <config-name>Standard MTOM disabled client</config-name> + <service-ref-name>service/StandardTypes</service-ref-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-rpclit?wsdl</wsdl-override> </service-ref> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2006-11-07 10:12:54 UTC (rev 1407) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2006-11-07 13:42:25 UTC (rev 1408) @@ -5,11 +5,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <context-param> - <param-name>jbossws-config-name</param-name> - <param-value>Standard MTOM disabled endpoint</param-value> - </context-param> - <servlet> <servlet-name>StandardTypes</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.marshall.StandardTypesBean</servlet-class>

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1407 - branches/jbossws-1.0/src/main/java/javax/jws

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-07 05:12:54 -0500 (Tue, 07 Nov 2006) New Revision: 1407 Modified: branches/jbossws-1.0/src/main/java/javax/jws/WebParam.java branches/jbossws-1.0/src/main/java/javax/jws/WebResult.java branches/jbossws-1.0/src/main/java/javax/jws/WebService.java Log: Fixed special chars in javadoc Modified: branches/jbossws-1.0/src/main/java/javax/jws/WebParam.java =================================================================== --- branches/jbossws-1.0/src/main/java/javax/jws/WebParam.java 2006-11-07 01:35:50 UTC (rev 1406) +++ branches/jbossws-1.0/src/main/java/javax/jws/WebParam.java 2006-11-07 10:12:54 UTC (rev 1407) @@ -69,7 +69,7 @@ /** * The XML namespace for the parameter. * - * Only used if the operation is document style or the paramater maps to a header. If the target namespace is set to “”, this represents the empty namespace. + * Only used if the operation is document style or the paramater maps to a header. If the target namespace is set to '', this represents the empty namespace. * * Specification Default: * If the operation is document style, the parameter style is WRAPPED, and the parameter does not map to a header, the empty namespace. Modified: branches/jbossws-1.0/src/main/java/javax/jws/WebResult.java =================================================================== --- branches/jbossws-1.0/src/main/java/javax/jws/WebResult.java 2006-11-07 01:35:50 UTC (rev 1406) +++ branches/jbossws-1.0/src/main/java/javax/jws/WebResult.java 2006-11-07 10:12:54 UTC (rev 1407) @@ -48,8 +48,8 @@ * If the operation is document style or the return value maps to a header, this is the local name of the XML element representing the return value. * * Specification Default: - * If the operation is document style and the parameter style is BARE, @WebParam.operationName+”Response”. - * Otherwise, “return.” + * If the operation is document style and the parameter style is BARE, @WebParam.operationName+'Response'. + * Otherwise, 'return.' */ String name() default ""; @@ -62,7 +62,7 @@ /** * The XML namespace for the return value. * - * Only used if the operation is document style or the return value maps to a header. If the target namespace is set to “”, this represents the empty namespace. + * Only used if the operation is document style or the return value maps to a header. If the target namespace is set to '', this represents the empty namespace. * * Specification Default: * If the operation is document style, the parameter style is WRAPPED, and the return value does not map to a header, the empty namespace. Modified: branches/jbossws-1.0/src/main/java/javax/jws/WebService.java =================================================================== --- branches/jbossws-1.0/src/main/java/javax/jws/WebService.java 2006-11-07 01:35:50 UTC (rev 1406) +++ branches/jbossws-1.0/src/main/java/javax/jws/WebService.java 2006-11-07 10:12:54 UTC (rev 1407) @@ -52,7 +52,7 @@ * Used as the name of the wsdl:port when mapped to WSDL 1.1. * This member-value is not allowed on endpoint interfaces. * Specification Default: - * @WebService.name + ”Port”. + * @WebService.name + 'Port'. */ String portName() default ""; @@ -78,7 +78,7 @@ * This member-value is not allowed on endpoint interfaces. * * Specification Default: - * The simple name of the Java class + “Service". + * The simple name of the Java class + 'Service". */ String serviceName() default "";

18 years, 2 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2006