March 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5884 - in stack/native/trunk: ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-06 15:40:06 -0500 (Thu, 06 Mar 2008) New Revision: 5884 Modified: stack/native/trunk/ant-import/build-release.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/build.xml stack/native/trunk/src/main/etc/component-info.xml stack/native/trunk/src/main/etc/component-info50.xml stack/native/trunk/version.properties Log: Move the build of jbossws.sar to AS50 Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/ant-import/build-release.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -40,7 +40,17 @@  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/bin"/> <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> + <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/resources"/> + <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/bin" overwrite="true"> + <fileset dir="${core.output.etc.dir}"> + <include name="wsrunclient.bat"/> + <include name="wstools.bat"/> + <include name="wsrunclient.sh"/> + <include name="wstools.sh"/> + </fileset> + </copy> <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-client.jar"/> @@ -49,10 +59,16 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> + <include name="jbossws-context.war"/> <include name="jbossws-core-src.zip"/> <include name="jbossws-core-scripts.zip"/> </fileset> </copy> + <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/resources" overwrite="true"> + <fileset dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </fileset> + </copy> <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${core.output.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${core.dir}/version.properties"/> @@ -61,11 +77,10 @@  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-native50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-native50/${repository.id}/lib" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jbossws-native50.sar"/> - <include name="jbossws-native50-deployer.zip"/> + <mkdir dir="${jboss.repository.dir}/jbossws-native50/${repository.id}/resources"/> + <copy todir="${jboss.repository.dir}/jbossws-native50/${repository.id}/resources" overwrite="true"> + <fileset dir="${core.output.lib.dir}/jbossws-native50"> + <include name="jbossws-beans.xml"/> </fileset> </copy> <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -92,7 +92,7 @@ <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jaxbintros/${jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jaxbintros/${jboss-jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/build.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -303,18 +303,15 @@ </jar>  - <copy todir="${core.output.lib.dir}/jbossws-context.war" filtering="true"> + <war warfile="${core.output.lib.dir}/jbossws-context.war" webxml="${core.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> <fileset dir="${core.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> - <include name="WEB-INF/**"/> </fileset> - <filterset> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${core.dir}/version.properties"/> - </filterset> - </copy> + <webinf dir="${core.resources.dir}/jbossws-context.war"> + <include name="jboss-web.xml"/> + </webinf> + </war>  <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" > @@ -351,7 +348,7 @@  <jar jarfile="${core.output.lib.dir}/jbossws-native50.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-context.war/**"/> + <include name="jbossws-context.war"/> <include name="jbossws-core.jar"/> </fileset> <fileset dir="${core.dir}/thirdparty"> @@ -389,7 +386,7 @@  <jar jarfile="${core.output.lib.dir}/jbossws-native42.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-context.war/**"/> + <include name="jbossws-context.war"/> <include name="jboss-jaxws.jar"/> <include name="jboss-jaxws-ext.jar"/> <include name="jboss-jaxrpc.jar"/> Modified: stack/native/trunk/src/main/etc/component-info.xml =================================================================== --- stack/native/trunk/src/main/etc/component-info.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/src/main/etc/component-info.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -12,8 +12,19 @@ <artifact id="jboss-jaxws-ext.jar"/> <artifact id="jboss-saaj.jar"/> <artifact id="jbossws-core-src.zip"/> - <artifact id="jbossws-core-scripts.zip"/> + <artifact id="jbossws-context.war"/> + <artifact id="standard-jaxrpc-client-config.xml"/> + <artifact id="standard-jaxrpc-endpoint-config.xml"/> + <artifact id="standard-jaxws-client-config.xml"/> + <artifact id="standard-jaxws-endpoint-config.xml"/> + <artifact id="wsrunclient.bat"/> + <artifact id="wsrunclient.sh"/> + <artifact id="wstools.bat"/> + <artifact id="wstools.sh"/> + <import componentref="jboss/jaxbintros"> + <compatible version="@jboss-jaxbintros@"/> + </import> <import componentref="jboss/jbossws-common"> <compatible version="@jbossws-common@"/> </import> Modified: stack/native/trunk/src/main/etc/component-info50.xml =================================================================== --- stack/native/trunk/src/main/etc/component-info50.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/src/main/etc/component-info50.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -5,7 +5,7 @@ version="@repository.id@" licenseType="lgpl"> - <artifact id="jbossws-native50.sar"/> + <artifact id="jbossws-beans.xml"/> <import componentref="jboss/jbossws"> <compatible version="@repository.id@"/> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/version.properties 2008-03-06 20:40:06 UTC (rev 5884) @@ -6,7 +6,7 @@ specification.version=jbossws-3.0 version.id=3.0.1-native-2.0.4.GA -repository.id=3.0.1-native-2.0.4.GA +repository.id=snapshot implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws @@ -31,7 +31,7 @@ # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR5 -jboss-remoting-jboss50=2.4.0.Beta1 +jboss-remoting-jboss50=2.4.0.Beta2 # JBossAS-4.2 jboss-jbossxb-jboss42=1.0.0.SP1 @@ -48,12 +48,12 @@ gnu-getopt=1.0.10 hibernate=3.2.1.GA javassist=3.6.0.GA -jaxbintros=1.0.0.beta2 jaxen=1.1-beta-10 jboss-common-core=2.0.2.GA jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-javaee=5.0.0.Beta3 +jboss-jaxbintros=1.0.0.beta2 jboss-jaxr=1.2.0.GA jboss-microcontainer=2.0.0.Beta3 jboss-security=4.0.5.GA

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5883 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/security.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-03-05 19:29:13 -0500 (Wed, 05 Mar 2008) New Revision: 5883 Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/MessageContextConfigSelector.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java Log: [JBWS-2022] Refactoring to provide a WSSecurity API (WIP) Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/MessageContextConfigSelector.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/MessageContextConfigSelector.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/MessageContextConfigSelector.java 2008-03-06 00:29:13 UTC (rev 5883) @@ -0,0 +1,182 @@ +/* + * 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.extensions.security; + +//$Id$ + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPException; +import javax.xml.ws.WebServiceException; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.soap.SOAPMessageImpl; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.ws.metadata.wsse.Config; +import org.jboss.ws.metadata.wsse.Encrypt; +import org.jboss.ws.metadata.wsse.Operation; +import org.jboss.ws.metadata.wsse.Port; +import org.jboss.ws.metadata.wsse.Requires; +import org.jboss.ws.metadata.wsse.Sign; +import org.jboss.ws.metadata.wsse.Timestamp; +import org.jboss.ws.metadata.wsse.Username; +import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; + +/** + * A Config whose attributes are derived from the specified message context. + * This is useful to provide the WSSecurityDispatcher with the right config + * according to the operation/port the current message is related to. + * + * @author alessio.soldano(a)jboss.com + * @since 06-Mar-2008 + */ +public class MessageContextConfigSelector extends Config +{ + private static Logger log = Logger.getLogger(MessageContextConfigSelector.class); + private CommonMessageContext ctx; + private WSSecurityConfiguration configuration; + private Config config; + private QName opName; + + public MessageContextConfigSelector(CommonMessageContext ctx) + { + this.ctx = ctx; + this.configuration = ctx.getEndpointMetaData().getServiceMetaData().getSecurityConfiguration(); + if (configuration == null) + throw new WSException("Cannot obtain security configuration from message context"); + this.config = new Config(); //empty config, no wsse requirements / processing + } + + public Encrypt getEncrypt() + { + readConfig(); + return config.getEncrypt(); + } + + public Requires getRequires() + { + readConfig(); + return config.getRequires(); + } + + public Sign getSign() + { + readConfig(); + return config.getSign(); + } + + public Timestamp getTimestamp() + { + readConfig(); + return config.getTimestamp(); + } + + public Username getUsername() + { + readConfig(); + return config.getUsername(); + } + + /** + * Gets the operation & port the current message is headed to and + * use them to get the right config to use. + * + */ + private void readConfig() + { + //once the operation name is known the specific config + //is not going to change + if (opName == null) + { + EndpointMetaData epMetaData = ctx.getEndpointMetaData(); + QName port = epMetaData.getPortName(); + + OperationMetaData opMetaData = ctx.getOperationMetaData(); + if (opMetaData == null) + { + // Get the operation meta data from the soap message + // for the server side inbound message. + SOAPMessageImpl soapMessage = (SOAPMessageImpl)ctx.getSOAPMessage(); + try + { + opMetaData = soapMessage.getOperationMetaData(epMetaData); + } + catch (SOAPException e) + { + throw new WebServiceException("Error while looking for the operation meta data: " + e); + } + } + if (opMetaData != null) + opName = opMetaData.getQName(); + + Config opConfig = getConfig(port, opName); + log.debug("WS-Security config: " + opConfig); + if (opConfig != null) + this.config = opConfig; + } + } + + private Config getConfig(QName portName, QName opName) + { + Port port = configuration.getPorts().get(portName != null ? portName.getLocalPart() : null); + if (port == null) + return configuration.getDefaultConfig(); + + Operation operation = port.getOperations().get(opName != null ? opName.toString() : null); + if (operation == null) + { + //if the operation name was not available or didn't match any wsse configured operation, + //we fall back to the port wsse config (if available) or the default config. + Config portConfig = port.getDefaultConfig(); + return (portConfig == null) ? configuration.getDefaultConfig() : portConfig; + + } + return operation.getConfig(); + } + + public void setEncrypt(Encrypt encrypt) + { + throw new UnsupportedOperationException(); + } + + public void setSign(Sign sign) + { + throw new UnsupportedOperationException(); + } + + public void setTimestamp(Timestamp timestamp) + { + throw new UnsupportedOperationException(); + } + + public void setUsername(Username username) + { + throw new UnsupportedOperationException(); + } + + public void setRequires(Requires requires) + { + throw new UnsupportedOperationException(); + } +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/MessageContextConfigSelector.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java 2008-03-06 00:29:13 UTC (rev 5883) @@ -0,0 +1,69 @@ +/* + * 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.extensions.security; + +//$Id$ + +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + +import org.jboss.ws.metadata.wsse.Config; +import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; + +public interface WSSecurityAPI +{ + /** + * Decodes a message using the specified configuration. This includes + * unencrypt, signature verification, etc. according to the requirements. + * + * @param configuration + * The WSSecurityConfiguration to use + * @param message + * The message that needs to be handled + * @param operationConfig + * The config object defining the operation (requirement checks) + * that should be performed on this message; overrides the default + * config contained in the provided WSSecurityConfiguration. + * @throws SOAPException + */ + public void decodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig) throws SOAPException; + + /** + * Encodes a message using the specified configuration. This includes + * encrypt, signature, username profile, etc. according to the config. + * + * @param configuration + * The WSSecurityConfiguration to use + * @param message + * The message that needs to be handled + * @param operationConfig + * The config object defining the operation that should be + * performed on this message; overrides the default config + * contained in the provided WSSecurityConfiguration. + * @param user + * The username to use if Username Token is needed. + * @param password + * The password to use if Username Token is needed. + * @throws SOAPException + */ + public void encodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig, String user, String password) throws SOAPException; +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-03-03 17:47:41 UTC (rev 5882) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-03-06 00:29:13 UTC (rev 5883) @@ -31,22 +31,18 @@ import javax.xml.rpc.soap.SOAPFaultException; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPHeader; +import javax.xml.soap.SOAPMessage; import javax.xml.ws.BindingProvider; import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.CommonSOAPFaultException; -import org.jboss.ws.core.StubExt; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.extensions.security.exception.InvalidSecurityHeaderException; import org.jboss.ws.extensions.security.exception.WSSecurityException; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.wsse.Config; import org.jboss.ws.metadata.wsse.Encrypt; -import org.jboss.ws.metadata.wsse.Operation; -import org.jboss.ws.metadata.wsse.Port; import org.jboss.ws.metadata.wsse.RequireEncryption; import org.jboss.ws.metadata.wsse.RequireSignature; import org.jboss.ws.metadata.wsse.RequireTimestamp; @@ -57,7 +53,7 @@ import org.jboss.wsf.common.DOMWriter; import org.w3c.dom.Element; -public class WSSecurityDispatcher +public class WSSecurityDispatcher implements WSSecurityAPI { // provide logging private static Logger log = Logger.getLogger(WSSecurityDispatcher.class); @@ -85,23 +81,6 @@ return newList; } - private static Config getConfig(WSSecurityConfiguration config, String portName, String opName) - { - Port port = config.getPorts().get(portName); - if (port == null) - return config.getDefaultConfig(); - - Operation operation = port.getOperations().get(opName); - if (operation == null) - { - Config portConfig = port.getDefaultConfig(); - return (portConfig == null) ? config.getDefaultConfig() : portConfig; - - } - - return operation.getConfig(); - } - private static CommonSOAPFaultException convertToFault(WSSecurityException e) { return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString()); @@ -109,75 +88,10 @@ public static void handleInbound(CommonMessageContext ctx) throws SOAPException, SOAPFaultException { - WSSecurityConfiguration config = getSecurityConfig(ctx); + WSSecurityConfiguration configuration = getSecurityConfig(ctx); SOAPMessageImpl soapMessage = (SOAPMessageImpl)ctx.getSOAPMessage(); - - SOAPHeader soapHeader = soapMessage.getSOAPHeader(); - QName secQName = new QName(Constants.WSSE_NS, "Security"); - Element secHeaderElement = (soapHeader != null) ? Util.findElement(soapHeader, secQName) : null; - - if (secHeaderElement == null) - { - // This is ok, we always allow faults to be received because WS-Security does not encrypt faults - if (soapMessage.getSOAPBody().getFault() != null) - return; - - OperationMetaData opMetaData = ctx.getOperationMetaData(); - if (opMetaData == null) - { - // Get the operation meta data from the soap message - // for the server side inbound message. - EndpointMetaData epMetaData = ctx.getEndpointMetaData(); - opMetaData = soapMessage.getOperationMetaData(epMetaData); - } - - String operation = opMetaData.getQName().toString(); - String port = opMetaData.getEndpointMetaData().getPortName().getLocalPart(); - - if (hasRequirements(config, operation, port)) - throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing.")); - - return; - } - - try - { - SecurityStore securityStore = new SecurityStore(config.getKeyStoreURL(), config.getKeyStoreType(), config.getKeyStorePassword(), config.getKeyPasswords(), config.getTrustStoreURL(), - config.getTrustStoreType(), config.getTrustStorePassword()); - SecurityDecoder decoder = new SecurityDecoder(securityStore); - - decoder.decode(soapMessage.getSOAPPart(), secHeaderElement); - - if (log.isTraceEnabled()) - log.trace("Decoded Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); - - OperationMetaData opMetaData = ctx.getOperationMetaData(); - if (opMetaData == null) - { - // Get the operation meta data from the soap message - // for the server side inbound message. - EndpointMetaData epMetaData = ctx.getEndpointMetaData(); - opMetaData = soapMessage.getOperationMetaData(epMetaData); - } - - String operation = opMetaData.getQName().toString(); - String port = opMetaData.getEndpointMetaData().getPortName().getLocalPart(); - - List<OperationDescription<RequireOperation>> operations = buildRequireOperations(config, operation, port); - - decoder.verify(operations); - if(log.isDebugEnabled()) log.debug("Verification is successful"); - - decoder.complete(); - } - catch (WSSecurityException e) - { - if (e.isInternalError()) - log.error("Internal error occured handling inbound message:", e); - else if(log.isDebugEnabled()) log.debug("Returning error to sender: " + e.getMessage()); - - throw convertToFault(e); - } + + new WSSecurityDispatcher().decodeMessage(configuration, soapMessage, new MessageContextConfigSelector(ctx)); //TODO!!! } private static WSSecurityConfiguration getSecurityConfig(CommonMessageContext ctx) @@ -189,18 +103,11 @@ return config; } - private static boolean hasRequirements(WSSecurityConfiguration config, String operation, String port) + private static List<OperationDescription<RequireOperation>> buildRequireOperations(Config operationConfig) { - Config operationConfig = getConfig(config, port, operation); - return (operationConfig != null && operationConfig.getRequires() != null); - } - - private static List<OperationDescription<RequireOperation>> buildRequireOperations(WSSecurityConfiguration config, String operation, String port) - { - Config operationConfig = getConfig(config, port, operation); if (operationConfig == null) return null; - + Requires requires = operationConfig.getRequires(); if (requires == null) return null; @@ -229,50 +136,102 @@ public static void handleOutbound(CommonMessageContext ctx) throws SOAPException, SOAPFaultException { - WSSecurityConfiguration config = getSecurityConfig(ctx); + WSSecurityConfiguration configuration = getSecurityConfig(ctx); SOAPMessageImpl soapMessage = (SOAPMessageImpl)ctx.getSOAPMessage(); + + String user = (String)ctx.get(Stub.USERNAME_PROPERTY); + String pass = (String)ctx.get(Stub.PASSWORD_PROPERTY); + + if (user == null && pass == null) + { + user = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); + pass = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); + } - EndpointMetaData epMetaData = ctx.getEndpointMetaData(); - String port = epMetaData.getPortName().getLocalPart(); + new WSSecurityDispatcher().encodeMessage(configuration, soapMessage, new MessageContextConfigSelector(ctx), user, pass); //TODO!! + } + + private static Config getConfig(WSSecurityConfiguration configuration, Config operationConfig) + { + //null operationConfig means default behavior + return operationConfig != null ? operationConfig : configuration.getDefaultConfig(); + } + + private static boolean hasRequirements(Config config) + { + return config != null && config.getRequires() != null; + } + + public void decodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig) throws SOAPException + { + Config config = getConfig(configuration, operationConfig); + SOAPHeader soapHeader = message.getSOAPHeader(); + QName secQName = new QName(Constants.WSSE_NS, "Security"); + Element secHeaderElement = (soapHeader != null) ? Util.findElement(soapHeader, secQName) : null; + + if (secHeaderElement == null) + { + // This is ok, we always allow faults to be received because WS-Security does not encrypt faults + if (message.getSOAPBody().getFault() != null) + return; + + if (hasRequirements(config)) + throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing.")); + + return; + } + + try + { + SecurityStore securityStore = new SecurityStore(configuration.getKeyStoreURL(), configuration.getKeyStoreType(), configuration.getKeyStorePassword(), + configuration.getKeyPasswords(), configuration.getTrustStoreURL(), configuration.getTrustStoreType(), configuration.getTrustStorePassword()); + SecurityDecoder decoder = new SecurityDecoder(securityStore); + + decoder.decode(message.getSOAPPart(), secHeaderElement); + + if (log.isTraceEnabled()) + log.trace("Decoded Message:\n" + DOMWriter.printNode(message.getSOAPPart(), true)); + + List<OperationDescription<RequireOperation>> operations = buildRequireOperations(config); + + decoder.verify(operations); + if(log.isDebugEnabled()) log.debug("Verification is successful"); + + decoder.complete(); + } + catch (WSSecurityException e) + { + if (e.isInternalError()) + log.error("Internal error occured handling inbound message:", e); + else if(log.isDebugEnabled()) log.debug("Returning error to sender: " + e.getMessage()); + + throw convertToFault(e); + } - String opName = null; - OperationMetaData opMetaData = ctx.getOperationMetaData(); - if (opMetaData != null) - opName = opMetaData.getQName().toString(); + } - Config opConfig = getConfig(config, port, opName); - log.debug("WS-Security config: " + opConfig); + public void encodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig, String user, String password) throws SOAPException + { + Config config = getConfig(configuration, operationConfig); + log.debug("WS-Security config: " + config); // Nothing to process - if (opConfig == null) + if (config == null) return; ArrayList<OperationDescription<EncodingOperation>> operations = new ArrayList<OperationDescription<EncodingOperation>>(); - Timestamp timestamp = opConfig.getTimestamp(); + Timestamp timestamp = config.getTimestamp(); if (timestamp != null) { operations.add(new OperationDescription<EncodingOperation>(TimestampOperation.class, null, null, timestamp.getTtl(), null, null, null)); } - if (opConfig.getUsername() != null) + if (config.getUsername() != null && user != null && password != null) { - Object user = ctx.get(Stub.USERNAME_PROPERTY); - Object pass = ctx.get(Stub.PASSWORD_PROPERTY); - - if (user == null && pass == null) - { - user = ctx.get(BindingProvider.USERNAME_PROPERTY); - pass = ctx.get(BindingProvider.PASSWORD_PROPERTY); - } - - if (user != null && pass != null) - { - operations.add(new OperationDescription<EncodingOperation>(SendUsernameOperation.class, null, user.toString(), pass.toString(), null, null, null)); - ctx.put(StubExt.PROPERTY_AUTH_TYPE, StubExt.PROPERTY_AUTH_TYPE_WSSE); - } + operations.add(new OperationDescription<EncodingOperation>(SendUsernameOperation.class, null, user, password, null, null, null)); } - Sign sign = opConfig.getSign(); + Sign sign = config.getSign(); if (sign != null) { List<Target> targets = convertTargets(sign.getTargets()); @@ -288,7 +247,7 @@ operations.add(new OperationDescription<EncodingOperation>(SignatureOperation.class, targets, sign.getAlias(), null, null, null, sign.getTokenRefType())); } - Encrypt encrypt = opConfig.getEncrypt(); + Encrypt encrypt = config.getEncrypt(); if (encrypt != null) { List<Target> targets = convertTargets(encrypt.getTargets()); @@ -298,14 +257,14 @@ if (operations.size() == 0) return; - if(log.isDebugEnabled()) log.debug("Encoding Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); + if(log.isDebugEnabled()) log.debug("Encoding Message:\n" + DOMWriter.printNode(message.getSOAPPart(), true)); try { - SecurityStore securityStore = new SecurityStore(config.getKeyStoreURL(), config.getKeyStoreType(), config.getKeyStorePassword(), config.getKeyPasswords() , config.getTrustStoreURL(), - config.getTrustStoreType(), config.getTrustStorePassword()); + SecurityStore securityStore = new SecurityStore(configuration.getKeyStoreURL(), configuration.getKeyStoreType(), configuration.getKeyStorePassword(), + configuration.getKeyPasswords() , configuration.getTrustStoreURL(), configuration.getTrustStoreType(), configuration.getTrustStorePassword()); SecurityEncoder encoder = new SecurityEncoder(operations, securityStore); - encoder.encode(soapMessage.getSOAPPart()); + encoder.encode(message.getSOAPPart()); } catch (WSSecurityException e) { @@ -316,4 +275,5 @@ throw convertToFault(e); } } + }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5882 - in legacy/branches/jbossws-1.2.1.GA_JBWS-2020: jbossws-core/src/java/org/jboss/ws/tools/helpers and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-03-03 12:47:41 -0500 (Mon, 03 Mar 2008) New Revision: 5882 Added: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019/ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/Person.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBook.wsdl legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBookPort.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/TelephoneNumber.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/wstools-config.xml Removed: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/Person.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBook.wsdl legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBookPort.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/TelephoneNumber.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/wstools-config.xml Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/build/version.properties legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml Log: [JBWS-2020] WSDL To Java - Case of service-interface and service-endpoint-interface in JAX-RPC mapping does not match generated interface when WSDL type begins with lower case. Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/build/version.properties =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/build/version.properties 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/build/version.properties 2008-03-03 17:47:41 UTC (rev 5882) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-1.2 -version.id=1.2.1.GA -repository.id=1.2.1.GA +version.id=1.2.1.GA_JBWS-2020 +repository.id=1.2.1.GA_JBWS-2020 implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -149,7 +149,8 @@ String targetNS = wsdlDefinitions.getTargetNamespace(); String prefix = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_SERVICE_PREFIX; ServiceInterfaceMapping sim = new ServiceInterfaceMapping(jwm); - sim.setServiceInterface(packageName + "." + javaServiceName); + String className = ToolsUtils.firstLetterUpperCase(javaServiceName); + sim.setServiceInterface(packageName + "." + className); sim.setWsdlServiceName(new QName(targetNS, serviceName, prefix)); WSDLEndpoint[] endpoints = ser.getEndpoints(); @@ -195,7 +196,8 @@ javaPortName += "_PortType"; ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm); - seim.setServiceEndpointInterface(packageName + "." + javaPortName); + String className = ToolsUtils.firstLetterUpperCase(javaPortName); + seim.setServiceEndpointInterface(packageName + "." + className); seim.setWsdlPortType(new QName(targetNS, portName, "portTypeNS")); seim.setWsdlBinding(new QName(targetNS, bindName, "bindingNS")); constructServiceEndpointMethodMapping(seim, wsdlintf); Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019 (from rev 5881, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019) Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws2019; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test case to test the following fix: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-2019 - * - * @author darran.lofthouse(a)jboss.com - * @since Mar 3, 2008 - */ -public class JBWS2019TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws2019/" + scenario; - String toolsDir = "tools/jbws2019/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws2019/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2019"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java (from rev 5881, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws2019; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.test.ws.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-2019 + * + * @author darran.lofthouse(a)jboss.com + * @since Mar 3, 2008 + */ +public class JBWS2019TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws2019/" + scenario; + String toolsDir = "tools/jbws2019/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws2019/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2019"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2008-03-03 17:47:41 UTC (rev 5882) @@ -4,7 +4,7 @@ <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> </package-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> + <service-interface>org.jboss.test.ws.jbws1691.PhoneBook_Service</service-interface> <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>serviceNS:phoneBook</wsdl-service-name> <port-mapping> <port-name>PhoneBookPort</port-name> @@ -12,7 +12,7 @@ </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1691.phoneBook_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jbws1691.PhoneBook_PortType</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeNS:phoneBook</wsdl-port-type> <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>bindingNS:PhoneBookBinding</wsdl-binding> <service-endpoint-method-mapping> Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019 (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019) Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit) Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/Person.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/Person.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Mar 03 12:41:29 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws2019; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/Person.java (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/Person.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/Person.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Mar 03 12:41:29 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2019; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBook.wsdl 2008-03-03 17:47:41 UTC (rev 5882) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws2019' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws2019/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws2019' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws2019/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws2019/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='phoneBookPort'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='phoneBookBinding' type='tns:phoneBookPort'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - - <service name='phoneBookService'> - <port binding='tns:phoneBookBinding' name='PhoneBook'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> - -</definitions> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBook.wsdl (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBook.wsdl (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBook.wsdl 2008-03-03 17:47:41 UTC (rev 5882) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws2019' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws2019/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws2019' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws2019/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws2019/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='phoneBookPort'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='phoneBookBinding' type='tns:phoneBookPort'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='phoneBookService'> + <port binding='tns:phoneBookBinding' name='PhoneBook'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> + +</definitions> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBookPort.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBookPort.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Mar 03 12:41:29 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws2019; -public interface PhoneBookPort extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws2019.TelephoneNumber lookup(org.jboss.test.ws.jbws2019.Person lookup) throws java.rmi.RemoteException; -} Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBookPort.java (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBookPort.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/PhoneBookPort.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Mar 03 12:41:29 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws2019; +public interface PhoneBookPort extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws2019.TelephoneNumber lookup(org.jboss.test.ws.jbws2019.Person lookup) throws java.rmi.RemoteException; +} Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/TelephoneNumber.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/TelephoneNumber.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Mar 03 12:41:29 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws2019; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/TelephoneNumber.java (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/TelephoneNumber.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/TelephoneNumber.java 2008-03-03 17:47:41 UTC (rev 5882) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Mar 03 12:41:29 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2019; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml 2008-03-03 17:47:41 UTC (rev 5882) @@ -1,67 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws2019</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws2019/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws2019</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws2019</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2019.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2019.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws2019.PhoneBookService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2019'>serviceNS:phoneBookService</wsdl-service-name> - <port-mapping> - <port-name>PhoneBook</port-name> - <java-port-name>PhoneBook</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws2019.PhoneBookPort</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2019'>portTypeNS:phoneBookPort</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2019'>bindingNS:phoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws2019.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws2019.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml 2008-03-03 17:47:41 UTC (rev 5882) @@ -0,0 +1,67 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws2019</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2019/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws2019</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2019</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2019.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2019.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws2019.PhoneBookService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2019'>serviceNS:phoneBookService</wsdl-service-name> + <port-mapping> + <port-name>PhoneBook</port-name> + <java-port-name>PhoneBook</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws2019.PhoneBookPort</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2019'>portTypeNS:phoneBookPort</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2019'>bindingNS:phoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws2019.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws2019.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml 2008-03-03 16:38:38 UTC (rev 5881) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/wstools-config.xml 2008-03-03 17:47:41 UTC (rev 5882) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws2019/doclit/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/wstools-config.xml (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/wstools-config.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-2020/jbossws-tests/src/resources/tools/jbws2019/doclit/wstools-config.xml 2008-03-03 17:47:41 UTC (rev 5882) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws2019/doclit/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5881 - in stack/native/trunk/src: test/java/org/jboss/test/ws/tools and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-03-03 11:38:38 -0500 (Mon, 03 Mar 2008) New Revision: 5881 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java stack/native/trunk/src/test/resources/tools/jbws2019/ stack/native/trunk/src/test/resources/tools/jbws2019/doclit/ stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java stack/native/trunk/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml Log: [JBWS-2019] WSDL To Java - Case of service-interface and service-endpoint-interface in JAX-RPC mapping does not match generated interface when WSDL type begins with lower case. Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-03-03 15:18:34 UTC (rev 5880) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-03-03 16:38:38 UTC (rev 5881) @@ -154,7 +154,8 @@ String targetNS = wsdlDefinitions.getTargetNamespace(); String prefix = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_SERVICE_PREFIX; ServiceInterfaceMapping sim = new ServiceInterfaceMapping(jwm); - sim.setServiceInterface(getPackageName(targetNS) + "." + javaServiceName); + String className = ToolsUtils.firstLetterUpperCase(javaServiceName); + sim.setServiceInterface(getPackageName(targetNS) + "." + className); sim.setWsdlServiceName(new QName(targetNS, serviceName, prefix)); WSDLEndpoint[] endpoints = ser.getEndpoints(); @@ -200,7 +201,8 @@ javaPortName += "_PortType"; ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm); - seim.setServiceEndpointInterface(getPackageName(targetNS) + "." + javaPortName); + String className = ToolsUtils.firstLetterUpperCase(javaPortName); + seim.setServiceEndpointInterface(getPackageName(targetNS) + "." + className); seim.setWsdlPortType(new QName(targetNS, portName, "portTypeNS")); seim.setWsdlBinding(new QName(targetNS, bindName, "bindingNS")); constructServiceEndpointMethodMapping(seim, wsdlintf); Added: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-03-03 16:38:38 UTC (rev 5881) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws2019; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-2019 + * + * @author darran.lofthouse(a)jboss.com + * @since Mar 3, 2008 + */ +public class JBWS2019TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws2019/" + scenario; + String toolsDir = "tools/jbws2019/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws2019/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2019"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2008-03-03 15:18:34 UTC (rev 5880) +++ stack/native/trunk/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2008-03-03 16:38:38 UTC (rev 5881) @@ -4,7 +4,7 @@ <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> </package-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> + <service-interface>org.jboss.test.ws.jbws1691.PhoneBook_Service</service-interface> <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>serviceNS:phoneBook</wsdl-service-name> <port-mapping> <port-name>PhoneBookPort</port-name> @@ -12,7 +12,7 @@ </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1691.phoneBook_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jbws1691.PhoneBook_PortType</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeNS:phoneBook</wsdl-port-type> <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>bindingNS:PhoneBookBinding</wsdl-binding> <service-endpoint-method-mapping> Added: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java (rev 0) +++ stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java 2008-03-03 16:38:38 UTC (rev 5881) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Mar 03 12:41:29 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2019; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Property changes on: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl 2008-03-03 16:38:38 UTC (rev 5881) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws2019' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws2019/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws2019' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws2019/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws2019/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='phoneBookPort'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='phoneBookBinding' type='tns:phoneBookPort'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='phoneBookService'> + <port binding='tns:phoneBookBinding' name='PhoneBook'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> + +</definitions> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java (rev 0) +++ stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java 2008-03-03 16:38:38 UTC (rev 5881) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Mar 03 12:41:29 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws2019; +public interface PhoneBookPort extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws2019.TelephoneNumber lookup(org.jboss.test.ws.jbws2019.Person lookup) throws java.rmi.RemoteException; +} Property changes on: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java (rev 0) +++ stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java 2008-03-03 16:38:38 UTC (rev 5881) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Mar 03 12:41:29 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2019; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Property changes on: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml 2008-03-03 16:38:38 UTC (rev 5881) @@ -0,0 +1,67 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws2019</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2019/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws2019</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2019</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2019.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2019.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws2019.PhoneBookService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2019'>serviceNS:phoneBookService</wsdl-service-name> + <port-mapping> + <port-name>PhoneBook</port-name> + <java-port-name>PhoneBook</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws2019.PhoneBookPort</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2019'>portTypeNS:phoneBookPort</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2019'>bindingNS:phoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws2019.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws2019.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml (rev 0) +++ stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml 2008-03-03 16:38:38 UTC (rev 5881) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws2019/doclit/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5880 - legacy/branches.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-03-03 10:18:34 -0500 (Mon, 03 Mar 2008) New Revision: 5880 Added: legacy/branches/jbossws-1.2.1.GA_JBWS-2020/ Log: [JBWS-2020] Support Patch Branch Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2020 (from rev 5879, legacy/branches/jbossws-1.2.1.GA_JBWS-1875)

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5879 - stack/metro/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-02 03:55:43 -0500 (Sun, 02 Mar 2008) New Revision: 5879 Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt Log: TODO: Fix classpath to ClientLauncher Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-02 08:55:38 UTC (rev 5878) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-02 08:55:43 UTC (rev 5879) @@ -19,3 +19,7 @@ org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/swaref/** org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.* + +# TODO: Fix classpath to ClientLauncher +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/**

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5878 - stack/cxf/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-02 03:55:38 -0500 (Sun, 02 Mar 2008) New Revision: 5878 Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt Log: TODO: Fix classpath to ClientLauncher Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-01 10:04:30 UTC (rev 5877) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-02 08:55:38 UTC (rev 5878) @@ -38,4 +38,7 @@ # Won't Fix: [CXF-1261] Handler does not see XOP message properly org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* +# TODO: Fix classpath to ClientLauncher +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/**

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5877 - stack/cxf/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-01 05:04:30 -0500 (Sat, 01 Mar 2008) New Revision: 5877 Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml Log: Fix client jar reference in dist Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-03-01 10:04:26 UTC (rev 5876) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-03-01 10:04:30 UTC (rev 5877) @@ -60,8 +60,8 @@ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> <available property="jboss422.available" file="${jboss422.available.file}"/> <available property="jboss423.available" file="${jboss423.available.file}"/>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5876 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-01 05:04:26 -0500 (Sat, 01 Mar 2008) New Revision: 5876 Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml Log: Fix client jar reference in dist Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-03-01 10:04:22 UTC (rev 5875) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-03-01 10:04:26 UTC (rev 5876) @@ -68,8 +68,8 @@ <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> <available property="jboss421.available" file="${jboss421.available.file}"/> <available property="jboss422.available" file="${jboss422.available.file}"/>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r5875 - stack/metro/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-01 05:04:22 -0500 (Sat, 01 Mar 2008) New Revision: 5875 Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml Log: Fix client jar reference in dist Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-29 20:30:31 UTC (rev 5874) +++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-03-01 10:04:22 UTC (rev 5875) @@ -60,8 +60,8 @@ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> <available property="jboss422.available" file="${jboss422.available.file}"/> <available property="jboss423.available" file="${jboss423.available.file}"/>

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2008