November 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r8669 - in common/trunk: src/main/java/org/jboss/ws and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-07 06:21:50 -0500 (Fri, 07 Nov 2008) New Revision: 8669 Added: common/trunk/src/main/java/org/jboss/ws/Constants.java common/trunk/src/main/java/org/jboss/ws/WSException.java common/trunk/src/main/java/org/jboss/ws/core/ common/trunk/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java common/trunk/src/main/java/org/jboss/ws/core/utils/ common/trunk/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java common/trunk/src/main/java/org/jboss/ws/core/utils/JarUrlConnection.java common/trunk/src/main/java/org/jboss/ws/core/utils/MimeUtils.java common/trunk/src/main/java/org/jboss/ws/core/utils/ResourceURL.java common/trunk/src/main/java/org/jboss/ws/core/utils/XMLPredefinedEntityReferenceResolver.java Modified: common/trunk/pom.xml Log: [JBWS-2318] refactoring to common Modified: common/trunk/pom.xml =================================================================== --- common/trunk/pom.xml 2008-11-07 10:35:25 UTC (rev 8668) +++ common/trunk/pom.xml 2008-11-07 11:21:50 UTC (rev 8669) @@ -75,6 +75,11 @@ <version>2.5</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4</version> + </dependency>  <dependency> Added: common/trunk/src/main/java/org/jboss/ws/Constants.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/Constants.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/Constants.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,321 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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; + +import javax.xml.namespace.QName; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPConstants; +import javax.xml.ws.http.HTTPBinding; +import javax.xml.ws.soap.SOAPBinding; + +/** + * A collection of constants relevant to JBossWS + * + * @author Thomas.Diesler(a)jboss.org + * @author Anil.Saldhana(a)jboss.org + * @author richard.opalka(a)jboss.org + * @since 10-Oct-2004 + */ +public interface Constants +{ + /** Header for XML Documents */ + static final String XML_HEADER = "<?xml version='1.0' encoding='UTF-8'?>"; + /** Default charset for XML Documents */ + static final String DEFAULT_XML_CHARSET = "UTF-8"; + /** JBossWS namespace URI */ + static final String NS_JBOSSWS_URI = "http://www.jboss.org/jbossws"; + /** XML Namespace */ + static final String NS_XML = "http://www.w3.org/XML/1998/namespace"; + /** XML namespace declaration namespace */ + static final String NS_XMLNS = "http://www.w3.org/2000/xmlns/"; + /** XMLSchema namespace http://www.w3.org/2001/XMLSchema */ + static final String NS_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema"; + /** XMLSchema instance namespace http://www.w3.org/2001/XMLSchema-instance */ + static final String NS_SCHEMA_XSI = "http://www.w3.org/2001/XMLSchema-instance"; + /** SOAP-1.1 namespace http://schemas.xmlsoap.org/wsdl/soap/ */ + static final String NS_SOAP11 = "http://schemas.xmlsoap.org/wsdl/soap/"; + /** SOAP-1.1 envelope namespace http://schemas.xmlsoap.org/soap/envelope/ */ + static final String NS_SOAP11_ENV = SOAPConstants.URI_NS_SOAP_ENVELOPE; + /** SOAP-1.2 namespace http://schemas.xmlsoap.org/wsdl/soap12/ */ + static final String NS_SOAP12 = "http://schemas.xmlsoap.org/wsdl/soap12/"; + /** HTTP binding namespace http://schemas.xmlsoap.org/wsdl/http/ */ + static final String NS_HTTP = "http://schemas.xmlsoap.org/wsdl/http/"; + /** SOAP-1.2 envelope namespace http://www.w3.org/2003/05/soap-envelope */ + static final String NS_SOAP12_ENV = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE; + /** The namespace for the SwA mime type */ + static final String NS_SWA_MIME = "http://schemas.xmlsoap.org/wsdl/mime/"; + /** Default namespace for WSDL-1.1 http://schemas.xmlsoap.org/wsdl/ */ + static final String NS_WSDL11 = "http://schemas.xmlsoap.org/wsdl/"; + /** The namespace for the MTOM content type attribute. */ + static final String NS_XML_MIME = "http://www.w3.org/2005/05/xmlmime"; + /** The namespace for XOP. */ + static final String NS_XOP = "http://www.w3.org/2004/08/xop/include"; + + /** A constant representing the identity of the SOAP 1.1 over HTTP binding. */ + public static final String SOAP11HTTP_BINDING = SOAPBinding.SOAP11HTTP_BINDING; + /** A constant representing the identity of the SOAP 1.2 over HTTP binding. */ + public static final String SOAP12HTTP_BINDING = SOAPBinding.SOAP12HTTP_BINDING; + /** A constant representing the identity of the SOAP 1.1 over HTTP binding with MTOM enabled by default. */ + public static final String SOAP11HTTP_MTOM_BINDING = SOAPBinding.SOAP11HTTP_MTOM_BINDING; + /** A constant representing the identity of the SOAP 1.2 over HTTP binding with MTOM enabled by default. */ + public static final String SOAP12HTTP_MTOM_BINDING = SOAPBinding.SOAP12HTTP_MTOM_BINDING; + /** A constant representing the identity of the XML/HTTP binding. */ + public static final String HTTP_BINDING = HTTPBinding.HTTP_BINDING; + + /** SOAP-1.1 encoding URI */ + static final String URI_SOAP11_ENC = SOAPConstants.URI_NS_SOAP_ENCODING; + /** SOAP-1.2 encoding URI */ + static final String URI_SOAP12_ENC = SOAPConstants.URI_NS_SOAP_1_2_ENCODING; + /** SOAP HTTP transport URI in wsdl soap binding */ + static final String URI_SOAP_HTTP = "http://schemas.xmlsoap.org/soap/http"; + /** Literal encoding URI */ + static final String URI_LITERAL_ENC = ""; + /** WSDL 2.0 Encoding Rules */ + static final String URI_STYLE_RPC = "http://www.w3.org/2004/03/wsdl/style/rpc"; + static final String URI_STYLE_DOCUMENT = "http://www.w3.org/2004/03/wsdl/style/iri"; + + /** WS-Eventing namespace uri **/ + static final String URI_WS_EVENTING = "http://schemas.xmlsoap.org/ws/2004/08/eventing"; + + /** WS-Policy namespace uri **/ + static final String URI_WS_POLICY = "http://schemas.xmlsoap.org/ws/2004/09/policy"; + + /** WS-Addressing namespace uri **/ + static final String URI_WS_ADDRESSING = "http://www.w3.org/2005/08/addressing"; + + /** JAX-WS binding customizations namespace uri **/ + static final String URI_JAXWS_WSDL_CUSTOMIZATIONS = "http://java.sun.com/xml/ns/jaxws"; + + /**Style of WSDL */ + static final String RPC_LITERAL = "RPC/Literal"; + static final String DOCUMENT_LITERAL = "Document/Literal"; + + // Some prefixes + static final String PREFIX_ENV = SOAPConstants.SOAP_ENV_PREFIX; + static final String PREFIX_XMIME = "xmime"; + static final String PREFIX_SOAP11 = "soap"; + static final String PREFIX_SOAP11_ENC = "soap11-enc"; + static final String PREFIX_TNS = "tns"; + static final String PREFIX_WSDL = "wsdl"; + static final String PREFIX_XOP = "xop"; + static final String PREFIX_XSD = "xsd"; + static final String PREFIX_XSI = "xsi"; + static final String PREFIX_XML = "xml"; + + /** XOP Include */ + static final QName NAME_XOP_INCLUDE = new QName(NS_XOP, "Include", PREFIX_XOP); + + /** SOAP-1.1 roles */ + static final String URI_SOAP11_NEXT_ACTOR = "http://schemas.xmlsoap.org/soap/actor/next"; + + /** SOAP-1.1 attributes */ + static final String SOAP11_ATTR_ACTOR = "actor"; + static final String SOAP11_ATTR_MUST_UNDERSTAND = "mustUnderstand"; + + /** SOAP-1.1 fault codes */ + static final QName SOAP11_FAULT_CODE_CLIENT = new QName(NS_SOAP11_ENV, "Client", PREFIX_ENV); + static final QName SOAP11_FAULT_CODE_SERVER = new QName(NS_SOAP11_ENV, "Server", PREFIX_ENV); + static final QName SOAP11_FAULT_CODE_VERSION_MISMATCH = new QName(NS_SOAP11_ENV, "VersionMismatch", PREFIX_ENV); + static final QName SOAP11_FAULT_CODE_MUST_UNDERSTAND = new QName(NS_SOAP11_ENV, "MustUnderstand", PREFIX_ENV); + + /** SOAP-1.1 elements */ + static final QName SOAP11_FAULTCODE = new QName("faultcode"); + static final QName SOAP11_FAULTSTRING = new QName("faultstring"); + static final QName SOAP11_FAULTACTOR = new QName("faultactor"); + static final QName SOAP11_DETAIL = new QName("detail"); + + /** SOAP-1.2 attributes */ + static final String SOAP12_ATTR_ROLE = "role"; + static final String SOAP12_ATTR_RELAY = "relay"; + + /**SOAP-1.2 elements */ + static final QName SOAP12_CODE = new QName(NS_SOAP12_ENV, "Code", PREFIX_ENV); + static final QName SOAP12_VALUE = new QName(NS_SOAP12_ENV, "Value", PREFIX_ENV); + static final QName SOAP12_SUBCODE = new QName(NS_SOAP12_ENV, "Subcode", PREFIX_ENV); + static final QName SOAP12_REASON = new QName(NS_SOAP12_ENV, "Reason", PREFIX_ENV); + static final QName SOAP12_TEXT = new QName(NS_SOAP12_ENV, "Text", PREFIX_ENV); + static final QName SOAP12_ROLE = new QName(NS_SOAP12_ENV, "Role", PREFIX_ENV); + static final QName SOAP12_NODE = new QName(NS_SOAP12_ENV, "Node", PREFIX_ENV); + static final QName SOAP12_DETAIL = new QName(NS_SOAP12_ENV, "Detail", PREFIX_ENV); + + /** The default RPC return parameter name */ + static final String DEFAULT_RPC_RETURN_NAME = "result"; // FIXME: According to JSR-181 this should be 'return' + + /** Standard Literal XML types */ + static final QName TYPE_LITERAL_ANYSIMPLETYPE = new QName(NS_SCHEMA_XSD, "anySimpleType", PREFIX_XSD); + static final QName TYPE_LITERAL_ANYTYPE = new QName(NS_SCHEMA_XSD, "anyType", PREFIX_XSD); + static final QName TYPE_LITERAL_ANYURI = new QName(NS_SCHEMA_XSD, "anyURI", PREFIX_XSD); + static final QName TYPE_LITERAL_BASE64BINARY = new QName(NS_SCHEMA_XSD, "base64Binary", PREFIX_XSD); + static final QName TYPE_LITERAL_BOOLEAN = new QName(NS_SCHEMA_XSD, "boolean", PREFIX_XSD); + static final QName TYPE_LITERAL_BYTE = new QName(NS_SCHEMA_XSD, "byte", PREFIX_XSD); + static final QName TYPE_LITERAL_DATE = new QName(NS_SCHEMA_XSD, "date", PREFIX_XSD); + static final QName TYPE_LITERAL_DATETIME = new QName(NS_SCHEMA_XSD, "dateTime", PREFIX_XSD); + static final QName TYPE_LITERAL_DECIMAL = new QName(NS_SCHEMA_XSD, "decimal", PREFIX_XSD); + static final QName TYPE_LITERAL_DOUBLE = new QName(NS_SCHEMA_XSD, "double", PREFIX_XSD); + static final QName TYPE_LITERAL_DURATION = new QName(NS_SCHEMA_XSD, "duration", PREFIX_XSD); + static final QName TYPE_LITERAL_FLOAT = new QName(NS_SCHEMA_XSD, "float", PREFIX_XSD); + static final QName TYPE_LITERAL_GDAY = new QName(NS_SCHEMA_XSD, "gDay", PREFIX_XSD); + static final QName TYPE_LITERAL_GMONTH = new QName(NS_SCHEMA_XSD, "gMonth", PREFIX_XSD); + static final QName TYPE_LITERAL_GMONTHDAY = new QName(NS_SCHEMA_XSD, "gMonthDay", PREFIX_XSD); + static final QName TYPE_LITERAL_GYEAR = new QName(NS_SCHEMA_XSD, "gYear", PREFIX_XSD); + static final QName TYPE_LITERAL_GYEARMONTH = new QName(NS_SCHEMA_XSD, "gYearMonth", PREFIX_XSD); + static final QName TYPE_LITERAL_HEXBINARY = new QName(NS_SCHEMA_XSD, "hexBinary", PREFIX_XSD); + static final QName TYPE_LITERAL_ID = new QName(NS_SCHEMA_XSD, "ID", PREFIX_XSD); + static final QName TYPE_LITERAL_INT = new QName(NS_SCHEMA_XSD, "int", PREFIX_XSD); + static final QName TYPE_LITERAL_INTEGER = new QName(NS_SCHEMA_XSD, "integer", PREFIX_XSD); + static final QName TYPE_LITERAL_LANGUAGE = new QName(NS_SCHEMA_XSD, "language", PREFIX_XSD); + static final QName TYPE_LITERAL_LONG = new QName(NS_SCHEMA_XSD, "long", PREFIX_XSD); + static final QName TYPE_LITERAL_NAME = new QName(NS_SCHEMA_XSD, "Name", PREFIX_XSD); + static final QName TYPE_LITERAL_NCNAME = new QName(NS_SCHEMA_XSD, "NCName", PREFIX_XSD); + static final QName TYPE_LITERAL_NEGATIVEINTEGER = new QName(NS_SCHEMA_XSD, "negativeInteger", PREFIX_XSD); + static final QName TYPE_LITERAL_NMTOKEN = new QName(NS_SCHEMA_XSD, "NMTOKEN", PREFIX_XSD); + static final QName TYPE_LITERAL_NMTOKENS = new QName(NS_SCHEMA_XSD, "NMTOKENS", PREFIX_XSD); + static final QName TYPE_LITERAL_NONNEGATIVEINTEGER = new QName(NS_SCHEMA_XSD, "nonNegativeInteger", PREFIX_XSD); + static final QName TYPE_LITERAL_NONPOSITIVEINTEGER = new QName(NS_SCHEMA_XSD, "nonPositiveInteger", PREFIX_XSD); + static final QName TYPE_LITERAL_NORMALIZEDSTRING = new QName(NS_SCHEMA_XSD, "normalizedString", PREFIX_XSD); + static final QName TYPE_LITERAL_POSITIVEINTEGER = new QName(NS_SCHEMA_XSD, "positiveInteger", PREFIX_XSD); + static final QName TYPE_LITERAL_QNAME = new QName(NS_SCHEMA_XSD, "QName", PREFIX_XSD); + static final QName TYPE_LITERAL_SHORT = new QName(NS_SCHEMA_XSD, "short", PREFIX_XSD); + static final QName TYPE_LITERAL_STRING = new QName(NS_SCHEMA_XSD, "string", PREFIX_XSD); + static final QName TYPE_LITERAL_TIME = new QName(NS_SCHEMA_XSD, "time", PREFIX_XSD); + static final QName TYPE_LITERAL_TOKEN = new QName(NS_SCHEMA_XSD, "token", PREFIX_XSD); + static final QName TYPE_LITERAL_UNSIGNEDBYTE = new QName(NS_SCHEMA_XSD, "unsignedByte", PREFIX_XSD); + static final QName TYPE_LITERAL_UNSIGNEDINT = new QName(NS_SCHEMA_XSD, "unsignedInt", PREFIX_XSD); + static final QName TYPE_LITERAL_UNSIGNEDLONG = new QName(NS_SCHEMA_XSD, "unsignedLong", PREFIX_XSD); + static final QName TYPE_LITERAL_UNSIGNEDSHORT = new QName(NS_SCHEMA_XSD, "unsignedShort", PREFIX_XSD); + + /** Standard SOAP-1.1 encoded XML types */ + static final QName TYPE_SOAP11_ANYSIMPLETYPE = new QName(URI_SOAP11_ENC, "anySimpleType", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_ANYTYPE = new QName(URI_SOAP11_ENC, "anyType", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_ANYURI = new QName(URI_SOAP11_ENC, "anyURI", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_BASE64 = new QName(URI_SOAP11_ENC, "base64", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_BASE64BINARY = new QName(URI_SOAP11_ENC, "base64Binary", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_BOOLEAN = new QName(URI_SOAP11_ENC, "boolean", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_BYTE = new QName(URI_SOAP11_ENC, "byte", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DATE = new QName(URI_SOAP11_ENC, "date", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DATETIME = new QName(URI_SOAP11_ENC, "dateTime", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DECIMAL = new QName(URI_SOAP11_ENC, "decimal", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DOUBLE = new QName(URI_SOAP11_ENC, "double", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DURATION = new QName(URI_SOAP11_ENC, "duration", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_FLOAT = new QName(URI_SOAP11_ENC, "float", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GDAY = new QName(URI_SOAP11_ENC, "gDay", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GMONTH = new QName(URI_SOAP11_ENC, "gMonth", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GMONTHDAY = new QName(URI_SOAP11_ENC, "gMonthDay", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GYEAR = new QName(URI_SOAP11_ENC, "gYear", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GYEARMONTH = new QName(URI_SOAP11_ENC, "gYearMonth", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_HEXBINARY = new QName(URI_SOAP11_ENC, "hexBinary", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_ID = new QName(URI_SOAP11_ENC, "ID", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_INT = new QName(URI_SOAP11_ENC, "int", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_INTEGER = new QName(URI_SOAP11_ENC, "integer", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_LANGUAGE = new QName(URI_SOAP11_ENC, "language", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_LONG = new QName(URI_SOAP11_ENC, "long", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NAME = new QName(URI_SOAP11_ENC, "Name", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NCNAME = new QName(URI_SOAP11_ENC, "NCName", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NEGATIVEINTEGER = new QName(URI_SOAP11_ENC, "negativeInteger", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NMTOKEN = new QName(URI_SOAP11_ENC, "NMTOKEN", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NMTOKENS = new QName(URI_SOAP11_ENC, "NMTOKENS", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NONNEGATIVEINTEGER = new QName(URI_SOAP11_ENC, "nonNegativeInteger", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NONPOSITIVEINTEGER = new QName(URI_SOAP11_ENC, "nonPositiveInteger", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NORMALIZEDSTRING = new QName(URI_SOAP11_ENC, "normalizedString", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_POSITIVEINTEGER = new QName(URI_SOAP11_ENC, "positiveInteger", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_QNAME = new QName(URI_SOAP11_ENC, "QName", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_SHORT = new QName(URI_SOAP11_ENC, "short", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_STRING = new QName(URI_SOAP11_ENC, "string", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_TIME = new QName(URI_SOAP11_ENC, "time", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_TOKEN = new QName(URI_SOAP11_ENC, "token", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_UNSIGNEDBYTE = new QName(URI_SOAP11_ENC, "unsignedByte", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_UNSIGNEDINT = new QName(URI_SOAP11_ENC, "unsignedInt", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_UNSIGNEDLONG = new QName(URI_SOAP11_ENC, "unsignedLong", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_UNSIGNEDSHORT = new QName(URI_SOAP11_ENC, "unsignedShort", PREFIX_SOAP11_ENC); + + /** Encoded mime type namespace for internall and DII use */ + static final String NS_ATTACHMENT_MIME_TYPE = "http://www.jboss.org/jbossws/attachment/mimetype"; + + /** Attachment Types */ + static final QName TYPE_MIME_APPLICATION_XML = new QName(NS_ATTACHMENT_MIME_TYPE, "application_xml"); + static final QName TYPE_MIME_IMAGE_JPEG = new QName(NS_ATTACHMENT_MIME_TYPE, "image_jpeg"); + static final QName TYPE_MIME_IMAGE_GIF = new QName(NS_ATTACHMENT_MIME_TYPE, "image_gif"); + static final QName TYPE_MIME_MULTIPART_MIXED = new QName(NS_ATTACHMENT_MIME_TYPE, "multipart_mixed"); + static final QName TYPE_MIME_TEXT_PLAIN = new QName(NS_ATTACHMENT_MIME_TYPE, "text_plain"); + static final QName TYPE_MIME_TEXT_XML = new QName(NS_ATTACHMENT_MIME_TYPE, "text_xml"); + + static final QName TYPE_XMIME_DEFAULT = new QName(NS_XML_MIME, "base64Binary"); + + /** For out of bound transport (i.e. in headers); http://www.w3.org/2004/08/wsdl/feature/AD/data */ + static final String WSDL_PROPERTY_APPLICATION_DATA = "http://www.w3.org/2004/08/wsdl/feature/AD/data"; + /** The key to the original message part name */ + static final String WSDL_PROPERTY_MESSAGE_NAME = "http://www.jboss.org/jbossws/messagename"; + /** Key to the inbound message name */ + static final String WSDL_PROPERTY_MESSAGE_NAME_IN = "http://www.jboss.org/jbossws/messagename/in"; + /** Key to the outbound message name */ + static final String WSDL_PROPERTY_MESSAGE_NAME_OUT = "http://www.jboss.org/jbossws/messagename/out"; + /** Key to the inboudn wsa action */ + static final String WSDL_PROPERTY_ACTION_IN = "http://www.jboss.org/jbossws/wsa/actionIn"; + /** Key to the outbound wsa action */ + static final String WSDL_PROPERTY_ACTION_OUT = "http://www.jboss.org/jbossws/wsa/actionOut"; + + static final String WSDL_PROPERTY_EVENTSOURCE = "http://www.jboss.org/jbossws/wse/isEventSource"; + + static final String WSDL_ELEMENT_POLICY = "http://www.jboss.org/jbossws/wsp/policy"; + static final String WSDL_PROPERTY_POLICYURIS = "http://www.jboss.org/jbossws/wsp/policyURIs"; + static final String WSDL_ELEMENT_POLICYREFERENCE = "http://www.jboss.org/jbossws/wsp/policyReference"; + + /** The key to the original message part name */ + static final String WSDL_PROPERTY_PART_NAME = "http://www.jboss.org/jbossws/partname"; + /** The key to the message part type in case a part does not reference an element; http://www.jboss.org/jbossws/part/xmltype */ + static final String WSDL_PROPERTY_PART_XMLTYPE = "http://www.jboss.org/jbossws/part/xmltype"; + /** Used as WSDL 2.0 property string to provide support for WSDL 1.1 mime types */ + static final String WSDL_PROPERTY_WSDL11_MIME_TYPE = NS_ATTACHMENT_MIME_TYPE; + /** Indicate that the operation has zero arguments */ + static final String WSDL_PROPERTY_ZERO_ARGS = "http://www.jboss.org/jbossws/zero-args"; + /** Indicate that the operation has a void return*/ + static final String WSDL_PROPERTY_VOID_RETURN = "http://www.jboss.org/jbossws/void-return"; + /** Indicates that an output is a return parameter */ + static final String WSDL_PROPERTY_RETURN_PART = "http://www.jboss.org/jbossws/return-part"; + + static final QName WSDL_ATTRIBUTE_WSA_ACTION = new QName(URI_WS_ADDRESSING, "Action"); + + static final QName WSDL_ATTRIBUTE_WSE_EVENTSOURCE = new QName(URI_WS_EVENTING, "EventSource"); + + static final QName WSDL_ATTRIBUTE_WSP_POLICYURIS = new QName(URI_WS_POLICY, "PolicyURIs"); + static final QName WSDL_ELEMENT_WSP_POLICYREFERENCE = new QName(URI_WS_POLICY, "PolicyReference"); + static final QName WSDL_ELEMENT_JAXWS_BINDINGS = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "bindings"); + static final QName WSDL_ELEMENT_JAXWS_CLASS = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "class"); + static final QName WSDL_ELEMENT_JAXWS_METHOD = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "method"); + static final QName WSDL_ELEMENT_JAXWS_JAVADOC = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "javadoc"); + + /** WSDL-2.0 exchange patterns */ + static final String WSDL20_PATTERN_IN_ONLY = "http://www.w3.org/2004/08/wsdl/in-only"; + static final String WSDL20_PATTERN_ROUST_IN_ONLY = "http://www.w3.org/2004/08/wsdl/robust-in-only"; + static final String WSDL20_PATTERN_IN_OUT = "http://www.w3.org/2004/08/wsdl/in-out"; + static final String WSDL20_PATTERN_IN_OPTIONAL_OUT = "http://www.w3.org/2004/08/wsdl/in-opt-out"; + static final String WSDL20_PATTERN_OUT_ONLY = "http://www.w3.org/2004/08/wsdl/out-only"; + static final String WSDL20_PATTERN_ROBUST_OUT_ONLY = "http://www.w3.org/2004/08/wsdl/robust-out-only"; + static final String WSDL20_PATTERN_OUT_IN = "http://www.w3.org/2004/08/wsdl/out-in"; + static final String WSDL20_PATTERN_OUT_OPT_IN = "http://www.w3.org/2004/08/wsdl/out-opt-in"; + + static final String ASYNC_METHOD_SUFFIX = "Async"; + + static final String EAGER_INITIALIZE_JAXB_CONTEXT_CACHE = "org.jboss.ws.eagerInitializeJAXBContextCache"; + + static final String DOM_CONTENT_CANONICAL_NORMALIZATION = "org.jboss.ws.DOMContentCanonicalNormalization"; +} Added: common/trunk/src/main/java/org/jboss/ws/WSException.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/WSException.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/WSException.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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; + +/** + * A RuntimeException that should be thrown when a cause is needed + * + * The retrotranslator-0.9.5 cannot handle + * + * new IllegalStateException(String, Throwable) + * + * @author Thomas.Diesler(a)jboss.org + * @since 06-Jan-2006 + */ +public class WSException extends RuntimeException +{ + public WSException() + { + } + + public WSException(String message) + { + super(message); + } + + public WSException(String message, Throwable cause) + { + super(message, cause); + } + + public WSException(Throwable cause) + { + super(cause); + } + + public static void rethrow(String string, Throwable th) + { + if (th instanceof WSException) + throw (WSException)th; + + throw new WSException(string, th); + } + + public static void rethrow(Throwable th) + { + if (th instanceof WSException) + throw (WSException)th; + + throw new WSException(th); + } +} Added: common/trunk/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.core; + +import javax.xml.namespace.QName; + +/** + * The SOAPFaultException exception represents a SOAP fault. + * + * @author Thomas.Diesler(a)jboss.org + */ +public class CommonSOAPFaultException extends RuntimeException +{ + private QName faultCode; + private String faultString; + + public CommonSOAPFaultException(QName faultCode, String faultString) + { + super(faultString); + + this.faultCode = faultCode; + this.faultString = faultString; + } + + public QName getFaultCode() + { + return faultCode; + } + + public String getFaultString() + { + return faultString; + } +} Added: common/trunk/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,146 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.core.utils; + +import java.lang.reflect.Array; + +/** + * Collected methods which allow easy implementation of <code>hashCode</code>. + * + * Example use case: + * <pre> + * public int hashCode(){ + * int result = HashCodeUtil.SEED; + * //collect the contributions of various fields + * result = HashCodeUtil.hash(result, fPrimitive); + * result = HashCodeUtil.hash(result, fObject); + * result = HashCodeUtil.hash(result, fArray); + * return result; + * } + * </pre> + */ +public final class HashCodeUtil +{ + + /** + * An initial value for a <code>hashCode</code>, to which is added contributions + * from fields. Using a non-zero value decreases collisons of <code>hashCode</code> + * values. + */ + public static final int SEED = 23; + + /** + * booleans. + */ + public static int hash(int aSeed, boolean aBoolean) + { + return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (aBoolean ? 1 : 0); + } + + /** + * chars. + */ + public static int hash(int aSeed, char aChar) + { + return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (int)aChar; + } + + /** + * ints. + */ + public static int hash(int aSeed, int aInt) + { + /* + * Implementation Note + * Note that byte and short are handled by this method, through + * implicit conversion. + */ + return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + aInt; + } + + /** + * longs. + */ + public static int hash(int aSeed, long aLong) + { + return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32)); + } + + /** + * floats. + */ + public static int hash(int aSeed, float aFloat) + { + return org.jboss.ws.core.utils.HashCodeUtil.hash(aSeed, Float.floatToIntBits(aFloat)); + } + + /** + * doubles. + */ + public static int hash(int aSeed, double aDouble) + { + return org.jboss.ws.core.utils.HashCodeUtil.hash(aSeed, Double.doubleToLongBits(aDouble)); + } + + /** + * <code>aObject</code> is a possibly-null object field, and possibly an array. + * + * If <code>aObject</code> is an array, then each element may be a primitive + * or a possibly-null object. + */ + public static int hash(int aSeed, Object aObject) + { + int result = aSeed; + if (aObject == null) + { + result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, 0); + } + else if (!org.jboss.ws.core.utils.HashCodeUtil.isArray(aObject)) + { + result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, aObject.hashCode()); + } + else + { + int length = Array.getLength(aObject); + for (int idx = 0; idx < length; ++idx) + { + Object item = Array.get(aObject, idx); + //recursive call! + result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, item); + } + } + return result; + } + + /// PRIVATE /// + private static final int fODD_PRIME_NUMBER = 37; + + private static int firstTerm(int aSeed) + { + return org.jboss.ws.core.utils.HashCodeUtil.fODD_PRIME_NUMBER * aSeed; + } + + private static boolean isArray(Object aObject) + { + return aObject.getClass().isArray(); + } +} Added: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,122 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.core.utils; + +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.logging.Logger; +import org.jboss.util.xml.JBossEntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * Dynamically register the JBossWS entities. + * + * @author Thomas.Diesler(a)jboss.org + * @since 02-Aug-2006 + */ +public class JBossWSEntityResolver extends JBossEntityResolver +{ + // provide logging + private static final Logger log = Logger.getLogger(JBossWSEntityResolver.class); + + public JBossWSEntityResolver() + { + registerEntity("urn:jboss:jaxrpc-config:2.0", "schema/jaxrpc-config_2_0.xsd"); + registerEntity("urn:jboss:jaxws-config:2.0", "schema/jaxws-config_2_0.xsd"); + registerEntity("http://java.sun.com/xml/ns/javaee", "schema/javaee_web_services_1_2.xsd"); + registerEntity("http://www.w3.org/2005/08/addressing", "schema/ws-addr.xsd"); + registerEntity("http://schemas.xmlsoap.org/ws/2004/08/eventing", "eventing.xsd"); + registerEntity("http://www.w3.org/2002/06/soap-encoding", "soap-encoding_200206.xsd"); + registerEntity("http://schemas.xmlsoap.org/soap/encoding/", "soap-encoding_1_1.xsd"); + registerEntity("http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd", "j2ee_web_services_client_1_1.xsd"); + registerEntity("http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd", "j2ee_web_services_1_1.xsd"); + registerEntity("http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd", "j2ee_jaxrpc_mapping_1_1.xsd"); + registerEntity("http://ws-i.org/profiles/basic/1.1/swaref.xsd", "schema/swaref.xsd"); + } + + public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException + { + if(log.isDebugEnabled()) log.debug("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]"); + InputSource inputSource = super.resolveEntity(publicId, systemId); + + if (inputSource == null) + inputSource = resolveSystemIDAsURL(systemId, log.isTraceEnabled()); + + if (inputSource == null) + log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); + + return inputSource; + } + + /** Use a ResourceURL to access the resource. + * This method should be protected in the super class. */ + protected InputSource resolveSystemIDAsURL(String id, boolean trace) + { + if (id == null) + return null; + + if (trace) + log.trace("resolveIDAsResourceURL, id=" + id); + + InputSource inputSource = null; + + // Try to use the systemId as a URL to the schema + try + { + if (trace) + log.trace("Trying to resolve id as a URL"); + + URL url = new URL(id); + if (url.getProtocol().equalsIgnoreCase("file") == false) + log.warn("Trying to resolve id as a non-file URL: " + id); + + InputStream ins = new ResourceURL(url).openStream(); + if (ins != null) + { + inputSource = new InputSource(ins); + inputSource.setSystemId(id); + } + else + { + log.warn("Cannot load id as URL: " + id); + } + + if (trace) + log.trace("Resolved id as a URL"); + } + catch (MalformedURLException ignored) + { + if (trace) + log.trace("id is not a url: " + id, ignored); + } + catch (IOException e) + { + if (trace) + log.trace("Failed to obtain URL.InputStream from id: " + id, e); + } + return inputSource; + } +} Added: common/trunk/src/main/java/org/jboss/ws/core/utils/JarUrlConnection.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/core/utils/JarUrlConnection.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/core/utils/JarUrlConnection.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,276 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.core.utils; + +import java.io.IOException; +import java.io.InputStream; +import java.net.JarURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.JarInputStream; + +/** <code>URLConnection</code> capable of handling multiply-nested jars. + * + * @author <a href="mailto:bob@eng.werken.com">bob mcwhirter</a> + */ +public class JarUrlConnection extends JarURLConnection +{ + // ---------------------------------------------------------------------- + // Instance members + // ---------------------------------------------------------------------- + + /** Base resource. */ + private URL baseResource; + + /** Additional nested segments. */ + private String[] segments; + + /** Terminal input-stream. */ + private InputStream in; + + // ---------------------------------------------------------------------- + // Constructors + // ---------------------------------------------------------------------- + + /** Construct. + * + * @param url Target URL of the connections. + * + * @throws java.io.IOException If an error occurs while attempting to initialize + * the connection. + */ + public JarUrlConnection(URL url) throws IOException + { + super(url = normaliseURL(url)); + + String baseText = url.getPath(); + + int bangLoc = baseText.indexOf("!"); + + String baseResourceText = baseText.substring(0, bangLoc); + + String extraText = ""; + + if (bangLoc <= (baseText.length() - 2) && baseText.charAt(bangLoc + 1) == '/') + { + if (bangLoc + 2 == baseText.length()) + { + extraText = ""; + } + else + { + extraText = baseText.substring(bangLoc + 1); + } + } + else + { + throw new MalformedURLException("No !/ in url: " + url.toExternalForm()); + } + + List segments = new ArrayList(); + + StringTokenizer tokens = new StringTokenizer(extraText, "!"); + + while (tokens.hasMoreTokens()) + { + segments.add(tokens.nextToken()); + } + + this.segments = (String[])segments.toArray(new String[segments.size()]); + + this.baseResource = new URL(baseResourceText); + } + + protected static URL normaliseURL(URL url) throws MalformedURLException + { + String text = normalizeUrlPath(url.toString()); + + if (!text.startsWith("jar:")) + { + text = "jar:" + text; + } + + if (text.indexOf('!') < 0) + { + text = text + "!/"; + } + + return new URL(text); + } + + // ---------------------------------------------------------------------- + // Instance methods + // ---------------------------------------------------------------------- + + /** Retrieve the nesting path segments. + * + * @return The segments. + */ + protected String[] getSegments() + { + return this.segments; + } + + /** Retrieve the base resource <code>URL</code>. + * + * @return The base resource url. + */ + protected URL getBaseResource() + { + return this.baseResource; + } + + /** @see java.net.URLConnection + */ + public void connect() throws IOException + { + if (this.segments.length == 0) + { + setupBaseResourceInputStream(); + } + else + { + setupPathedInputStream(); + } + } + + /** Setup the <code>InputStream</code> purely from the base resource. + * + * @throws java.io.IOException If an I/O error occurs. + */ + protected void setupBaseResourceInputStream() throws IOException + { + this.in = getBaseResource().openStream(); + } + + /** Setup the <code>InputStream</code> for URL with nested segments. + * + * @throws java.io.IOException If an I/O error occurs. + */ + protected void setupPathedInputStream() throws IOException + { + InputStream curIn = getBaseResource().openStream(); + + for (int i = 0; i < this.segments.length; ++i) + { + curIn = getSegmentInputStream(curIn, segments[i]); + } + + this.in = curIn; + } + + /** Retrieve the <code>InputStream</code> for the nesting + * segment relative to a base <code>InputStream</code>. + * + * @param baseIn The base input-stream. + * @param segment The nesting segment path. + * + * @return The input-stream to the segment. + * + * @throws java.io.IOException If an I/O error occurs. + */ + protected InputStream getSegmentInputStream(InputStream baseIn, String segment) throws IOException + { + JarInputStream jarIn = new JarInputStream(baseIn); + JarEntry entry = null; + + while (jarIn.available() != 0) + { + entry = jarIn.getNextJarEntry(); + + if (entry == null) + { + break; + } + + if (("/" + entry.getName()).equals(segment)) + { + return jarIn; + } + } + + throw new IOException("unable to locate segment: " + segment); + } + + /** @see java.net.URLConnection + */ + public InputStream getInputStream() throws IOException + { + if (this.in == null) + { + connect(); + } + return this.in; + } + + /** + * @return JarFile + * @throws java.io.IOException + * @see java.net.JarURLConnection#getJarFile() + */ + public JarFile getJarFile() throws IOException + { + String url = baseResource.toExternalForm(); + + if (url.startsWith("file:/")) + { + url = url.substring(6); + } + + return new JarFile(URLDecoder.decode(url, "UTF-8")); + } + + private static String normalizeUrlPath(String name) + { + if (name.startsWith("/")) + { + name = name.substring(1); + + System.out.println("1 name = " + name); + } + + // Looking for org/codehaus/werkflow/personality/basic/../common/core-idioms.xml + // | i | + // +-------+ remove + // + int i = name.indexOf("/.."); + + // Can't be at the beginning because we have no root to refer to so + // we start at 1. + if (i > 0) + { + int j = name.lastIndexOf("/", i - 1); + + name = name.substring(0, j) + name.substring(i + 3); + + System.out.println("2 name = " + name); + } + + return name; + } +} Added: common/trunk/src/main/java/org/jboss/ws/core/utils/MimeUtils.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/core/utils/MimeUtils.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,351 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.core.utils; + +import java.awt.image.BufferedImage; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.mail.internet.ContentType; +import javax.mail.internet.MimeMultipart; +import javax.mail.internet.ParseException; +import javax.xml.namespace.QName; +import javax.xml.transform.stream.StreamSource; + +import org.jboss.ws.Constants; +import org.jboss.ws.WSException; +import org.jboss.wsf.common.IOUtils; +import org.jboss.wsf.common.JavaUtils; + +import com.sun.image.codec.jpeg.JPEGCodec; +import com.sun.image.codec.jpeg.JPEGImageDecoder; +import com.sun.image.codec.jpeg.JPEGImageEncoder; + +/** + * Generic mime utility class. + * + * @author <a href="mailto:jason@stacksmash.com">Jason T. Greene</a> + */ +public class MimeUtils +{ + + private static Map<String, Class> mime2class = new HashMap<String, Class>(); + private static Map<Class, String> class2mime = new HashMap<Class, String>(); + + static { + mime2class.put("text/plain", java.lang.String.class); + mime2class.put("image/jpeg", java.awt.Image.class); + mime2class.put("text/xml", javax.xml.transform.Source.class); + mime2class.put("application/xml", javax.xml.transform.Source.class); + mime2class.put("application/octet-stream", javax.activation.DataHandler.class); + + class2mime.put(java.awt.Image.class, "image/jpeg"); + class2mime.put(javax.xml.transform.Source.class, "text/xml"); + class2mime.put(java.lang.String.class, "text/plain"); + } + + /** + * Converts a MIME type into a proprietary JBossWS attachment xml type. + * + * @param mimeType the MIME type string to convert + * @return the xml type that this mime type corresponds to + */ + public static QName convertMimeTypeToXmlType(String mimeType) + { + StringBuilder mimeName = new StringBuilder(mimeType); + + int pos = mimeName.indexOf("/"); + + if (pos == -1) + return null; + + mimeName.setCharAt(pos, '_'); + + return new QName(Constants.NS_ATTACHMENT_MIME_TYPE, mimeName.toString()); + } + + /** + * Gets the base portion of a MIME type string. This basically just strips + * off any type parameter elements. + * + * @param mimeType any MIME type string + * @return a reduced MIME string containing no type parameters + */ + public static String getBaseMimeType(String mimeType) + { + ContentType contentType; + + if (mimeType == null) + return null; + try + { + contentType = new ContentType(mimeType); + } + catch (ParseException e) + { + return null; + } + + return contentType.getBaseType(); + } + + /** + * Checks if there is a matching mime pattern for mimeType in mimeTypes. This + * will return true if there is an exact match (for example text/plain = + * text/plain), or if there is a wildcard subtype match (text/plain = + * text/*). + * + * @param mimeType the mime type to search for + * @param mimeTypes the set of mime types to search + * @return true if there is a match, false if not + */ + public static boolean isMemberOf(String mimeType, Set mimeTypes) + { + if (mimeTypes.contains(mimeType)) + return true; + + try + { + if (mimeTypes.contains(new ContentType(mimeType).getPrimaryType() + "/*")) + return true; + } + catch (ParseException e) + { + // eat + } + + return false; + } + + /** + * Resolve the class for a mype type. + * Defaults to <code>DataHandler</code> if no mapping could be found. + */ + public static Class resolveClass(String mimeType) { + Class cl = mime2class.get(mimeType); + if(null==cl) + cl = javax.activation.DataHandler.class; + return cl; + } + + /** + * Resolve the mime type for an object. + * Default to <code>application/octet-stream</code> + * if no mapping could be found. + */ + public static String resolveMimeType(Object obj) { + String mimeType = (obj instanceof MimeMultipart) ? + ((MimeMultipart)obj).getContentType() : + resolveMimeType(obj.getClass()); + return mimeType; + } + + public static String resolveMimeType(Class clazz) { + String mimeType = "application/octet-stream"; + for(Class cl : class2mime.keySet()) + { + if(JavaUtils.isAssignableFrom(cl, clazz)) + mimeType = class2mime.get(cl); + } + return mimeType; + } + + public static ByteArrayConverter getConverterForJavaType(Class targetClazz) + { + ByteArrayConverter converter = null; + if(JavaUtils.isAssignableFrom(java.awt.Image.class, targetClazz)) + converter = new ImageConverter(); + else if (JavaUtils.isAssignableFrom(javax.xml.transform.Source.class, targetClazz)) + converter = new SourceConverter(); + else if (JavaUtils.isAssignableFrom(java.lang.String.class, targetClazz)) + converter = new StringConverter(); + else if (JavaUtils.isAssignableFrom(java.io.InputStream.class, targetClazz)) + converter = new StreamConverter(); + + if(null == converter) + throw new WSException("No ByteArrayConverter for class: " + targetClazz.getName()); + + return converter; + } + + public static ByteArrayConverter getConverterForContentType(String contentType) + { + ByteArrayConverter converter = null; + + if(contentType != null) + { + if("image/jpeg".equals(contentType) || "image/jpg".equals(contentType)) + converter = new ImageConverter(); + else if("text/xml".equals(contentType) || "application/xml".equals(contentType)) + converter = new SourceConverter(); + else if("text/plain".equals(contentType)) + converter = new StringConverter(); + else if("application/octet-stream".equals(contentType)) + converter = new StreamConverter(); + } + + if(null == converter) + throw new WSException("No ByteArrayConverter for content type: " + contentType); + + return converter; + } + public static class ImageConverter implements ByteArrayConverter + { + public Object readFrom(InputStream in) { + Object converted = null; + try + { + JPEGImageDecoder dec = JPEGCodec.createJPEGDecoder(in); + BufferedImage bim = dec.decodeAsBufferedImage(); + converted = bim; + } + catch (Exception e) + { + // ignore + } + + return converted; + } + + public void writeTo(Object obj, OutputStream out) { + if(obj instanceof BufferedImage) + { + JPEGImageEncoder enc = JPEGCodec.createJPEGEncoder(out); + try + { + enc.encode((BufferedImage)obj); + } + catch (IOException e) + { + throw new WSException("Failed to convert " + obj.getClass()); + } + } + else + { + throw new WSException("Unable to convert " + obj.getClass()); + } + + } + + } + + public static class SourceConverter implements ByteArrayConverter + { + public Object readFrom(InputStream in) { + return new StreamSource(in); + } + + public void writeTo(Object obj, OutputStream out) { + if(obj instanceof StreamSource) + { + StreamSource s = (StreamSource)obj; + try + { + IOUtils.copyStream(out, s.getInputStream()); + } + catch (IOException e) + { + throw new WSException("Failed to convert " + obj.getClass()); + } + } + else + { + throw new WSException("Unable to convert " + obj.getClass()); + } + } + } + + public static class StringConverter implements ByteArrayConverter + { + public Object readFrom(InputStream in) { + Object converted = null; + try + { + StringBuilder out = new StringBuilder(); + byte[] b = new byte[4096]; + for (int n; (n = in.read(b)) != -1;) { + out.append(new String(b, 0, n)); + } + converted = out.toString(); + } + catch (IOException e) + { + throw new WSException("Failed to convert java.lang.String"); + } + + return converted; + } + + public void writeTo(Object obj, OutputStream out) { + if(obj instanceof String) + { + String s = (String)obj; + try + { + out.write(s.getBytes("UTF-8")); + } + catch (IOException e) + { + throw new WSException("Failed to convert " + obj.getClass()); + } + } + else + { + throw new WSException("Unable to convert " + obj.getClass()); + } + } + } + + public static class StreamConverter implements ByteArrayConverter + { + public Object readFrom(InputStream in) { + return in; + } + + public void writeTo(Object obj, OutputStream out) { + if(obj instanceof InputStream) + { + try + { + IOUtils.copyStream(out, (InputStream)obj); + } + catch (IOException e) + { + throw new WSException("Failed to convert " + obj.getClass()); + } + } + } + } + public interface ByteArrayConverter + { + Object readFrom(InputStream in); + void writeTo(Object obj, OutputStream out); + } + + +} Added: common/trunk/src/main/java/org/jboss/ws/core/utils/ResourceURL.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/core/utils/ResourceURL.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/core/utils/ResourceURL.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.core.utils; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +/** + * A wrapper around an URL that can handle input streams for resources in nested jars. + * + * The jdk-1.5.0_10 cannot handle this type of URL + * + * jar:file://somepath/jaxws-eardeployment.ear!/jaxws-eardeployment.war!/WEB-INF/wsdl/TestEndpoint.wsdl + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2006 (Dosi's birthday) + */ +public class ResourceURL +{ + private URL targetURL; + + public ResourceURL(URL targetURL) + { + this.targetURL = targetURL; + } + + public URL getTargetURL() + { + return targetURL; + } + + public InputStream openStream() throws IOException + { + boolean isJarUrl = "jar".equals(targetURL.getProtocol()); + return isJarUrl ? new JarUrlConnection(targetURL).getInputStream() : targetURL.openStream(); + } + + public int hashCode() + { + return toString().hashCode(); + } + + public boolean equals(Object obj) + { + if (!(obj instanceof ResourceURL)) return false; + ResourceURL other = (ResourceURL)obj; + return toString().equals(other.toString()); + } + + public String toString() + { + return targetURL.toString(); + } +} Added: common/trunk/src/main/java/org/jboss/ws/core/utils/XMLPredefinedEntityReferenceResolver.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/core/utils/XMLPredefinedEntityReferenceResolver.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/core/utils/XMLPredefinedEntityReferenceResolver.java 2008-11-07 11:21:50 UTC (rev 8669) @@ -0,0 +1,122 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.core.utils; + +import java.util.HashMap; + +/** + * Utility class for resolving predefined XML entity and character references. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +public class XMLPredefinedEntityReferenceResolver +{ + private static HashMap<String, Character> entities = new HashMap<String, Character>(); + + static + { + entities.put("quot", '"'); + entities.put("amp", '&'); + entities.put("lt", '<'); + entities.put("gt", '>'); + entities.put("apos", '\''); + } + + private static int resolveCharRef(String source, int pos, StringBuilder builder) + { + int radix = 10; + if (source.charAt(pos += 2) == 'x') + { + pos++; + radix = 16; + } + + int end = source.indexOf(';', pos); + if (end == -1) + throw new IllegalArgumentException("Invalid character reference"); + + int c = Integer.parseInt(source.substring(pos, end), radix); + builder.append((char) c); + + return end + 1; + } + + private static int resolveEntityRef(String source, int pos, StringBuilder builder) + { + int end = source.indexOf(';', ++pos); + if (end == -1) + throw new IllegalArgumentException("Invalid entity reference"); + + String entity = source.substring(pos, end); + Character c = entities.get(entity); + if (c == null) + throw new IllegalArgumentException("Invalid entity: " + entity); + + builder.append(c.charValue()); + + return end + 1; + } + + /** + * Transforms an XML normalized string by resolving all predefined character and entity references + * + * @param normalized an XML normalized string + * @return a standard java string that is no longer XML normalized + */ + public static String resolve(String normalized) + { + StringBuilder builder = new StringBuilder(); + int end = normalized.length(); + int pos = normalized.indexOf('&'); + int last = 0; + + // No references + if (pos == -1) + return normalized; + + while (pos != -1) + { + String sub = normalized.subSequence(last, pos).toString(); + builder.append(sub); + + int peek = pos + 1; + if (peek == end) + throw new IllegalArgumentException("Invalid entity reference"); + + if (normalized.charAt(peek) == '#') + pos = resolveCharRef(normalized, pos, builder); + else + pos = resolveEntityRef(normalized, pos, builder); + + last = pos; + pos = normalized.indexOf('&', pos); + } + + if (last < end) + { + String sub = normalized.subSequence(last, end).toString(); + builder.append(sub); + } + + return builder.toString(); + } +}

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8668 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-07 05:35:25 -0500 (Fri, 07 Nov 2008) New Revision: 8668 Removed: stack/native/branches/ropalka-jbws2318/ Log: [JBWS-2318] will do it in trunk

16 years, 1 month

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-07 03:34:41 -0500 (Fri, 07 Nov 2008) New Revision: 8667 Modified: stack/metro/trunk/src/main/distro/build-deploy.xml Log: [JBWS-2383] Fixing error Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-11-06 15:54:33 UTC (rev 8666) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-11-07 08:34:41 UTC (rev 8667) @@ -104,7 +104,7 @@ <target name="deploy-structure-jboss500" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-metro50" inheritall="false"> + <antcall target="deploy-jbossws-metro500" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8666 - in stack/cxf/trunk: modules/resources/src/main/resources/resources and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-06 10:54:33 -0500 (Thu, 06 Nov 2008) New Revision: 8666 Added: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build-setup.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2383] Fixing deploy/undeploy macros to use common server lib on AS5 trunk Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-11-06 15:19:44 UTC (rev 8665) +++ stack/cxf/trunk/build.xml 2008-11-06 15:54:33 UTC (rev 8666) @@ -30,6 +30,7 @@ <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/> + <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/>  Added: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-06 15:54:33 UTC (rev 8666) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/lib/jboss-jaxrpc.jar server/lib/jboss-jaxws-ext.jar server/lib/jboss-jaxws.jar server/lib/jboss-saaj.jar server/lib/jbossws-native-jaxrpc.jar server/lib/jbossws-native-jaxws-ext.jar server/lib/jbossws-native! -jaxws.jar server/lib/jbossws-native-saaj.jar server/lib/jbossws-common.jar server/lib/jbossws-framework.jar server/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-06 15:19:44 UTC (rev 8665) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-06 15:54:33 UTC (rev 8666) @@ -339,7 +339,7 @@ <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> - <target name="deploy-jbossws-cxf50" depends="check-parameters,deploy-jbossws-endorsed"> + <target name="deploy-jbossws-cxf500" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> @@ -348,6 +348,15 @@ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> + <target name="deploy-jbossws-cxf501" depends="check-parameters,deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + </target> + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-11-06 15:19:44 UTC (rev 8665) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-11-06 15:54:33 UTC (rev 8666) @@ -477,7 +477,7 @@  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/server/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-11-06 15:19:44 UTC (rev 8665) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-11-06 15:54:33 UTC (rev 8666) @@ -96,9 +96,9 @@   - <target name="deploy-structure-jboss50" depends="prepare-deploy"> + <target name="deploy-structure-jboss500" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf50" inheritall="false"> + <antcall target="deploy-jbossws-cxf500" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> @@ -107,6 +107,17 @@ <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> + <target name="deploy-structure-jboss501" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-cxf501" inheritall="false"> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> + </target> +    @@ -116,7 +127,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <copy todir="${jboss500.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -138,7 +149,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss501" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -148,7 +159,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>  </target>  Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-11-06 15:19:44 UTC (rev 8665) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-11-06 15:54:33 UTC (rev 8666) @@ -49,7 +49,7 @@ <property name="jboss501.lib" value="${jboss501.home}/lib"/> <property name="jboss501.client" value="${jboss501.home}/client"/> <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.lib" value="${jboss501.home}/server/lib"/> <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2008-11-06 15:19:44 UTC (rev 8665) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-11-06 15:54:33 UTC (rev 8666) @@ -22,6 +22,7 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> + <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-11-06 15:19:44 UTC (rev 8665) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-11-06 15:54:33 UTC (rev 8666) @@ -39,6 +39,7 @@ <directory>modules/resources/src/main/resources/resources</directory> <outputDirectory>build</outputDirectory> <includes> + <include>jbossws-as5-default-deploy.conf</include> <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8665 - in stack/native/trunk: modules/resources/src/main/resources/resources and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-06 10:19:44 -0500 (Thu, 06 Nov 2008) New Revision: 8665 Added: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf Modified: stack/native/trunk/build.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/build-setup.xml stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2383] Fixing deploy/undeploy macros to use common server lib on AS5 trunk Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/build.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -26,6 +26,7 @@ <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/> + <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/>  Added: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-06 15:19:44 UTC (rev 8665) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/lib/jboss-jaxrpc.jar server/lib/jboss-jaxws-ext.jar server/lib/jboss-jaxws.jar server/lib/jboss-saaj.jar server/lib/jbossws-native-jaxrpc.jar server/lib/jbossws-native-jaxws-ext.jar server/lib/jbossws-native! -jaxws.jar server/lib/jbossws-native-saaj.jar server/lib/jbossws-common.jar server/lib/jbossws-framework.jar server/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -362,7 +362,7 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - <target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed"> + <target name="deploy-jbossws-native500" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> @@ -372,6 +372,16 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-native501" depends="check-parameters,deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  + <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + </target> + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -522,7 +522,7 @@  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/server/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -96,9 +96,9 @@   - <target name="deploy-structure-jboss50" depends="prepare-deploy"> + <target name="deploy-structure-jboss500" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native50" inheritall="false"> + <antcall target="deploy-jbossws-native500" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> @@ -107,6 +107,17 @@ <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> + <target name="deploy-structure-jboss501" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-native501" inheritall="false"> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> + </target> +    @@ -116,7 +127,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <copy todir="${jboss500.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -138,7 +149,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss501" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -148,7 +159,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>  </target>  Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/src/main/distro/build-setup.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -49,7 +49,7 @@ <property name="jboss501.lib" value="${jboss501.home}/lib"/> <property name="jboss501.client" value="${jboss501.home}/client"/> <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.lib" value="${jboss501.home}/server/lib"/>  <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/src/main/distro/build.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -22,6 +22,7 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> + <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -39,6 +39,7 @@ <directory>modules/resources/src/main/resources/resources</directory> <outputDirectory>build</outputDirectory> <includes> + <include>jbossws-as5-default-deploy.conf</include> <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8664 - in stack/metro/trunk: modules/resources/src/main/resources/resources and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-06 09:53:22 -0500 (Thu, 06 Nov 2008) New Revision: 8664 Added: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf Modified: stack/metro/trunk/build.xml stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/src/main/distro/build-deploy.xml stack/metro/trunk/src/main/distro/build-setup.xml stack/metro/trunk/src/main/distro/build.xml stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2383] Fixing deploy/undeploy macros to use common server lib on AS5 trunk Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-11-06 14:50:13 UTC (rev 8663) +++ stack/metro/trunk/build.xml 2008-11-06 14:53:22 UTC (rev 8664) @@ -30,6 +30,7 @@ <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/> + <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/>  Added: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf (rev 0) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-06 14:53:22 UTC (rev 8664) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/lib/jboss-jaxrpc.jar server/lib/jboss-jaxws-ext.jar server/lib/jboss-jaxws.jar server/lib/jboss-saaj.jar server/lib/jbossws-native-jaxrpc.jar server/lib/jbossws-native-jaxws-ext.jar server/lib/jbossws-native! -jaxws.jar server/lib/jbossws-native-saaj.jar server/lib/jbossws-common.jar server/lib/jbossws-framework.jar server/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-06 14:50:13 UTC (rev 8663) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-06 14:53:22 UTC (rev 8664) @@ -371,7 +371,7 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - <target name="deploy-jbossws-metro50" depends="check-parameters,deploy-jbossws-endorsed"> + <target name="deploy-jbossws-metro500" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> @@ -381,6 +381,16 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-metro501" depends="check-parameters,deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  + <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + </target> + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-11-06 14:50:13 UTC (rev 8663) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-11-06 14:53:22 UTC (rev 8664) @@ -538,7 +538,7 @@  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/server/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-11-06 14:50:13 UTC (rev 8663) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-11-06 14:53:22 UTC (rev 8664) @@ -102,7 +102,7 @@   - <target name="deploy-structure-jboss50" depends="prepare-deploy"> + <target name="deploy-structure-jboss500" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <antcall target="deploy-jbossws-metro50" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> @@ -112,6 +112,17 @@ </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> + + <target name="deploy-structure-jboss501" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-metro501" inheritall="false"> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> + </target>   @@ -124,7 +135,7 @@ <echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/> </target> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <copy todir="${jboss500.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -148,7 +159,7 @@ <echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/> </target> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss501" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -158,7 +169,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>  </target>  Modified: stack/metro/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-setup.xml 2008-11-06 14:50:13 UTC (rev 8663) +++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-11-06 14:53:22 UTC (rev 8664) @@ -48,7 +48,7 @@ <property name="jboss501.lib" value="${jboss501.home}/lib"/> <property name="jboss501.client" value="${jboss501.home}/client"/> <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.lib" value="${jboss501.home}/server/lib"/> <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> Modified: stack/metro/trunk/src/main/distro/build.xml =================================================================== --- stack/metro/trunk/src/main/distro/build.xml 2008-11-06 14:50:13 UTC (rev 8663) +++ stack/metro/trunk/src/main/distro/build.xml 2008-11-06 14:53:22 UTC (rev 8664) @@ -23,6 +23,7 @@ <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/>  Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-11-06 14:50:13 UTC (rev 8663) +++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-11-06 14:53:22 UTC (rev 8664) @@ -39,6 +39,7 @@ <directory>modules/resources/src/main/resources/resources</directory> <outputDirectory>build</outputDirectory> <includes> + <include>jbossws-as5-default-deploy.conf</include> <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8663 - framework/trunk/testsuite/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-06 09:50:13 -0500 (Thu, 06 Nov 2008) New Revision: 8663 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: [JBWS-2383] Fixing test classpath on AS5 trunk Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-11-06 14:29:19 UTC (rev 8662) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-11-06 14:50:13 UTC (rev 8663) @@ -86,7 +86,11 @@ <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> - <property name="jboss.server.lib" value="${jboss.server}/lib"/> + + <condition property="jboss.server.lib" value="${jboss.home}/server/lib" else="${jboss.server}/lib"> + <available file="${jboss.home}/server/lib"/> + </condition> +  <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> <property name="jboss.server.deployers" value="${jboss.server}/deployers"/>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8662 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-06 09:29:19 -0500 (Thu, 06 Nov 2008) New Revision: 8662 Added: stack/native/branches/ropalka-jbws2318/ Log: creating user branch Copied: stack/native/branches/ropalka-jbws2318 (from rev 8661, stack/native/trunk)

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8661 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src: main/java/org/jboss/ws/tools/config and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-06 08:07:40 -0500 (Thu, 06 Nov 2008) New Revision: 8661 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/BaseException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/Test.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/BaseException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/Test.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/WSDLToJava.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/XSDToJava.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml Log: [JBPAPP-1369] WSDLtoJava Namespace to package mapping does not support multiple namespaces. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -205,7 +205,7 @@ if (namespacePackageMap == null) namespacePackageMap = new HashMap<String, String>(); String pkg = iter.next(); - namespacePackageMap.put(map.get(pkg), pkg); + namespacePackageMap.put(pkg, map.get(pkg)); } } @@ -326,7 +326,6 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); QName faultXMLName = intfFault.getElement(); QName faultXMLType = intfFault.getXmlType(); - XSElementDeclaration xe = xsmodel.getElementDeclaration(faultXMLName.getLocalPart(), faultXMLName.getNamespaceURI()); XSTypeDefinition xt = xe.getTypeDefinition(); if (!xt.getAnonymous()) @@ -338,7 +337,8 @@ if (cl == null) { String faultTypeName = (!xt.getAnonymous()) ? faultXMLType.getLocalPart() : faultXMLName.getLocalPart(); - buf.append(seiPkgName + "." + JavaUtils.capitalize(faultTypeName)); + String packageName = getPackageName(xt.getNamespace()); + buf.append(packageName + "." + JavaUtils.capitalize(faultTypeName)); } else buf.append(cl.getName()); buf.append(","); @@ -534,7 +534,6 @@ if (unwrappedElement) { buf.append(tempBuf); - // We need a wrapper class generated generateJavaSource(wrapper, WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()), containingElement); @@ -639,11 +638,12 @@ className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); className = utils.firstLetterUpperCase(className); - className = seiPkgName + "." + className + arraySuffix; + String packageName = getPackageName(xt.getNamespace()); + className = packageName + "." + className + arraySuffix; if (holder) { - className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration()); + className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration(packageName)); } buf.append(className); @@ -762,7 +762,8 @@ className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); className = utils.firstLetterUpperCase(className); - return seiPkgName + "." + className + arraySuffix; + String packageName = getPackageName(xt.getNamespace()); + return packageName + "." + className + arraySuffix; } if (cls.isArray()) @@ -806,9 +807,9 @@ return paramName; } - private File getLocationForJavaGeneration() + private File getLocationForJavaGeneration(String packageName) { - return new File(this.directoryToGenerate + "/" + seiPkgName.replace(".", "/")); + return new File(this.directoryToGenerate + "/" + packageName.replace('.', '/')); } private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException @@ -818,10 +819,17 @@ private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement, boolean exception) throws IOException { - XSDTypeToJava xtj = new XSDTypeToJava(generateSerializableTypes); + XSDTypeToJava xtj = new XSDTypeToJava(namespacePackageMap, generateSerializableTypes); xtj.setTypeMapping(this.typeMapping); - xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, exception); + String targetNS = wsdl.getTargetNamespace(); + String tgtNS = xt.getNamespace(); + String packName = getPackageName(tgtNS); + if(!tgtNS.equals(targetNS)) + { + File dir = utils.createPackage(this.directoryToGenerate, packName); + } + xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, this.directoryToGenerate, packName, xsmodel, exception); } public void setParameterStyle(String paramStyle) @@ -829,4 +837,19 @@ this.parameterStyle = paramStyle; } + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + //return NamespacePackageMapping.getJavaPackageName(targetNamespace); + //Default behaviour will always generate all classes in the SEI package only + return seiPkgName; + } } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/XSDToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -55,7 +55,8 @@ /** * Utility class that converts a XSD Type into a Java class */ - protected XSDTypeToJava xsdJava = new XSDTypeToJava(false); + protected final XSDTypeToJava xsdJava = new XSDTypeToJava(null, false); + /* * @see org.jboss.ws.tools.interfaces.JavaToXSDIntf#generateSEI(java.lang.String, java.io.File, java.lang.String, boolean) @@ -66,9 +67,7 @@ { XSLoader xsloader = SchemaUtils.getInstance().getXSLoader(); XSModel xsmodel = xsloader.loadURI(schemaFile); - - if (createPackageDir) dirloc = utils.createPackage(dirloc.getAbsolutePath(), packageName); - generateJavaSource(xsmodel, dirloc, packageName); + generateJavaSource(xsmodel, dirloc, packageName, createPackageDir); } @@ -79,7 +78,10 @@ boolean createPackageDir) throws IOException { - if (createPackageDir) dirloc = utils.createPackage(dirloc.getAbsolutePath(), packageName); + if (createPackageDir) + { + utils.createPackage(dirloc.getAbsolutePath(), packageName); + } generateJavaSource(xsmodel, dirloc, packageName); } @@ -102,7 +104,7 @@ String nsuri = type.getNamespace(); String tname = type.getName(); if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue; - xsdJava.createJavaFile(ctype, dirloc, packageName, xsmodel); + xsdJava.createJavaFile(ctype, dirloc.getPath(), packageName, xsmodel); } else if (type instanceof XSSimpleTypeDefinition) { @@ -111,7 +113,7 @@ String nsuri = type.getNamespace(); String tname = type.getName(); if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue; - xsdJava.createJavaFile(stype, dirloc, packageName, xsmodel); + xsdJava.createJavaFile(stype, dirloc.getPath(), packageName, xsmodel); } } @@ -152,7 +154,7 @@ String str = "Method should be used for anon complex types only"; if (type.getName() != null) throw new IllegalArgumentException(str); - xsdJava.createJavaFile(type,outerElementName, loc,pkgname,schema, false); + xsdJava.createJavaFile(type,outerElementName,loc.getPath(),pkgname,schema, false); } } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -71,13 +71,15 @@ //Additional variables protected String containingElement = ""; protected String fname = ""; - protected File loc = null; + protected String loc = null; protected String pkgname = ""; private Set<String> generatedFiles = new HashSet<String>(); protected boolean serializableTypes; + protected Map<String, String> namespacePackageMap = null; + /** * List that is used for exception inheritance case wherein the variables * obtained from the base class go into the generated constructor alone and @@ -85,12 +87,13 @@ */ private Map<String, List> typeNameToBaseVARList = new HashMap<String, List>(); - public XSDTypeToJava(boolean serializableTypes) + public XSDTypeToJava(Map<String, String> map, boolean serializableTypes) { + this.namespacePackageMap = map; this.serializableTypes = serializableTypes; } - public void createJavaFile(XSComplexTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException + public void createJavaFile(XSComplexTypeDefinition type, String loc, String pkgname, XSModel schema) throws IOException { if (typeMapping == null) throw new WSException("TypeMapping has not been set"); @@ -103,7 +106,7 @@ createJavaFile(type, schema, false); } - public void createJavaFile(XSComplexTypeDefinition type, String containingElement, File loc, String pkgname, XSModel schema, boolean isExceptionType) + public void createJavaFile(XSComplexTypeDefinition type, String containingElement, String loc, String pkgname, XSModel schema, boolean isExceptionType) throws IOException { if (typeMapping == null) @@ -118,7 +121,7 @@ createJavaFile(type, schema, isExceptionType); } - public void createJavaFile(XSSimpleTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException + public void createJavaFile(XSSimpleTypeDefinition type, String loc, String pkgname, XSModel schema) throws IOException { if (typeMapping == null) throw new WSException("TypeMapping has not been set"); @@ -156,9 +159,16 @@ vars = this.getVARList(type, schema, isExceptionType); if (baseName == null && isExceptionType) + { baseName = "Exception"; - jwriter.createJavaFile(loc, fname, pkgname, vars, null, baseName, isExceptionType, serializableTypes, typeNameToBaseVARList); - + } + else if (baseName != null) + { + baseName = getPackageName(baseType.getNamespace()) + "." + baseName; + } + String packageName = getPackageName(type.getNamespace()); + jwriter.createJavaFile(getLocationForJavaGeneration(packageName), fname, packageName, vars, null, baseName, isExceptionType, serializableTypes, + typeNameToBaseVARList); } public void createJavaFile(XSSimpleTypeDefinition xsSimple, XSModel schema) throws IOException @@ -175,7 +185,8 @@ if (slist != null && slist.getLength() > 0) { //Enumerated List - jwriter.createJavaFileForEnumeratedValues(fname, slist, loc, pkgname, xsSimple); + String packageName = getPackageName(xsSimple.getNamespace()); + jwriter.createJavaFileForEnumeratedValues(fname, slist, getLocationForJavaGeneration(packageName), packageName, xsSimple); } else { @@ -272,6 +283,16 @@ this.typeMapping = tm; } + public Map<String, String> getNamespacePackageMap() + { + return namespacePackageMap; + } + + public void setNamespacePackageMap(Map<String, String> map) + { + this.namespacePackageMap = map; + } + //PRIVATE METHODS private void handleContentTypeElementsWithDerivationRestriction(XSComplexTypeDefinition type, XSModel schema, List vars, XSParticle xsparticle) throws IOException @@ -429,7 +450,7 @@ XSSimpleTypeDefinition xstype = att.getTypeDefinition(); QName qn = SchemaUtils.handleSimpleType(xstype); boolean primitive = obj.getRequired(); - VAR v = createVAR(qn, att.getName(), pkgname, primitive); + VAR v = createVAR(qn, att.getName(), getPackageName(xstype.getNamespace()), primitive); if (vars == null) vars = new ArrayList(); vars.add(v); @@ -569,7 +590,7 @@ { // it is a composite type QName qn = new QName(origType.getNamespace(), origType.getName()); - VAR vr = createVAR(qn, elem, (XSComplexTypeDefinition)xstypedef, tname, pkgname, arrayType); + VAR vr = createVAR(qn, elem, (XSComplexTypeDefinition)xstypedef, tname, getPackageName(origType.getNamespace()), arrayType); vars.add(vr); return vars; } @@ -608,7 +629,7 @@ this.fname = tempfname; // Bypass rest of processing QName anonqn = new QName(anonName); - VAR vr = createVAR(anonqn, elem, xsc, tname, pkgname, arrayType); + VAR vr = createVAR(anonqn, elem, xsc, tname, getPackageName(xsc.getNamespace()), arrayType); vars.add(vr); return vars; } @@ -647,7 +668,7 @@ this.fname = temp; } - VAR v = createVAR(qn, elem, xstypedef, tname, pkgname, arrayType); + VAR v = createVAR(qn, elem, xstypedef, tname, getPackageName(xstypedef.getNamespace()), arrayType); vars.add(v); } return vars; @@ -768,4 +789,25 @@ isArrayType = arrayType; } } + + private File getLocationForJavaGeneration(String packageName) + { + File locdir = new File(this.loc); + locdir = wsdlUtils.createPackage(locdir.getAbsolutePath(), packageName); + return locdir; + } + + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + return this.pkgname; + } } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -255,7 +255,7 @@ { String pkgname = attrs.getValue(PACKAGE_ATTRIBUTE); String ns = attrs.getValue(NAMESPACE_ATTRIBUTE); - globalc.packageNamespaceMap.put(pkgname, ns); + globalc.packageNamespaceMap.put(ns, pkgname); } return globalc; } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -23,8 +23,10 @@ import java.beans.Introspector; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import javax.xml.namespace.QName; @@ -76,6 +78,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.tools.HeaderUtil; +import org.jboss.ws.tools.NamespacePackageMapping; import org.jboss.ws.tools.RPCSignature; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.WSToolsConstants; @@ -97,6 +100,7 @@ private String typeNamespace; private String serviceName = null; private String packageName = null; + private Map<String, String> namespacePackageMap = new HashMap<String,String>(); private Set<String> registeredTypes = new HashSet<String>(); private Set<String> registeredExceptions = new HashSet<String>(); @@ -107,11 +111,13 @@ private String parameterStyle; - public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname, Class seiClass, LiteralTypeMapping ltm, String paramStyle) + public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, Map<String, String> map, Class seiClass, LiteralTypeMapping ltm, String paramStyle) { this.wsdlDefinitions = wsdl; this.serviceName = sname; - this.packageName = pname; + String targetNS = wsdl.getTargetNamespace(); + packageName = NamespacePackageMapping.getJavaPackageName(targetNS); + this.namespacePackageMap = map; this.typeMapping = ltm; this.wsdlStyle = utils.getWSDLStyle(wsdl); @@ -150,7 +156,7 @@ String prefix = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_SERVICE_PREFIX; ServiceInterfaceMapping sim = new ServiceInterfaceMapping(jwm); String className = ToolsUtils.firstLetterUpperCase(javaServiceName); - sim.setServiceInterface(packageName + "." + className); + sim.setServiceInterface(getPackageName(targetNS) + "." + className); sim.setWsdlServiceName(new QName(targetNS, serviceName, prefix)); WSDLEndpoint[] endpoints = ser.getEndpoints(); @@ -197,7 +203,7 @@ ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm); String className = ToolsUtils.firstLetterUpperCase(javaPortName); - seim.setServiceEndpointInterface(packageName + "." + className); + seim.setServiceEndpointInterface(getPackageName(targetNS) + "." + className); seim.setWsdlPortType(new QName(targetNS, portName, "portTypeNS")); seim.setWsdlBinding(new QName(targetNS, bindName, "bindingNS")); constructServiceEndpointMethodMapping(seim, wsdlintf); @@ -316,11 +322,15 @@ //Check it is a holder. if (wiop.getInputByPartName(xmlName.getLocalPart()) == null) { - + String nameSpace = null; + if (xt != null) + { + nameSpace = xt.getNamespace(); + } if (xt instanceof XSSimpleTypeDefinition) xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); - String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); + String javaType = getJavaTypeAsString(xmlName, xmlType, nameSpace, array, primitive); if ((isDocStyle() == false && "void".equals(javaType)) == false) { @@ -457,12 +467,20 @@ QName xmlType = returnParameter.getType(); XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + String nameSpace = null; + if (xt != null) + { + nameSpace = xt.getNamespace(); + } if (xt instanceof XSSimpleTypeDefinition) + { xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + } WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); - wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, false, true)); + wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, nameSpace, false, true)); QName messageName = WSDLUtils.getWsdl11Output(wiop).getMessageName(); + wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS)); wrvm.setWsdlMessagePartName(partName); semm.setWsdlReturnValueMapping(wrvm); @@ -526,7 +544,7 @@ XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", "", jwm, true); - String exceptionType = getJavaTypeAsString(null, xmlType, false, true); + String exceptionType = getJavaTypeAsString(null, xmlType, xt.getNamespace(), false, true); if (registeredExceptions.contains(exceptionType) == false) { @@ -695,9 +713,17 @@ if (xt instanceof XSComplexTypeDefinition) { - XSModelGroup xm = null; XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xt; + XSTypeDefinition baseType = xc.getBaseType(); + short der = xc.getDerivationMethod(); + + if ((baseType != null) && !utils.isBaseTypeIgnorable(baseType, xc)) + { + addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types + } + + // handleContentTypeElementsWithDerivationNone if (xc.getContentType() != XSComplexTypeDefinition.CONTENTTYPE_EMPTY) { XSParticle xp = xc.getParticle(); @@ -719,7 +745,7 @@ if (localName == null) { String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name); - javaType = getJavaTypeAsString(null, new QName(tempName), false, true); + javaType = getJavaTypeAsString(null, new QName(tempName), xt.getNamespace(), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) temp.append(">").append(containingType); @@ -729,7 +755,7 @@ } else { - javaType = getJavaTypeAsString(null, new QName(localName), false, true); + javaType = getJavaTypeAsString(null, new QName(localName), xt.getNamespace(), false, true); jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS")); } @@ -781,12 +807,15 @@ { XSTerm xsterm = ((XSParticle)xo.item(i)).getTerm(); if (xsterm instanceof XSModelGroup) + { addVariableMappingMap((XSModelGroup)xsterm, jxtm, javaType); + } else if (xsterm instanceof XSElementDeclaration) { XSElementDeclaration xe = (XSElementDeclaration)xsterm; VariableMapping vm = new VariableMapping(jxtm); String name = xe.getName(); + // JBWS-1170 Convert characters which are illegal in Java identifiers vm.setJavaVariableName(ToolsUtils.convertInvalidCharacters(Introspector.decapitalize(name))); vm.setXmlElementName(name); @@ -840,7 +869,7 @@ } } - private String getJavaTypeAsString(QName xmlName, QName xmlType, boolean array, boolean primitive) + private String getJavaTypeAsString(QName xmlName, QName xmlType, String targetNS, boolean array, boolean primitive) { String jtype = null; @@ -885,7 +914,7 @@ if (className.charAt(0) == '>') className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); - jtype = packageName + "." + utils.firstLetterUpperCase(className); + jtype = getPackageName(targetNS) + "." + utils.firstLetterUpperCase(className); } else { @@ -933,7 +962,7 @@ String targetNS = wsdlDefinitions.getTargetNamespace(); MethodParamPartsMapping mppm = new MethodParamPartsMapping(semm); mppm.setParamPosition(paramPosition); - String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); + String javaType = getJavaTypeAsString(xmlName, xmlType, xmlType.getNamespaceURI(), array, primitive); mppm.setParamType(javaType); //WSDL Message Mapping @@ -945,4 +974,19 @@ mppm.setWsdlMessageMapping(wmm); return mppm; } + + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + //Default behaviour will always generate all classes in the SEI package only + return packageName; + } } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -310,7 +310,8 @@ if (w2jc.mappingFileNeeded) { MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); - mgf.setPackageName(getPackageName(wsdl, glc)); + if (glc != null && glc.packageNamespaceMap != null) + mgf.setNamespacePackageMap(glc.packageNamespaceMap); mgf.setServiceName(wsdl.getServices()[0].getName().getLocalPart()); mgf.setParameterStyle(w2jc.parameterStyle); @@ -399,21 +400,16 @@ private String getPackageName(WSDLDefinitions wsdl, GlobalConfig glc) { String targetNamespace = wsdl.getTargetNamespace(); - //Get it from global config + //Get it from global config if it is overriden if (glc != null && glc.packageNamespaceMap != null) { - Map<String, String> map = glc.packageNamespaceMap; - Iterator<String> iter = map.keySet().iterator(); - while (iter.hasNext()) + String pkg = glc.packageNamespaceMap.get(targetNamespace); + if (pkg != null) { - String pkg = (String)iter.next(); - String ns = map.get(pkg); - if (ns.equals(targetNamespace)) - return pkg; + return pkg; } } - - return NamespacePackageMapping.getJavaPackageName(wsdl.getTargetNamespace()); + return NamespacePackageMapping.getJavaPackageName(targetNamespace); } private void createDir(String path) Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -24,7 +24,11 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; +import java.util.Set; import javax.xml.rpc.encoding.TypeMapping; @@ -42,6 +46,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.JavaWriter; +import org.jboss.ws.tools.NamespacePackageMapping; import org.jboss.ws.tools.XSDTypeToJava; import org.jboss.ws.tools.XSDTypeToJava.VAR; import org.jboss.ws.tools.helpers.MappingFileGeneratorHelper; @@ -68,9 +73,9 @@ protected WSDLDefinitions wsdlDefinitions; /** - * Package Name to override + * Package Names to override */ - protected String packageName; + protected Map<String, String> namespacePackageMap = new HashMap<String,String>(); /** * Service Name @@ -78,6 +83,11 @@ protected String serviceName; /** + * SEI Package Name to override + */ + protected String packageName; + + /** * Service Endpoint Interface (if available). * <br/> Will be available for server side generation (Java -> WSDL) */ @@ -93,6 +103,8 @@ public MappingFileGenerator(WSDLDefinitions wsdl, TypeMapping typeM) { this.wsdlDefinitions = wsdl; + String targetNS = wsdl.getTargetNamespace(); + packageName = NamespacePackageMapping.getJavaPackageName(targetNS); this.typeMapping = (LiteralTypeMapping)typeM; } @@ -122,6 +134,17 @@ this.packageName = packageName; } + public Map<String, String> getNamespacePackageMap() + { + return namespacePackageMap; + } + + + public void setNamespacePackageMap(Map<String, String> map) + { + namespacePackageMap = map; + } + /** * @return @see #serviceName */ @@ -156,7 +179,7 @@ */ public JavaWsdlMapping generate() throws IOException { - MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.packageName, this.serviceEndpointInterface, + MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.namespacePackageMap, this.serviceEndpointInterface, this.typeMapping, this.parameterStyle); JavaWsdlMapping jwm = new JavaWsdlMapping(); @@ -182,9 +205,23 @@ //Construct package mapping //Check if the user has provided a typeNamespace if (typeNamespace != null && typeNamespace.equals(targetNS) == false || isServerSideGeneration()) - jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, typeNamespace)); - jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, targetNS)); + jwm.addPackageMapping(helper.constructPackageMapping(jwm, getPackageName(typeNamespace), typeNamespace)); + jwm.addPackageMapping(helper.constructPackageMapping(jwm, getPackageName(targetNS), targetNS)); + if (namespacePackageMap != null) + { + Set<String> keys = namespacePackageMap.keySet(); + Iterator<String> iter = keys.iterator(); + while (iter != null && iter.hasNext()) + { + String ns = iter.next(); + if (jwm.getPackageNameForNamespaceURI(ns) == null) + { + jwm.addPackageMapping(helper.constructPackageMapping(jwm, namespacePackageMap.get(ns), ns)); + } + } + } + return jwm; } @@ -193,4 +230,19 @@ { return this.serviceEndpointInterface != null; } + + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + //Default behaviour will always generate all classes in the SEI package only + return packageName; + } } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217 (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-08-04 13:08:09 UTC (rev 8006) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -1,64 +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.jbws1217; - -import java.io.File; - -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; - -/** - * JBWS-1217 - Test the support of multiple namespace to multiple - * package generation of tools. - * - * @author mageshbk(a)jboss.com - * @since 02 Jan 2008 - */ -public class JBWS1217TestCase extends JBossWSTest -{ - public final void testMultiplePackageNameSpace() throws Exception - { - String resourceDir = "resources/tools/jbws1217"; - String toolsDir = "tools/jbws1217"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - compareSource(resourceDir + "/Test.java", toolsDir + "/org/jboss/test/ws/jbws1217/Test.java"); - compareSource(resourceDir + "/TestException.java", toolsDir + "/org/jboss/test/ws/jbws1217/exception/TestException.java"); - compareSource(resourceDir + "/BaseException.java", toolsDir + "/org/jboss/test/ws/jbws1217/base/BaseException.java"); - - 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: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -0,0 +1,64 @@ +/* + * 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.jbws1217; + +import java.io.File; + +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; + +/** + * JBWS-1217 - Test the support of multiple namespace to multiple + * package generation of tools. + * + * @author mageshbk(a)jboss.com + * @since 02 Jan 2008 + */ +public class JBWS1217TestCase extends JBossWSTest +{ + public final void testMultiplePackageNameSpace() throws Exception + { + String resourceDir = "resources/tools/jbws1217"; + String toolsDir = "tools/jbws1217"; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + + compareSource(resourceDir + "/Test.java", toolsDir + "/org/jboss/test/ws/jbws1217/Test.java"); + compareSource(resourceDir + "/TestException.java", toolsDir + "/org/jboss/test/ws/jbws1217/exception/TestException.java"); + compareSource(resourceDir + "/BaseException.java", toolsDir + "/org/jboss/test/ws/jbws1217/base/BaseException.java"); + + 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: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217 (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/BaseException.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java 2008-08-04 13:08:09 UTC (rev 8006) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/BaseException.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -1,18 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217.base; - - -public class BaseException - extends Exception{ -public BaseException(){ -} -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/BaseException.java (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/BaseException.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/BaseException.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -0,0 +1,18 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217.base; + + +public class BaseException + extends Exception{ +public BaseException(){ +} +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-08-04 13:08:09 UTC (rev 8006) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-11-06 13:07:40 UTC (rev 8661) @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws.jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://com.other.base' xmlns:ns2='http://com.other.exception' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws.jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://com.other.exception' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://com.other.base' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.exception' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <import namespace='http://com.other.base'/> - <complexType name='TestException'> - <complexContent> - <extension base='ns2:BaseException'> - <sequence/> - </extension> - </complexContent> - </complexType> - <element name='TestException' type='tns:TestException'/> - </schema> - <schema targetNamespace='http://com.other.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://com.other.exception' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <import namespace='http://com.other.exception'/> - <complexType name='BaseException'> - <sequence/> - </complexType> - <complexType name='BaseException.Array'> - <sequence> - <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='tns:BaseException'/> - </sequence> - </complexType> - <element name='BaseException' type='tns:BaseException'/> - </schema> - </types> - <message name='Test_getException' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - <message name='Test_getExceptionResponse'> - <part name='result' type='ns1:BaseException'/> - </message> - <message name='TestException'> - <part element='ns2:TestException' name='TestException'/> - </message> - <message name='Test_getExceptions'/> - <message name='Test_getExceptionsResponse'> - <part name='result' type='ns1:BaseException.Array'/> - </message> - <message name='Test_setException'> - <part name='BaseException_1' type='ns1:BaseException'/> - </message> - <message name='Test_setExceptionResponse'/> - <message name='Test_setExceptions'> - <part name='arrayOfBaseException_1' type='ns1:BaseException.Array'/> - </message> - <message name='Test_setExceptionsResponse'/> - <message name='Test_testException'/> - <message name='Test_testExceptionResponse'/> - <portType name='Test'> - <operation name='getException'> - <input message='tns:Test_getException'/> - <output message='tns:Test_getExceptionResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - <operation name='getExceptions'> - <input message='tns:Test_getExceptions'/> - <output message='tns:Test_getExceptionsResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - <operation name='setException' parameterOrder='BaseException_1'> - <input message='tns:Test_setException'/> - <output message='tns:Test_setExceptionResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - <operation name='setExceptions' parameterOrder='arrayOfBaseException_1'> - <input message='tns:Test_setExceptions'/> - <output message='tns:Test_setExceptionsResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - <operation name='testException'> - <input message='tns:Test_testException'/> - <output message='tns:Test_testExceptionResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - </portType> - <binding name='TestBinding' type='tns:Test'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='getException'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - <operation name='getExceptions'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - <operation name='setException'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - <operation name='setExceptions'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - <operation name='testException'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestBinding' name='TestPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-11-06 13:07:40 UTC (rev 8661) @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws.jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://com.other.base' xmlns:ns2='http://com.other.exception' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws.jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://com.other.exception' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://com.other.base' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.exception' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <import namespace='http://com.other.base'/> + <complexType name='TestException'> + <complexContent> + <extension base='ns2:BaseException'> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name='TestException' type='tns:TestException'/> + </schema> + <schema targetNamespace='http://com.other.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://com.other.exception' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <import namespace='http://com.other.exception'/> + <complexType name='BaseException'> + <sequence/> + </complexType> + <complexType name='BaseException.Array'> + <sequence> + <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='tns:BaseException'/> + </sequence> + </complexType> + <element name='BaseException' type='tns:BaseException'/> + </schema> + </types> + <message name='Test_getException' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + <message name='Test_getExceptionResponse'> + <part name='result' type='ns1:BaseException'/> + </message> + <message name='TestException'> + <part element='ns2:TestException' name='TestException'/> + </message> + <message name='Test_getExceptions'/> + <message name='Test_getExceptionsResponse'> + <part name='result' type='ns1:BaseException.Array'/> + </message> + <message name='Test_setException'> + <part name='BaseException_1' type='ns1:BaseException'/> + </message> + <message name='Test_setExceptionResponse'/> + <message name='Test_setExceptions'> + <part name='arrayOfBaseException_1' type='ns1:BaseException.Array'/> + </message> + <message name='Test_setExceptionsResponse'/> + <message name='Test_testException'/> + <message name='Test_testExceptionResponse'/> + <portType name='Test'> + <operation name='getException'> + <input message='tns:Test_getException'/> + <output message='tns:Test_getExceptionResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + <operation name='getExceptions'> + <input message='tns:Test_getExceptions'/> + <output message='tns:Test_getExceptionsResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + <operation name='setException' parameterOrder='BaseException_1'> + <input message='tns:Test_setException'/> + <output message='tns:Test_setExceptionResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + <operation name='setExceptions' parameterOrder='arrayOfBaseException_1'> + <input message='tns:Test_setExceptions'/> + <output message='tns:Test_setExceptionsResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + <operation name='testException'> + <input message='tns:Test_testException'/> + <output message='tns:Test_testExceptionResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + </portType> + <binding name='TestBinding' type='tns:Test'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='getException'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + <operation name='getExceptions'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + <operation name='setException'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + <operation name='setExceptions'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + <operation name='testException'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestBinding' name='TestPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/Test.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/Test.java 2008-08-04 13:08:09 UTC (rev 8006) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/Test.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -1,19 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217; -public interface Test extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1217.base.BaseException getException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; - public org.jboss.test.ws.jbws1217.base.BaseException[] getExceptions() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; - public void setException(org.jboss.test.ws.jbws1217.base.BaseException baseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; - public void setExceptions(org.jboss.test.ws.jbws1217.base.BaseException[] arrayOfBaseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; - public void testException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/Test.java (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/Test.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/Test.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/Test.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -0,0 +1,19 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217; +public interface Test extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1217.base.BaseException getException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; + public org.jboss.test.ws.jbws1217.base.BaseException[] getExceptions() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; + public void setException(org.jboss.test.ws.jbws1217.base.BaseException baseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; + public void setExceptions(org.jboss.test.ws.jbws1217.base.BaseException[] arrayOfBaseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; + public void testException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/TestException.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java 2008-08-04 13:08:09 UTC (rev 8006) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/TestException.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -1,18 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217.exception; - - -public class TestException - extends org.jboss.test.ws.jbws1217.base.BaseException{ -public TestException(){ -} -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/TestException.java (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/TestException.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/TestException.java 2008-11-06 13:07:40 UTC (rev 8661) @@ -0,0 +1,18 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217.exception; + + +public class TestException + extends org.jboss.test.ws.jbws1217.base.BaseException{ +public TestException(){ +} +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-08-04 13:08:09 UTC (rev 8006) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-11-06 13:07:40 UTC (rev 8661) @@ -1,89 +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.jbws1217.base</package-type> - <namespaceURI>http://com.other.base</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1217</package-type> - <namespaceURI>http://org.jboss.test.ws.jbws1217</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1217.exception</package-type> - <namespaceURI>http://com.other.exception</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1217.base.BaseException</java-type> - <root-type-qname xmlns:typeNS='http://com.other.base'>typeNS:BaseException</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1217.exception.TestException</java-type> - <root-type-qname xmlns:typeNS='http://com.other.exception'>typeNS:TestException</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <exception-mapping> - <exception-type>org.jboss.test.ws.jbws1217.exception.TestException</exception-type> - <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws.jbws1217'>exMsgNS:TestException</wsdl-message> - </exception-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1217.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbws1217'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestPort</port-name> - <java-port-name>TestPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1217.Test</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbws1217'>portTypeNS:Test</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbws1217'>bindingNS:TestBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>getException</java-method-name> - <wsdl-operation>getException</wsdl-operation> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>getExceptions</java-method-name> - <wsdl-operation>getExceptions</wsdl-operation> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionsResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>setException</java-method-name> - <wsdl-operation>setException</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1217.base.BaseException</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setException</wsdl-message> - <wsdl-message-part-name>BaseException_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>setExceptions</java-method-name> - <wsdl-operation>setExceptions</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1217.base.BaseException[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setExceptions</wsdl-message> - <wsdl-message-part-name>arrayOfBaseException_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>testException</java-method-name> - <wsdl-operation>testException</wsdl-operation> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-11-06 13:07:40 UTC (rev 8661) @@ -0,0 +1,89 @@ +<?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.jbws1217.base</package-type> + <namespaceURI>http://com.other.base</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1217</package-type> + <namespaceURI>http://org.jboss.test.ws.jbws1217</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1217.exception</package-type> + <namespaceURI>http://com.other.exception</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1217.base.BaseException</java-type> + <root-type-qname xmlns:typeNS='http://com.other.base'>typeNS:BaseException</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1217.exception.TestException</java-type> + <root-type-qname xmlns:typeNS='http://com.other.exception'>typeNS:TestException</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <exception-mapping> + <exception-type>org.jboss.test.ws.jbws1217.exception.TestException</exception-type> + <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws.jbws1217'>exMsgNS:TestException</wsdl-message> + </exception-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1217.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbws1217'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestPort</port-name> + <java-port-name>TestPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1217.Test</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbws1217'>portTypeNS:Test</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbws1217'>bindingNS:TestBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>getException</java-method-name> + <wsdl-operation>getException</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>getExceptions</java-method-name> + <wsdl-operation>getExceptions</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException[]</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionsResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>setException</java-method-name> + <wsdl-operation>setException</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1217.base.BaseException</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setException</wsdl-message> + <wsdl-message-part-name>BaseException_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>setExceptions</java-method-name> + <wsdl-operation>setExceptions</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1217.base.BaseException[]</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setExceptions</wsdl-message> + <wsdl-message-part-name>arrayOfBaseException_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>testException</java-method-name> + <wsdl-operation>testException</wsdl-operation> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/wstools-config.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/wstools-config.xml 2008-08-04 13:08:09 UTC (rev 8006) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/wstools-config.xml 2008-11-06 13:07:40 UTC (rev 8661) @@ -1,10 +0,0 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools"> - <global> - <package-namespace package="org.jboss.test.ws.jbws1217.exception" namespace="http://com.other.exception"/> - <package-namespace package="org.jboss.test.ws.jbws1217.base" namespace="http://com.other.base"/> - <package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws.jbws1217"/> - </global> - <wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> -</configuration> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/wstools-config.xml (from rev 8006, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1217/wstools-config.xml 2008-11-06 13:07:40 UTC (rev 8661) @@ -0,0 +1,10 @@ +<configuration xmlns="http://www.jboss.org/jbossws-tools"> + <global> + <package-namespace package="org.jboss.test.ws.jbws1217.exception" namespace="http://com.other.exception"/> + <package-namespace package="org.jboss.test.ws.jbws1217.base" namespace="http://com.other.base"/> + <package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws.jbws1217"/> + </global> + <wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl"> + <mapping file="jaxrpc-mapping.xml" /> + </wsdl-java> +</configuration> \ No newline at end of file Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2008-11-06 13:07:40 UTC (rev 8661) @@ -8,6 +8,11 @@ <package-type>org.jboss.test.ws.jbws1441</package-type> <namespaceURI>http://test.jboss.org/ws/jbws1441/types</namespaceURI> </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1441.AbstractType</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeNS:AbstractType</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1441.TelephoneNumber</java-type> <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeNS:TelephoneNumber</root-type-qname> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2008-11-06 11:42:52 UTC (rev 8660) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2008-11-06 13:07:40 UTC (rev 8661) @@ -8,6 +8,15 @@ <namespaceURI>http://test.jboss.org/ws/jbws1881</namespaceURI> </package-mapping> <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1881.Base</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:base</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>id</java-variable-name> + <xml-element-name>id</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1881.Person</java-type> <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:Person</root-type-qname> <qname-scope>complexType</qname-scope>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8660 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-06 06:42:52 -0500 (Thu, 06 Nov 2008) New Revision: 8660 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/ Log: [JBPAPP-1369] Branch for patch. Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369 (from rev 8659, stack/native/tags/jbossws-native-2.0.1.SP2_CP03)

16 years, 1 month

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 November 2008