November 2006 - jbossws-commits - Jboss List Archives

JBossWS SVN: r1426 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/metadata test/java/org/jboss/test/ws/jaxrpc/webserviceref

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-14 13:57:35 -0500 (Tue, 14 Nov 2006) New Revision: 1426 Removed: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/MetaDataSynchronization.java Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java Log: Fix CTS expected ServiceException on unsynchronized sei Deleted: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/MetaDataSynchronization.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/MetaDataSynchronization.java 2006-11-14 16:44:04 UTC (rev 1425) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/MetaDataSynchronization.java 2006-11-14 18:57:35 UTC (rev 1426) @@ -1,64 +0,0 @@ -/* -* 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. -*/ -// $Id$ -package org.jboss.ws.jaxrpc; - -import java.lang.reflect.Method; - -import javax.xml.rpc.ServiceException; - -import org.jboss.logging.Logger; -import org.jboss.ws.metadata.EndpointMetaData; -import org.jboss.ws.metadata.OperationMetaData; - -/** A helper that synchronizes the SEI with the endpoint meta data - * - * @author Thomas.Diesler(a)jboss.org - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @since 19-May-2005 - */ -public class MetaDataSynchronization -{ - // provide logging - private static final Logger log = Logger.getLogger(MetaDataSynchronization.class); - - public static void synchronizeServiceEndpointInterface(EndpointMetaData epMetaData, Class seiClass) throws ServiceException - { - log.debug("synchronize: [epMetaData=" + epMetaData.getQName() + ",sei=" + seiClass.getName() + "]"); - - if (epMetaData.getServiceEndpointInterface() != seiClass) - throw new IllegalArgumentException("Endpoint meta data SEI missmatch, expected: " + epMetaData.getServiceEndpointInterfaceName()); - - /* - Method[] methods = seiClass.getMethods(); - for (int i = 0; i < methods.length; i++) - { - Method method = methods[i]; - log.debug("synchronize method: " + method); - - OperationMetaData opMetaData = epMetaData.getOperation(method); - if (opMetaData == null) - throw new ServiceException("Cannot obtain operation meta data for method: " + method); - } - */ - } -} Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-11-14 16:44:04 UTC (rev 1425) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-11-14 18:57:35 UTC (rev 1426) @@ -112,7 +112,7 @@ serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, serviceRefMetaData); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } - + public ServiceMetaData getServiceMetaData() { return serviceMetaData; @@ -316,17 +316,28 @@ if (serviceMetaData == null) throw new ServiceException("Service meta data not available"); - EndpointMetaData epMetaData = serviceMetaData.getEndpointByServiceEndpointInterface(seiName); - if (epMetaData == null && serviceMetaData.getEndpoints().size() == 1) + try { - epMetaData = serviceMetaData.getEndpoints().get(0); - epMetaData.setServiceEndpointInterfaceName(seiName); - } + EndpointMetaData epMetaData = serviceMetaData.getEndpointByServiceEndpointInterface(seiName); + if (epMetaData == null && serviceMetaData.getEndpoints().size() == 1) + { + epMetaData = serviceMetaData.getEndpoints().get(0); + epMetaData.setServiceEndpointInterfaceName(seiName); + } - if (epMetaData == null) - throw new ServiceException("Cannot find endpoint meta data for: " + seiName); + if (epMetaData == null) + throw new ServiceException("Cannot find endpoint meta data for: " + seiName); - return createProxy(seiClass, epMetaData); + return createProxy(seiClass, epMetaData); + } + catch (ServiceException ex) + { + throw ex; + } + catch (Exception ex) + { + throw new ServiceException("Cannot create proxy", ex); + } } /** @@ -352,24 +363,12 @@ if (epMetaData == null) throw new ServiceException("Cannot obtain endpoint meta data for: " + portName); - if (epMetaData.getServiceEndpointInterfaceName() == null) - epMetaData.setServiceEndpointInterfaceName(seiName); - - return createProxy(seiClass, epMetaData); - } - - private Remote createProxy(Class seiClass, EndpointMetaData epMetaData) throws ServiceException - { try { - MetaDataSynchronization.synchronizeServiceEndpointInterface(epMetaData, seiClass); - CallImpl call = new CallImpl(this, epMetaData); + if (epMetaData.getServiceEndpointInterfaceName() == null) + epMetaData.setServiceEndpointInterfaceName(seiName); - CallProxy handler = new CallProxy(call); - ClassLoader cl = epMetaData.getClassLoader(); - Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, StubExt.class }, handler); - - return proxy; + return createProxy(seiClass, epMetaData); } catch (ServiceException ex) { @@ -381,6 +380,17 @@ } } + private Remote createProxy(Class seiClass, EndpointMetaData epMetaData) throws Exception + { + CallImpl call = new CallImpl(this, epMetaData); + + CallProxy handler = new CallProxy(call); + ClassLoader cl = epMetaData.getClassLoader(); + Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, StubExt.class }, handler); + + return proxy; + } + /** * Get the handler chain for the given endpoint name, maybe null. */ Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-14 16:44:04 UTC (rev 1425) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-14 18:57:35 UTC (rev 1426) @@ -176,6 +176,9 @@ public void setServiceEndpointInterfaceName(String seiName) { + this.seiName = seiName; + this.seiClass = null; + UnifiedMetaData wsMetaData = serviceMetaData.getUnifiedMetaData(); if (wsMetaData.isEagerInitialized()) { @@ -185,9 +188,6 @@ // reinitialize initializeInternal(); } - - this.seiName = seiName; - this.seiClass = null; } /** Get the class loader associated with the endpoint meta data */ @@ -456,6 +456,9 @@ private void initializeInternal() { + // reset sei class + seiClass = null; + // Initialize handlers for (HandlerMetaData handler : handlers) handler.eagerInitialize(); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-14 16:44:04 UTC (rev 1425) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-14 18:57:35 UTC (rev 1426) @@ -530,6 +530,9 @@ */ public void eagerInitialize(List<Method> unsynchronizedMethods) { + // reset java method + javaMethod = null; + for (ParameterMetaData parameter : parameters) parameter.eagerInitialize(); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-14 16:44:04 UTC (rev 1425) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-14 18:57:35 UTC (rev 1426) @@ -300,6 +300,9 @@ */ public void eagerInitialize() { + // reset java type + javaType = null; + TypesMetaData typesMetaData = getOperationMetaData().getEndpointMetaData().getServiceMetaData().getTypesMetaData(); if (getOperationMetaData().isDocumentWrapped() && isMessageType() == false) { Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2006-11-14 16:44:04 UTC (rev 1425) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2006-11-14 18:57:35 UTC (rev 1426) @@ -27,6 +27,8 @@ import javax.xml.namespace.QName; import javax.xml.rpc.Service; +import javax.xml.rpc.ServiceException; +import javax.xml.rpc.ServiceFactory; import junit.framework.Test; @@ -45,7 +47,7 @@ public class WebServiceRefClientTestCase extends JBossWSTest { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref"; - + public static Test suite() { return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-client.jar"); @@ -58,7 +60,7 @@ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); assertNotNull(wsdlDefinitions); } - + public void testDynamicProxy() throws Exception { URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); @@ -72,11 +74,31 @@ assertEquals(helloWorld, retObj); } + public void testDynamicProxyNeg() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); + try + { + TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); + fail("Expected ServiceException, but got: " + port); + } + catch (ServiceException ex) + { + // this is tested by the CTS + } + catch (Exception ex) + { + fail("Expected ServiceException, but got: " + ex); + } + } + public void testApplicationClient() throws Exception { String helloWorld = "Hello World!"; ApplicationClient.encCtx = getInitialContext(); - ApplicationClient.main(new String[]{helloWorld}); + ApplicationClient.main(new String[] { helloWorld }); assertEquals(helloWorld, ApplicationClient.retStr); } }

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1425 - branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-14 11:44:04 -0500 (Tue, 14 Nov 2006) New Revision: 1425 Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java Log: reinitilaize when SEI is set late Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-14 15:44:19 UTC (rev 1424) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-14 16:44:04 UTC (rev 1425) @@ -177,8 +177,14 @@ public void setServiceEndpointInterfaceName(String seiName) { UnifiedMetaData wsMetaData = serviceMetaData.getUnifiedMetaData(); - if (wsMetaData.isEagerInitialized() && UnifiedMetaData.isFinalRelease() == false) - log.warn("Set SEI name after eager initialization", new IllegalStateException()); + if (wsMetaData.isEagerInitialized()) + { + if (UnifiedMetaData.isFinalRelease() == false) + log.warn("Set SEI name after eager initialization", new IllegalStateException()); + + // reinitialize + initializeInternal(); + } this.seiName = seiName; this.seiClass = null;

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1424 - in branches/jbossws-1.0: . src/ant src/main/java/org/jboss/ws/integration/tomcat src/main/resources/samples/common src/main/resources/samples/jaxrpc/wssecurity

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-14 10:44:19 -0500 (Tue, 14 Nov 2006) New Revision: 1424 Modified: branches/jbossws-1.0/build.xml branches/jbossws-1.0/src/ant/build-samples.xml branches/jbossws-1.0/src/ant/build-thirdparty.xml branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml branches/jbossws-1.0/src/main/resources/samples/common/log4j.xml branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml Log: Decouple samples build from target container Modified: branches/jbossws-1.0/build.xml =================================================================== --- branches/jbossws-1.0/build.xml 2006-11-14 14:04:50 UTC (rev 1423) +++ branches/jbossws-1.0/build.xml 2006-11-14 15:44:19 UTC (rev 1424) @@ -540,9 +540,11 @@  <target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat"> <fail message="Not available: ${tomcat.home}/server/lib/catalina.jar" unless="tomcat.available"/> + <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/resolver.jar"/> <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/> <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/> <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/> + <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xml-apis.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/> Modified: branches/jbossws-1.0/src/ant/build-samples.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-14 14:04:50 UTC (rev 1423) +++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-14 15:44:19 UTC (rev 1424) @@ -35,6 +35,9 @@ <include name="commons-logging.jar"/> <include name="jbossall-client.jar"/> <include name="mail.jar"/> + <include name="jboss-aop-jdk50-client.jar"/> + <include name="jboss-aspect-jdk50-client.jar"/> + <include name="jboss-ejb3-client.jar"/> </fileset> <fileset dir="${build.lib.dir}"> <include name="jbossws-client.jar"/> @@ -290,10 +293,13 @@ <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java"> <fileset dir="${test.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity"/> + <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity"> + <exclude name="store-pass-encrypt/**"/> + </fileset> </copy>  Modified: branches/jbossws-1.0/src/ant/build-thirdparty.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-14 14:04:50 UTC (rev 1423) +++ branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-14 15:44:19 UTC (rev 1424) @@ -29,6 +29,7 @@ <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-11-14 14:04:50 UTC (rev 1423) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-11-14 15:44:19 UTC (rev 1424) @@ -42,6 +42,7 @@ import org.jboss.ws.metadata.jsr109.WebservicesFactory; import org.jboss.ws.metadata.jsr109.WebservicesMetaData; import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.JBossWSEntityResolver; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; @@ -131,6 +132,7 @@ try { Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + unmarshaller.setEntityResolver(new JBossWSEntityResolver()); ObjectModelFactory factory = new WebservicesFactory(webServicesXml); WebservicesMetaData jsr109MetaData = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null); Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 14:04:50 UTC (rev 1423) +++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 15:44:19 UTC (rev 1424) @@ -30,7 +30,7 @@ <isset property="HAVE_JDK_1.5"/> </and> </condition> - +  <condition property="jbossws.version" value="jbossws14"> <not> @@ -51,12 +51,21 @@ <isset property="HAVE_JDK_1.5"/> </condition> + <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> +  + <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed"> + <isset property="jbossws.target.server.jboss"/> + </condition> + <condition property="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed"> + <isset property="jbossws.target.server.tomcat"/> + </condition> +  - <category name="org.jboss.axis"> +  + <category name="org.jboss.ws"> <priority value="DEBUG"/> </category> - -  - <category name="org.jboss.webservice"> - <priority value="DEBUG"/> + +    Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-14 14:04:50 UTC (rev 1423) +++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-14 15:44:19 UTC (rev 1424) @@ -103,47 +103,6 @@ <include name="wsdl/**"/> </metainf> </jar> - -  - <replace file="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/> - <war warfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> - <classes dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> - <fileset dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> </target>

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1423 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-14 09:04:50 -0500 (Tue, 14 Nov 2006) New Revision: 1423 Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java Log: more logging Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2006-11-14 14:04:29 UTC (rev 1422) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2006-11-14 14:04:50 UTC (rev 1423) @@ -56,14 +56,14 @@ /** True, if -Djbossws.target.server=jboss */ public boolean isTargetServerJBoss() { - String targetServer = System.getProperty("jbossws.target.server"); + String targetServer = getTargetServer(); return "jboss".equals(targetServer); } /** True, if -Djbossws.target.server=tomcat */ public boolean isTargetServerTomcat() { - String targetServer = System.getProperty("jbossws.target.server"); + String targetServer = getTargetServer(); return "tomcat".equals(targetServer); } @@ -88,10 +88,15 @@ } else { - throw new IllegalStateException("Unsupported target server"); + throw new IllegalStateException("Unsupported target server: " + getTargetServer()); } } + private String getTargetServer() + { + return System.getProperty("jbossws.target.server"); + } + /** Try to discover the URL for the deployment archive */ public URL getArchiveURL(String archive) throws MalformedURLException {

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1422 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-14 09:04:29 -0500 (Tue, 14 Nov 2006) New Revision: 1422 Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java Log: Fix invalid service qname Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2006-11-14 12:48:28 UTC (rev 1421) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2006-11-14 14:04:29 UTC (rev 1422) @@ -74,7 +74,7 @@ ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/wsdl/EmployeeService.wsdl").toURL(); URL mappingURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/mtom", "EmployeeRecords"); + QName qname = new QName("http://org.jboss.ws/samples/mtom", "EmployeeService"); Service service = factory.createService(wsdlURL, qname, mappingURL); port = (EmployeeRecords)service.getPort(EmployeeRecords.class); ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-mtom");

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1421 - branches/jbossws-1.0/src/main/resources/samples

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-14 07:48:28 -0500 (Tue, 14 Nov 2006) New Revision: 1421 Modified: branches/jbossws-1.0/src/main/resources/samples/ant.properties.example Log: change tomcat.home Modified: branches/jbossws-1.0/src/main/resources/samples/ant.properties.example =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-14 12:44:10 UTC (rev 1420) +++ branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-14 12:48:28 UTC (rev 1421) @@ -9,7 +9,7 @@ jboss.server.instance=default # Tomcat Home -#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17 +#tomcat.home=/usr/java/tomcat #tomcat.manager.username=manager #tomcat.manager.password=manager

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1420 - in branches/jbossws-1.0: . src/ant src/main/java/org/jboss/ws/utils src/main/resources/samples src/main/resources/samples/common src/main/resources/samples/jaxrpc/wsbpel src/test/java/org/jboss/test/ws/tools/jbws1090

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-14 07:44:10 -0500 (Tue, 14 Nov 2006) New Revision: 1420 Modified: branches/jbossws-1.0/ant.properties.example branches/jbossws-1.0/src/ant/build-samples.xml branches/jbossws-1.0/src/ant/build-thirdparty.xml branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/IOUtils.java branches/jbossws-1.0/src/main/resources/samples/ant.properties.example branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java branches/jbossws-1.0/version.properties Log: Fix jdk1.4 samples Modified: branches/jbossws-1.0/ant.properties.example =================================================================== --- branches/jbossws-1.0/ant.properties.example 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/ant.properties.example 2006-11-14 12:44:10 UTC (rev 1420) @@ -7,7 +7,7 @@ #jboss.jdk15.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 # Optional JBoss Home -#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA +#jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA # The JBoss server instance jboss.server.instance=default Modified: branches/jbossws-1.0/src/ant/build-samples.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-14 12:44:10 UTC (rev 1420) @@ -31,11 +31,28 @@ <mkdir dir="${build.src.samples.dir}/lib"/> <copy todir="${build.src.samples.dir}/lib"> + <fileset dir="${jboss.client}"> + <include name="commons-logging.jar"/> + <include name="jbossall-client.jar"/> + <include name="mail.jar"/> + </fileset> <fileset dir="${build.lib.dir}"> + <include name="jbossws-client.jar"/> <include name="jbossws-jboss-integration.jar"/> <include name="jbossws-tomcat-integration.jar"/> + <include name="jbossws14-client.jar"/> + <include name="jbossws14-jboss-integration.jar"/> + <include name="jbossws14-tomcat-integration.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> + <include name="activation.jar"/> + <include name="commons-collections.jar"/> + <include name="dom4j.jar"/> + <include name="javassist.jar"/> + <include name="jbossretro-rt.jar"/> + <include name="jboss-backport-concurrent.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="log4j.jar"/> <include name="servlet-api.jar"/> </fileset> </copy> Modified: branches/jbossws-1.0/src/ant/build-thirdparty.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-14 12:44:10 UTC (rev 1420) @@ -11,7 +11,7 @@  -<project default="init-thirdparty" name="JBossWS-Thirdparty"> +<project name="JBossWS-Thirdparty">   @@ -25,12 +25,14 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss.jar" dest="${thirdparty.dir}/jboss.jar" usetimestamp="true" verbose="true"/> @@ -45,6 +47,7 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/IOUtils.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/IOUtils.java 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/IOUtils.java 2006-11-14 12:44:10 UTC (rev 1420) @@ -58,6 +58,7 @@ r = ins.read(bytes); } } + public static byte[] convertToBytes(DataHandler dh) { try Modified: branches/jbossws-1.0/src/main/resources/samples/ant.properties.example =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-14 12:44:10 UTC (rev 1420) @@ -1,10 +1,8 @@ # JBossWS samples build properties # -# Required JBoss Home +# JBoss Home #jboss.jdk15.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 - -# Optional JBoss Home #jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA # The JBoss server instance Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 12:44:10 UTC (rev 1420) @@ -2,10 +2,10 @@  -<project default="imported"> +<project>  <target name="init"> @@ -31,6 +31,16 @@ </and> </condition> +  + <condition property="jbossws.version" value="jbossws14"> + <not> + <isset property="HAVE_JDK_1.5"/> + </not> + </condition> + <condition property="jbossws.version" value="jbossws"> + <isset property="HAVE_JDK_1.5"/> + </condition> +  <condition property="jboss.home" value="${jboss.jdk14.home}"> <not> @@ -40,14 +50,11 @@ <condition property="jboss.home" value="${jboss.jdk15.home}"> <isset property="HAVE_JDK_1.5"/> </condition> - - <property name="jboss.client" value="${jboss.home}/client"/> - <property name="jboss.lib" value="${jboss.home}/lib"/> + <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> - <property name="jboss.server.lib" value="${jboss.server}/lib"/> <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> - <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/> + <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>  <path id="jbpmbpel.classpath"> <path refid="client.classpath" /> - <fileset dir="${jboss.server.lib}"> + <fileset dir="${basedir}/lib"> <include name="dom4j.jar" /> <include name="commons-collections.jar" /> </fileset> Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-11-14 12:44:10 UTC (rev 1420) @@ -26,11 +26,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.nio.channels.FileChannel; +import java.io.InputStream; +import java.io.OutputStream; import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.IOUtils; import org.w3c.dom.Element; /** @@ -48,9 +50,9 @@ File outputDir = new File("tools/jbws1090"); outputDir.mkdirs(); // copy webservices.xml fixture to output folder - FileChannel src = new FileInputStream("resources/tools/metadatafixture/webservices.xml").getChannel(); - FileChannel dest = new FileOutputStream("tools/jbws1090/webservices.xml").getChannel(); - src.transferTo(0L, src.size(), dest); + InputStream src = new FileInputStream("resources/tools/metadatafixture/webservices.xml"); + OutputStream dest = new FileOutputStream("tools/jbws1090/webservices.xml"); + IOUtils.copyStream(dest, src); src.close(); dest.close(); Modified: branches/jbossws-1.0/version.properties =================================================================== --- branches/jbossws-1.0/version.properties 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/version.properties 2006-11-14 12:44:10 UTC (rev 1420) @@ -24,9 +24,11 @@ # thirdparty library versions apache-ant=1.6.5 +apache-collections=3.1 apache-log4j=1.2.8 apache-xalan=j_2.7.0 apache-xerces=2.7.1 +dom4j=1.6.1jboss jboss-backport-concurrent=2.1.0.GA jboss-jbossretro=1.0.2.GA jbossas=4.0.4.GA

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1419 - trunk/src/main/java/org/jboss/ws/soap

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2006-11-13 19:04:05 -0500 (Mon, 13 Nov 2006) New Revision: 1419 Modified: trunk/src/main/java/org/jboss/ws/soap/SOAPBodyImpl.java Log: JBWS-1353 - Fixed check for SAXSource and also added check for Node type for DOMSource Modified: trunk/src/main/java/org/jboss/ws/soap/SOAPBodyImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/soap/SOAPBodyImpl.java 2006-11-09 14:06:08 UTC (rev 1418) +++ trunk/src/main/java/org/jboss/ws/soap/SOAPBodyImpl.java 2006-11-14 00:04:05 UTC (rev 1419) @@ -32,7 +32,6 @@ import java.util.Iterator; import java.util.Locale; -import javax.xml.bind.util.JAXBSource; import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; @@ -42,6 +41,7 @@ import javax.xml.transform.Source; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; @@ -346,9 +346,21 @@ else if (payload instanceof DOMSource) { DOMSource domSource = (DOMSource)payload; - child = (Element)domSource.getNode(); + Node node = domSource.getNode(); + if (node instanceof Element) + { + child = (Element)node; + } + else if (node instanceof Document) + { + child = ((Document)node).getDocumentElement(); + } + else + { + throw new WSException("Unsupported Node type: " + node.getClass().getName()); + } } - else if (payload instanceof JAXBSource) + else if (payload instanceof SAXSource) { // The fact that JAXBSource derives from SAXSource is an implementation detail. // Thus in general applications are strongly discouraged from accessing methods defined on SAXSource.

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1418 - 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 09:06:08 -0500 (Thu, 09 Nov 2006) New Revision: 1418 Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ObjectFactory.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/package-info.java Log: JBW samples Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ObjectFactory.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ObjectFactory.java 2006-11-09 14:05:46 UTC (rev 1417) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ObjectFactory.java 2006-11-09 14:06:08 UTC (rev 1418) @@ -0,0 +1,79 @@ + +package org.jboss.test.ws.jaxws.samples.retail.profile; + +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.profile 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 _GetCustomerDiscount_QNAME = new QName("http://org.jboss.ws/samples/retail/profile", "getCustomerDiscount"); + private final static QName _GetCustomerDiscountResponse_QNAME = new QName("http://org.jboss.ws/samples/retail/profile", "getCustomerDiscountResponse"); + + /** + * 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.profile + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link Customer } + * + */ + public Customer createCustomer() { + return new Customer(); + } + + /** + * Create an instance of {@link DiscountResponse } + * + */ + public DiscountResponse createDiscountResponse() { + return new DiscountResponse(); + } + + /** + * Create an instance of {@link DiscountRequest } + * + */ + public DiscountRequest createDiscountRequest() { + return new DiscountRequest(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DiscountRequest }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/samples/retail/profile", name = "getCustomerDiscount") + public JAXBElement<DiscountRequest> createGetCustomerDiscount(DiscountRequest value) { + return new JAXBElement<DiscountRequest>(_GetCustomerDiscount_QNAME, DiscountRequest.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DiscountResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/samples/retail/profile", name = "getCustomerDiscountResponse") + public JAXBElement<DiscountResponse> createGetCustomerDiscountResponse(DiscountResponse value) { + return new JAXBElement<DiscountResponse>(_GetCustomerDiscountResponse_QNAME, DiscountResponse.class, null, value); + } + +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java 2006-11-09 14:05:46 UTC (rev 1417) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java 2006-11-09 14:06:08 UTC (rev 1418) @@ -0,0 +1,52 @@ + +package org.jboss.test.ws.jaxws.samples.retail.profile; + +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 = "ProfileMgmtService", targetNamespace = "http://org.jboss.ws/samples/retail/profile", wsdlLocation = "resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl") +public class ProfileMgmtService + extends Service +{ + + private final static URL PROFILEMGMTSERVICE_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/ProfileMgmtService.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + PROFILEMGMTSERVICE_WSDL_LOCATION = url; + } + + public ProfileMgmtService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public ProfileMgmtService() { + super(PROFILEMGMTSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/samples/retail/profile", "ProfileMgmtService")); + } + + /** + * + * @return + * returns ProfileMgmt + */ + @WebEndpoint(name = "ProfileMgmtPort") + public ProfileMgmt getProfileMgmtPort() { + return (ProfileMgmt)super.getPort(new QName("http://org.jboss.ws/samples/retail/profile", "ProfileMgmtPort"), ProfileMgmt.class); + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/package-info.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/package-info.java 2006-11-09 14:05:46 UTC (rev 1417) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/package-info.java 2006-11-09 14:06:08 UTC (rev 1418) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.ws/samples/retail/profile") +package org.jboss.test.ws.jaxws.samples.retail.profile; Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 2 months

1
0
0 / 0

JBossWS SVN: r1417 - in trunk/src/test: java/org/jboss/test/ws/jaxws/samples/retail java/org/jboss/test/ws/jaxws/samples/retail/profile resources/jaxws/samples/retail/META-INF/wsdl

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-11-09 09:05:46 -0500 (Thu, 09 Nov 2006) New Revision: 1417 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/OrderMgmtBean.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/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/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl 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 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:33:03 UTC (rev 1416) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/Customer.java 2006-11-09 14:05:46 UTC (rev 1417) @@ -49,7 +49,7 @@ public void setLastName(String lastName) { this.lastName = lastName; } - + public String getCreditCardDetails() { return creditCardDetails; } Modified: 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-09 13:33:03 UTC (rev 1416) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2006-11-09 14:05:46 UTC (rev 1417) @@ -23,6 +23,10 @@ import org.jboss.test.ws.jaxws.samples.retail.cc.CCVerificationService; import org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification; +import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmtService; +import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt; +import org.jboss.test.ws.jaxws.samples.retail.profile.DiscountRequest; +import org.jboss.test.ws.jaxws.samples.retail.profile.DiscountResponse; import org.jboss.logging.Logger; import javax.annotation.PostConstruct; @@ -30,39 +34,57 @@ import javax.jws.WebService; import javax.xml.ws.WebServiceRef; +/** + * An example order management component + * that offers access though RMI and SOAP + */ @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; - + @WebServiceRef private CCVerificationService verificationService; private CCVerification verificationPort; - @PostConstruct - public void initialize(){ + @WebServiceRef private ProfileMgmtService profileService; + private ProfileMgmt profilePort; + + @PostConstruct public void initialize(){ verificationPort = verificationService.getCCVerificationPort(); + profilePort = profileService.getProfileMgmtPort(); } + /** + * Prepare a customer order. + * This will verify the billing details (i.e. creditcard) + * and check if the customer qualifies for a discount + * (applies to high value customers only) + * + * @param order + * @return OrderStaus + */ public OrderStatus prepareOrder(Order order) { log.info("Preparing order " + order); - return checkOrderDetails(order); - } + // verify billing details + String creditCard = order.getCustomer().getCreditCardDetails(); + boolean isValidCard = verificationPort.verify(creditCard); + log.info(creditCard + " valid? " + isValidCard); - private OrderStatus checkOrderDetails(Order order) - { - // verify creditcard - String creditCardDetails = order.getCustomer().getCreditCardDetails(); - boolean validCC = verificationPort.verify(creditCardDetails); + // high value customer discount + DiscountRequest discountRequest = new DiscountRequest(order.getCustomer()); + DiscountResponse discount = profilePort.getCustomerDiscount(discountRequest); + boolean hasDiscount = discount.getDiscount() > 0.00; + log.info("High value customer ? " + hasDiscount); - log.info(creditCardDetails + " valid? " + validCC); - // transition to prepared state order.setState(Order.OrderState.PREPARED); - return new OrderStatus("PREPARED", order.getOrderNum()); + + // done + return new OrderStatus("Prepared", order.getOrderNum()); } + + } Modified: 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-09 13:33:03 UTC (rev 1416) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2006-11-09 14:05:46 UTC (rev 1417) @@ -44,8 +44,8 @@ private static Order ORDER; private static Customer CUSTOMER; - static { - + static + { CUSTOMER = new Customer(); CUSTOMER.setFirstName("Chuck"); CUSTOMER.setLastName("Norris"); @@ -81,7 +81,7 @@ assertNotNull(orderMgmtEJB); OrderStatus result = orderMgmtEJB.prepareOrder(ORDER); - assertEquals("PREPARED", result.getStatus()); + assertEquals("Prepared", result.getStatus()); } public void testWebService() throws Exception @@ -89,7 +89,7 @@ assertWSDLAccess(); OrderStatus result = orderMgmtWS.prepareOrder(ORDER); - assertEquals("PREPARED", result.getStatus()); + assertEquals("Prepared", result.getStatus()); } private void assertWSDLAccess() throws MalformedURLException Modified: 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 13:33:03 UTC (rev 1416) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountRequest.java 2006-11-09 14:05:46 UTC (rev 1417) @@ -7,6 +7,30 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; + +/** + * <p>Java class for discountRequest complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="discountRequest"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="customer" type="{http://org.jboss.ws/samples/retail}customer" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "discountRequest", propOrder = { + "customer" + }) public class DiscountRequest { protected Customer customer; @@ -18,10 +42,26 @@ this.customer = customer; } + /** + * Gets the value of the customer property. + * + * @return + * possible object is + * {@link Customer } + * + */ public Customer getCustomer() { return customer; } + /** + * Sets the value of the customer property. + * + * @param value + * allowed object is + * {@link Customer } + * + */ public void setCustomer(Customer value) { this.customer = value; } Modified: 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 13:33:03 UTC (rev 1416) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/DiscountResponse.java 2006-11-09 14:05:46 UTC (rev 1417) @@ -3,7 +3,36 @@ 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; + +/** + * <p>Java class for discountResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="discountResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="customer" type="{http://org.jboss.ws/samples/retail}customer" minOccurs="0"/> + * <element name="discount" type="{http://www.w3.org/2001/XMLSchema}double"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "discountResponse", propOrder = { + "customer", + "discount" + }) public class DiscountResponse { protected Customer customer; @@ -17,18 +46,42 @@ this.discount = discount; } + /** + * Gets the value of the customer property. + * + * @return + * possible object is + * {@link Customer } + * + */ public Customer getCustomer() { return customer; } + /** + * Sets the value of the customer property. + * + * @param value + * allowed object is + * {@link Customer } + * + */ public void setCustomer(Customer value) { this.customer = value; } + /** + * Gets the value of the discount property. + * + */ public double getDiscount() { return discount; } + /** + * Sets the value of the discount property. + * + */ public void setDiscount(double value) { this.discount = value; } Modified: 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 13:33:03 UTC (rev 1416) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmt.java 2006-11-09 14:05:46 UTC (rev 1417) @@ -6,12 +6,13 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; + @Remote -@WebService(name = "ProfileMgmt", targetNamespace = "http://org.jboss.ws/samples/retail/profile") +@WebService(name = "ProfileMgmt", targetNamespace = "http://org.jboss.ws/samples/retail/profile", serviceName = "ProfileMgmtService") @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public interface ProfileMgmt { @WebMethod - public DiscountResponse getCustomerDiscount( DiscountRequest request); + public DiscountResponse getCustomerDiscount(DiscountRequest request); } Modified: 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 13:33:03 UTC (rev 1416) +++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/CCVerificationService.wsdl 2006-11-09 14:05:46 UTC (rev 1417) @@ -1,47 +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> + <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 Modified: 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:33:03 UTC (rev 1416) +++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/OrderMgmtService.wsdl 2006-11-09 14:05:46 UTC (rev 1417) @@ -1,65 +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> + <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 Modified: 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:33:03 UTC (rev 1416) +++ trunk/src/test/resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2006-11-09 14:05:46 UTC (rev 1417) @@ -1,64 +1,67 @@ <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> + <types> - <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> + <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'> + <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'/> - <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> + </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> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='ProfileMgmtService'> - <port binding='tns:ProfileMgmtBinding' name='ProfileMgmtPort'> + </types> - <soap:address location='http://D1XC662J:8080/jaxws-samples-retail/ProfileMgmtBean'/> - </port> - </service> + <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

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