[jbossws-commits] JBossWS SVN: r11393 - in stack/native/trunk: modules and 24 other directories.

Author: richard.opalka(a)jboss.com Date: 2010-01-13 06:46:29 -0500 (Wed, 13 Jan 2010) New Revision: 11393 Added: stack/native/trunk/modules/core/src/main/java/javax/ stack/native/trunk/modules/core/src/main/java/javax/xml/ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Action.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ActionNotSupportedException.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingBuilder.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingConstants.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingException.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingProperties.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingType.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributeExtensible.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributedQName.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributedURI.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/DestinationUnreachableException.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ElementExtensible.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/EndpointReference.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/EndpointUnavailableException.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/FaultAction.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/InvalidMapException.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/JAXWSAConstants.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/MapRequiredException.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Metadata.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ReferenceParameters.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Relationship.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingBuilder.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingElement.java stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingProperties.java stack/native/trunk/modules/endorsed/ stack/native/trunk/modules/endorsed/pom.xml stack/native/trunk/modules/endorsed/src/ stack/native/trunk/modules/endorsed/src/main/ stack/native/trunk/modules/endorsed/src/main/resources/ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider Removed: stack/native/trunk/modules/core/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider stack/native/trunk/modules/jaxrpc/ stack/native/trunk/modules/jaxws-ext/ stack/native/trunk/modules/jaxws/ stack/native/trunk/modules/saaj/ Modified: stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/HelloJavaBean.java stack/native/trunk/pom.xml stack/native/trunk/src/main/distro/build-project-gen.xml stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2850][JBWS-2851] removing properietary JAXRPC and SAAJ APIs and reusing existing from Maven repo Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/client/pom.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -1,10 +1,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBoss Web Services - Stack Native Client</name> <artifactId>jbossws-native-client</artifactId> <packaging>jar</packaging> - + <!-- Parent --> <parent> <groupId>org.jboss.ws.native</groupId> @@ -12,26 +12,19 @@ <version>3.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - + <!-- Dependencies --> <dependencies> - <!-- This shortens the path to the JAX-WS impl. Otherwise jaxws-rt.jar might be seen first --> <dependency> <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-jaxws-ext</artifactId> + <artifactId>jbossws-native-core</artifactId> <version>${version}</version> </dependency> <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-jaxrpc</artifactId> - <version>${version}</version> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> </dependency> @@ -48,12 +41,12 @@ <configuration> <archive> <manifestEntries> - <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jaxws-api.jar jsr181-api.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path> + <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-factories.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path> </manifestEntries> </archive> </configuration> </plugin> </plugins> </build> - + </project> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/core/pom.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -1,10 +1,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBoss Web Services - Native Server</name> <artifactId>jbossws-native-core</artifactId> <packaging>jar</packaging> - + <!-- Parent --> <parent> <groupId>org.jboss.ws.native</groupId> @@ -17,7 +17,7 @@ <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version> <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version> </properties> - + <!-- Dependencies --> <dependencies> <!-- jbossws dependencies --> @@ -34,21 +34,19 @@ <artifactId>jbossws-spi</artifactId> </dependency> <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-jaxws</artifactId> - <version>${version}</version> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-jaxws-ext</artifactId> - <version>${version}</version> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-jaxrpc</artifactId> + <artifactId>jbossws-native-factories</artifactId> <version>${version}</version> </dependency> - + <!-- provided apis --> <dependency> <groupId>javax.annotation</groupId> @@ -70,7 +68,7 @@ <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> - + <!-- jboss provided --> <dependency> <groupId>jboss.common</groupId> @@ -111,7 +109,7 @@ <artifactId>xercesImpl</artifactId> <scope>provided</scope> </dependency> - + <!-- transitve dependencies --> <dependency> <groupId>javax.xml.ws</groupId> @@ -182,7 +180,7 @@ <artifactId>javassist</artifactId> </dependency> </dependencies> - + <!-- Build --> <build> <plugins> @@ -264,5 +262,5 @@ </plugin> </plugins> </build> - + </project> Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Action.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Action.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Action.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,41 @@ +/* + * 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 javax.xml.ws.addressing; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Documented +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target(ElementType.METHOD) +public @interface Action +{ + + String input() default "##default"; + + String output() default "##default"; + + String[] fault() default "##default"; +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ActionNotSupportedException.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ActionNotSupportedException.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ActionNotSupportedException.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,57 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; + +public class ActionNotSupportedException extends AddressingException +{ + private static final long serialVersionUID = -2281268200778671820L; + + static + { + fMessage = ac.getActionNotSupportedText(); + } + + private String action; + + protected ActionNotSupportedException() + { + super(); + } + + public ActionNotSupportedException(String action) + { + super(fMessage + ": " + action); + this.action = action; + } + + public String getAction() + { + return action; + } + + public QName getSubcode() + { + return ac.getActioNotSupportedQName(); + } +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingBuilder.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingBuilder.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,190 @@ +/* + * 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 javax.xml.ws.addressing; + +import static javax.xml.ws.addressing.JAXWSAConstants.ADDRESSING_BUILDER_PROPERTY; +import static javax.xml.ws.addressing.JAXWSAConstants.DEFAULT_ADDRESSING_BUILDER; + +import java.net.URI; +import java.net.URISyntaxException; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; + +public abstract class AddressingBuilder implements AddressingType +{ + // provide logging + private static Logger log = Logger.getLogger(AddressingBuilder.class.getName()); + + protected AddressingBuilder() + { + } + + public static AddressingBuilder getAddressingBuilder() + { + ClassLoader classLoader; + try + { + classLoader = getContextClassLoader(); + } + catch (Exception x) + { + throw new AddressingException(x.toString(), x); + } + + String name = null; + + // Use the system property first + try + { + name = getSystemProperty(ADDRESSING_BUILDER_PROPERTY); + if (name != null) + { + return newInstance(name, classLoader); + } + } + catch (Exception e) + { + log.warning("Could not create and instance of " + name + " trying " + DEFAULT_ADDRESSING_BUILDER); + } + + // default builder + return newInstance(DEFAULT_ADDRESSING_BUILDER, classLoader); + } + + private static AddressingBuilder newInstance(String className, ClassLoader classLoader) + { + try + { + Class cls; + if (classLoader == null) + { + cls = Class.forName(className); + } + else + { + cls = loadClass(classLoader, className); + } + return (AddressingBuilder)cls.newInstance(); + } + catch (ClassNotFoundException x) + { + throw new AddressingException("Provider " + className + " not found", x); + } + catch (Exception x) + { + throw new AddressingException("Provider " + className + " could not be instantiated: " + x, x); + } + } + + public abstract AttributedURI newURI(URI uri); + + public abstract AttributedURI newURI(String uri) throws URISyntaxException; + + public abstract AttributedQName newQName(QName name); + + public abstract Relationship newRelationship(URI uri); + + public abstract EndpointReference newEndpointReference(URI uri); + + public abstract AddressingProperties newAddressingProperties(); + + public abstract AddressingConstants newAddressingConstants(); + + /** + * Get a system property + * + * @param name + * @param defaultValue + * @return + */ + private static String getSystemProperty(final String name) + { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) + { + return System.getProperty(name); + } + else + { + PrivilegedAction<String> action = new PrivilegedAction<String>() { + public String run() + { + return System.getProperty(name); + } + }; + return AccessController.doPrivileged(action); + } + } + + private static Class<?> loadClass(final ClassLoader cl, final String name) throws PrivilegedActionException, ClassNotFoundException + { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) + { + return cl.loadClass(name); + } + else + { + return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() { + public Class<?> run() throws PrivilegedActionException + { + try + { + return cl.loadClass(name); + } + catch (Exception e) + { + throw new PrivilegedActionException(e); + } + } + }); + } + } + + /** + * Get context classloader. + * + * @return the current context classloader + */ + private static ClassLoader getContextClassLoader() + { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) + { + return Thread.currentThread().getContextClassLoader(); + } + else + { + return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { + public ClassLoader run() + { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + } +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingConstants.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingConstants.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingConstants.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,94 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; + +public interface AddressingConstants +{ + String getNamespaceURI(); + + String getNamespacePrefix(); + + String getWSDLNamespaceURI(); + + String getWSDLNamespacePrefix(); + + QName getWSDLExtensibilityQName(); + + QName getWSDLActionQName(); + + String getAnonymousURI(); + + String getNoneURI(); + + QName getFromQName(); + + QName getToQName(); + + QName getReplyToQName(); + + QName getFaultToQName(); + + QName getActionQName(); + + QName getMessageIDQName(); + + QName getRelationshipReplyQName(); + + QName getRelatesToQName(); + + String getRelationshipTypeName(); + + // [TODO] Add this method + QName getReferenceParametersQName(); + + QName getMetadataQName(); + + QName getAddressQName(); + + String getPackageName(); + + String getIsReferenceParameterName(); + + QName getInvalidMapQName(); + + QName getMapRequiredQName(); + + QName getDestinationUnreachableQName(); + + QName getActioNotSupportedQName(); + + QName getEndpointUnavailableQName(); + + String getDefaultFaultAction(); + + String getActionNotSupportedText(); + + String getDestinationUnreachableText(); + + String getEndpointUnavailableText(); + + String getInvalidMapText(); + + String getMapRequiredText(); +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingException.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingException.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingException.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,88 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; +import javax.xml.ws.WebServiceException; + +public class AddressingException extends WebServiceException +{ + private static final long serialVersionUID = -4470655951999027171L; + + protected QName code; + + protected String reason; + + protected Object detail; + + protected static AddressingConstants ac = null; + protected static String fMessage = null; + static + { + ac = AddressingBuilder.getAddressingBuilder().newAddressingConstants(); + } + + public AddressingException() + { + } + + public AddressingException(String message) + { + super(message); + } + + public AddressingException(Throwable cause) + { + super(cause); + } + + public AddressingException(String message, Throwable cause) + { + super(message, cause); + } + + /** + * Returns the fault code. + * + * @return the fault code + */ + public QName getCode() + { + return code; + } + + public QName getSubcode() + { + return null; + } + + public String getReason() + { + return reason; + } + + public Object getDetail() + { + return detail; + } + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingProperties.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingProperties.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingProperties.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,64 @@ +/* + * 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 javax.xml.ws.addressing; + +import java.util.Map; + +import javax.xml.namespace.QName; + +public interface AddressingProperties extends AddressingType, Map<QName, AddressingType> +{ + + public AttributedURI getTo(); + + public void setTo(AttributedURI iri); + + public AttributedURI getAction(); + + public void setAction(AttributedURI iri); + + public AttributedURI getMessageID(); + + public void setMessageID(AttributedURI iri); + + public Relationship[] getRelatesTo(); + + public void setRelatesTo(Relationship[] relationship); + + public EndpointReference getReplyTo(); + + public void setReplyTo(EndpointReference ref); + + public EndpointReference getFaultTo(); + + public void setFaultTo(EndpointReference ref); + + public EndpointReference getFrom(); + + public void setFrom(EndpointReference ref); + + public ReferenceParameters getReferenceParameters(); + + public void initializeAsDestination(EndpointReference ref); + + public void initializeAsReply(AddressingProperties props, boolean isFault); +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingType.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingType.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AddressingType.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,27 @@ +/* + * 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 javax.xml.ws.addressing; + +public interface AddressingType +{ + public String getNamespaceURI(); +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributeExtensible.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributeExtensible.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributeExtensible.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,34 @@ +/* + * 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 javax.xml.ws.addressing; + +import java.util.Map; + +import javax.xml.namespace.QName; + +public interface AttributeExtensible extends AddressingType +{ + public Map<QName, String> getAttributes(); + + public void addAttribute(QName name, String value) throws AddressingException; + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributedQName.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributedQName.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributedQName.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,33 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; + +public interface AttributedQName extends AddressingType, AttributeExtensible +{ + + public QName getQName(); + + public void addAttribute(QName name, String value); + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributedURI.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributedURI.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/AttributedURI.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,33 @@ +/* + * 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 javax.xml.ws.addressing; + +import java.net.URI; + +import javax.xml.namespace.QName; + +public interface AttributedURI extends AddressingType, AttributeExtensible +{ + public URI getURI(); + + public void addAttribute(QName name, String value); +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/DestinationUnreachableException.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/DestinationUnreachableException.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/DestinationUnreachableException.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,48 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; + +public class DestinationUnreachableException extends AddressingException +{ + private static final long serialVersionUID = 7420697131368408456L; + + static + { + fMessage = ac.getDestinationUnreachableText(); + } + + public DestinationUnreachableException() + { + } + + public DestinationUnreachableException(String problemIRI) + { + super(fMessage + ": " + problemIRI); + } + + public QName getSubcode() + { + return ac.getDestinationUnreachableQName(); + } +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ElementExtensible.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ElementExtensible.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ElementExtensible.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,34 @@ +/* + * 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 javax.xml.ws.addressing; + +import java.util.List; + +public interface ElementExtensible extends AddressingType +{ + public List<Object> getElements(); + + public void addElement(Object element); + + public boolean removeElement(Object element); + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/EndpointReference.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/EndpointReference.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/EndpointReference.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,32 @@ +/* + * 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 javax.xml.ws.addressing; + +public interface EndpointReference extends AddressingType, AttributeExtensible, ElementExtensible +{ + public AttributedURI getAddress(); + + public ReferenceParameters getReferenceParameters(); + + public Metadata getMetadata(); + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/EndpointUnavailableException.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/EndpointUnavailableException.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/EndpointUnavailableException.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,48 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; + +public class EndpointUnavailableException extends AddressingException +{ + private static final long serialVersionUID = 4098776568071868541L; + + static + { + fMessage = ac.getEndpointUnavailableText(); + } + + public EndpointUnavailableException() + { + } + + public EndpointUnavailableException(int retryAfter, String problemIRI) + { + super(fMessage + ": [retry=" + retryAfter + ",iri=" + problemIRI + "]"); + } + + public QName getSubcode() + { + return ac.getEndpointUnavailableQName(); + } +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/FaultAction.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/FaultAction.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/FaultAction.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,39 @@ +/* + * 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 javax.xml.ws.addressing; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Documented +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target(ElementType.METHOD) +public @interface FaultAction +{ + + Class className(); + + String value() default "##default"; +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/InvalidMapException.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/InvalidMapException.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/InvalidMapException.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,48 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; + +public class InvalidMapException extends AddressingException +{ + private static final long serialVersionUID = 1760077070006214469L; + + static + { + fMessage = ac.getInvalidMapText(); + } + + protected InvalidMapException() + { + } + + public InvalidMapException(QName name) + { + super(fMessage + ": " + name); + } + + public QName getSubcode() + { + return ac.getInvalidMapQName(); + } +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/JAXWSAConstants.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/JAXWSAConstants.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/JAXWSAConstants.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,78 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; + +public class JAXWSAConstants +{ + + private JAXWSAConstants() + { + } + + public static final String ADDRESSING_BUILDER_PROPERTY = "javax.xml.ws.addressing.AddressingBuilder"; + + public static final String DEFAULT_ADDRESSING_BUILDER = "org.jboss.ws.extensions.addressing.soap.SOAPAddressingBuilderImpl"; + + public static final String SOAP11_NAMESPACE_NAME = "http://schemas.xmlsoap.org/soap/envelope/"; + + public static final String SOAP12_NAMESPACE_NAME = "http://www.w3.org/2003/05/soap-envelope"; + + public static final QName SOAP11_SENDER_QNAME = new QName(SOAP11_NAMESPACE_NAME, "Client"); + + public static final QName SOAP11_RECEIVER_QNAME = new QName(SOAP11_NAMESPACE_NAME, "Server"); + + public static final QName SOAP12_SENDER_QNAME = new QName(SOAP12_NAMESPACE_NAME, "Sender"); + + public static final QName SOAP12_RECEIVER_QNAME = new QName(SOAP12_NAMESPACE_NAME, "Receiver"); + + public static final String SOAP11HTTP_ADDRESSING_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http?addressing=1.0"; + + public static final String SOAP12HTTP_ADDRESSING_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/?addressing=1.0"; + + public static final String CLIENT_ADDRESSING_PROPERTIES = "javax.xml.ws.addressing.context"; + + public static final String CLIENT_ADDRESSING_PROPERTIES_INBOUND = "javax.xml.ws.addressing.context.inbound"; + + public static final String CLIENT_ADDRESSING_PROPERTIES_OUTBOUND = "javax.xml.ws.addressing.context.outbound"; + + public static final String SERVER_ADDRESSING_PROPERTIES_INBOUND = "javax.xml.ws.addressing.context.inbound"; + + public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = "javax.xml.ws.addressing.context.outbound"; + + public static SOAPFactory SOAP_FACTORY = null; + + static + { + try + { + SOAP_FACTORY = SOAPFactory.newInstance(); + } + catch (SOAPException e) + { + } + } + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/MapRequiredException.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/MapRequiredException.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/MapRequiredException.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,48 @@ +/* + * 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 javax.xml.ws.addressing; + +import javax.xml.namespace.QName; + +public class MapRequiredException extends AddressingException +{ + private static final long serialVersionUID = 7593796661805754938L; + + static + { + fMessage = ac.getMapRequiredText(); + } + + public MapRequiredException() + { + } + + public MapRequiredException(QName name) + { + super(fMessage + ": " + name); + } + + public QName getSubcode() + { + return ac.getMapRequiredQName(); + } +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Metadata.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Metadata.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Metadata.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,27 @@ +/* + * 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 javax.xml.ws.addressing; + +public interface Metadata extends AttributeExtensible, ElementExtensible +{ + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ReferenceParameters.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ReferenceParameters.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ReferenceParameters.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,26 @@ +/* + * 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 javax.xml.ws.addressing; + +public interface ReferenceParameters extends AttributeExtensible, ElementExtensible +{ +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Relationship.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Relationship.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/Relationship.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,37 @@ +/* + * 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 javax.xml.ws.addressing; + +import java.net.URI; + +import javax.xml.namespace.QName; + +public interface Relationship extends AttributeExtensible +{ + + public URI getID(); + + public QName getType(); + + public void setType(QName type); + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingBuilder.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingBuilder.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,28 @@ +/* + * 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 javax.xml.ws.addressing.soap; + +import javax.xml.ws.addressing.AddressingBuilder; + +public abstract class SOAPAddressingBuilder extends AddressingBuilder +{ +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingElement.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingElement.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingElement.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,36 @@ +/* + * 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 javax.xml.ws.addressing.soap; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; +import javax.xml.ws.addressing.AddressingException; +import javax.xml.ws.addressing.AddressingType; + +public interface SOAPAddressingElement extends AddressingType +{ + + public void read(SOAPElement element) throws AddressingException; + + public SOAPElement write(SOAPElement parent, QName name) throws AddressingException; + +} Added: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingProperties.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingProperties.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/soap/SOAPAddressingProperties.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,36 @@ +/* + * 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 javax.xml.ws.addressing.soap; + +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.addressing.AddressingException; +import javax.xml.ws.addressing.AddressingProperties; + +public interface SOAPAddressingProperties extends AddressingProperties +{ + public void readHeaders(SOAPMessage message) throws AddressingException; + + public void writeHeaders(SOAPMessage message) throws AddressingException; + + public void setMu(boolean mu); + +} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -117,8 +117,12 @@ // copy headers Set<QName> headers = new HashSet<QName>(); - for (QName header : info.getHeaders()) - headers.add(header); + QName[] infoHeaders = info.getHeaders(); + if (infoHeaders != null) + { + for (QName header : infoHeaders) + headers.add(header); + } handler.setSoapHeaders(headers); // copy init params Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -26,19 +26,23 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Map; import javax.mail.MessagingException; import javax.xml.soap.AttachmentPart; import javax.xml.soap.MimeHeader; import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; +import javax.xml.soap.SOAPHeader; import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; @@ -67,7 +71,7 @@ public class SOAPMessageImpl extends SOAPMessage implements SOAPMessageAbstraction { private static Logger log = Logger.getLogger(SOAPMessageImpl.class); - + private Map<String, Object> properties = new HashMap<String, Object>(); private boolean saveRequired = true; private MimeHeaders mimeHeaders = new MimeHeaders(); private List<AttachmentPart> attachments = new LinkedList<AttachmentPart>(); @@ -88,6 +92,46 @@ setProperty(WRITE_XML_DECLARATION, writeXMLDeclaration); } + public Object getProperty(String property) throws SOAPException + { + return properties.get(property); + } + + public void setProperty(String property, Object value) throws SOAPException + { + properties.put(property, value); + } + + public SOAPBody getSOAPBody() throws SOAPException + { + SOAPPart soapPart = getSOAPPart(); + if (soapPart != null) + { + SOAPEnvelope soapEnvelope = soapPart.getEnvelope(); + if (soapEnvelope != null) + { + SOAPBody soapBody = soapEnvelope.getBody(); + return soapBody; + } + } + throw new SOAPException("Cannot obtain SOAPBody from SOAPMessage"); + } + + public SOAPHeader getSOAPHeader() throws SOAPException + { + SOAPPart soapPart = getSOAPPart(); + if (soapPart != null) + { + SOAPEnvelope soapEnvelope = soapPart.getEnvelope(); + if (soapEnvelope != null) + { + SOAPHeader soapHeader = soapEnvelope.getHeader(); + return soapHeader; + } + } + throw new SOAPException("Cannot obtain SOAPHeader from SOAPMessage"); + } + public CIDGenerator getCidGenerator() { return cidGenerator; Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-01-13 11:46:29 UTC (rev 11393) @@ -1 +0,0 @@ -org.jboss.ws.core.jaxws.spi.ProviderImpl \ No newline at end of file Added: stack/native/trunk/modules/endorsed/pom.xml =================================================================== --- stack/native/trunk/modules/endorsed/pom.xml (rev 0) +++ stack/native/trunk/modules/endorsed/pom.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Endorsed JAX-WS, JAX-RPC and SAAJ factories</name> + <artifactId>jbossws-native-factories</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native</artifactId> + <version>3.3.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +</project> Added: stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory =================================================================== --- stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory (rev 0) +++ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1 @@ +org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl \ No newline at end of file Added: stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory =================================================================== --- stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory (rev 0) +++ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1 @@ +org.jboss.ws.core.soap.MessageFactoryImpl \ No newline at end of file Added: stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory =================================================================== --- stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory (rev 0) +++ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1 @@ +org.jboss.ws.core.soap.SAAJMetaFactoryImpl \ No newline at end of file Added: stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory =================================================================== --- stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory (rev 0) +++ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1 @@ +org.jboss.ws.core.soap.SOAPFactoryImpl \ No newline at end of file Added: stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider (rev 0) +++ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-01-13 11:46:29 UTC (rev 11393) @@ -0,0 +1 @@ +org.jboss.ws.core.jaxws.spi.ProviderImpl \ No newline at end of file Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-01-13 11:46:29 UTC (rev 11393) @@ -55,10 +55,8 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossxb.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-01-13 11:46:29 UTC (rev 11393) @@ -79,10 +79,8 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossxb.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar" ### # Execute the JVM Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-01-13 11:46:29 UTC (rev 11393) @@ -53,10 +53,8 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-01-13 11:46:29 UTC (rev 11393) @@ -77,10 +77,8 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-01-13 11:46:29 UTC (rev 11393) @@ -55,10 +55,8 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-01-13 11:46:29 UTC (rev 11393) @@ -75,10 +75,8 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat 2010-01-13 11:46:29 UTC (rev 11393) @@ -43,8 +43,8 @@ set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossxb.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar rem Display our environment echo =========================================================================" Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh 2010-01-13 11:46:29 UTC (rev 11393) @@ -63,8 +63,8 @@ WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossxb.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar" # For Cygwin, switch paths to Windows format before running java Modified: stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-01-13 11:46:29 UTC (rev 11393) @@ -1 +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/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common! .jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml +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/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-factories.jar common/lib/jaxws-api.jar common/lib/jsr181-! api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-be! ans.xml server/all/deployers/jbossws.deployer/META-INF/standar! d-*-conf ig.xml Modified: stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-01-13 11:46:29 UTC (rev 11393) @@ -1 +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/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common! .jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar 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/netty.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/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbo! ssws.deployer/META-INF/standard-*-config.xml +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/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-factories.jar common/lib/jaxws-api.jar common/lib/jsr181-! api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar 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/netty.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/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deploy! ers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xm! l server /default/deployers/jbossws.deployer/META-INF/standard-*-config.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 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -39,11 +39,10 @@ <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-native-client.jar"/> <include name="**/jbossws-native-core.jar"/> - <include name="**/jbossws-native-jaxrpc.jar"/> - <include name="**/jbossws-native-jaxws.jar"/> - <include name="**/jbossws-native-jaxws-ext.jar"/> - <include name="**/jbossws-native-saaj.jar"/> + <include name="**/jbossws-native-factories.jar"/> <include name="**/jbossws-spi.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/saaj-api.jar"/> <include name="**/jettison.jar"/> <include name="**/netty.jar"/> <include name="**/policy.jar"/> @@ -60,8 +59,7 @@ </patternset> <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/jbossws-native-jaxws.jar"/> - <include name="**/jbossws-native-saaj.jar"/> + <include name="**/jbossws-native-factories.jar"/> <include name="**/jaxb-api.jar"/> </patternset> @@ -71,10 +69,9 @@ <include name="**/jsr181-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-native-jaxrpc.jar"/> - <include name="**/jbossws-native-jaxws.jar"/> - <include name="**/jbossws-native-jaxws-ext.jar"/> - <include name="**/jbossws-native-saaj.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/jbossws-native-factories.jar"/> + <include name="**/saaj-api.jar"/> <include name="**/jbossws-spi.jar"/> </patternset> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-01-13 11:46:29 UTC (rev 11393) @@ -1 +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/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common! .jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standar! d/deployers/jbossws.deployer/META-INF/standard-*-config.xml +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/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-factories.jar common/lib/jaxws-api.jar common/lib/jsr181-! api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/s! tandard/deployers/jbossws.deployer/META-INF/jbossws-container-! jboss-be ans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -7,40 +7,25 @@ <!-- ============================================================ --> <project> - + <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> + <!-- Generating sources --> + <!-- ================================================================== --> - <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts"> + <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts"> - <!-- Define the JAX-WS wsconsume task --> - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> <pathelement path="${wsconsume.classpath}"/> </classpath> </taskdef> - <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> - </target> - - <!-- - wsconsume cannot run with jaxws-api from build output - http://jira.jboss.org/jira/browse/JBWS-2175 - --> - <target name="available-jars"> - <property name="jaxws.ext.jar" value="${basedir}/../../jaxws-ext/target/jbossws-native-jaxws-ext-${project.version}.jar"/> - <available property="jaxws.ext.jar.available" file="${jaxws.ext.jar}"/> - <echo message="jaxws.ext.jar.available=${jaxws.ext.jar.available}"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> </target> - - <target name="prepend-jars" depends="available-jars,prepend-jaxws-ext"> + + <target name="prepend-jars"> <property name="wsconsume.classpath" value="${maven.test.classpath}"/> </target> - - <target name="prepend-jaxws-ext" if="jaxws.ext.jar.available"> - <property name="wsconsume.classpath" value="${jaxws.ext.jar}:${maven.test.classpath}"/> - </target> - + </project> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -7,20 +7,19 @@ <!-- ============================================================ --> <project> - + <!-- ================================================================== --> <!-- Generating sources --> <!-- ================================================================== --> - + <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts"> - - <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> <pathelement path="${wsconsume.classpath}"/> </classpath> </taskdef> - + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> @@ -29,23 +28,9 @@ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> </target> - - <!-- - wsconsume cannot run with jaxws-api from build output - http://jira.jboss.org/jira/browse/JBWS-2175 - --> - <target name="available-jars"> - <property name="jaxws.ext.jar" value="${basedir}/../../jaxws-ext/target/jbossws-native-jaxws-ext-${project.version}.jar"/> - <available property="jaxws.ext.jar.available" file="${jaxws.ext.jar}"/> - <echo message="jaxws.ext.jar.available=${jaxws.ext.jar.available}"/> - </target> - - <target name="prepend-jars" depends="available-jars,prepend-jaxws-ext"> + + <target name="prepend-jars"> <property name="wsconsume.classpath" value="${maven.test.classpath}"/> </target> - - <target name="prepend-jaxws-ext" if="jaxws.ext.jar.available"> - <property name="wsconsume.classpath" value="${jaxws.ext.jar}:${maven.test.classpath}"/> - </target> - + </project> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/HelloJavaBean.java 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/HelloJavaBean.java 2010-01-13 11:46:29 UTC (rev 11393) @@ -48,7 +48,7 @@ log.info("soapAction: " + Arrays.asList(soapAction)); String retStr; - if (soapAction != null && soapAction.length == 1 && soapAction[0].equals("\"/foo/bar\"")) + if (soapAction != null && soapAction.length == 1 && soapAction[0].equals("/foo/bar")) { retStr = "[pass]"; } Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/pom.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -35,10 +35,7 @@ <!-- Modules --> <modules> - <module>modules/saaj</module> - <module>modules/jaxrpc</module> - <module>modules/jaxws</module> - <module>modules/jaxws-ext</module> + <module>modules/endorsed</module> <module>modules/core</module> <module>modules/client</module> <module>modules/management</module> @@ -63,6 +60,8 @@ <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.6.0.GA</javassist.version> <jaxws.api.version>2.1</jaxws.api.version> + <jaxrpc.api.version>1.1</jaxrpc.api.version> + <saaj.api.version>1.3</saaj.api.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.12</jaxb.impl.version> @@ -273,6 +272,28 @@ </exclusions> </dependency> <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>${jaxrpc.api.version}</version> + <exclusions> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>${saaj.api.version}</version> + <exclusions> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>${jaxb.api.version}</version> Modified: stack/native/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/native/trunk/src/main/distro/build-project-gen.xml 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/src/main/distro/build-project-gen.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -111,10 +111,9 @@ <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jbossws-common.jar"/> <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jbossws-native-jaxrpc.jar"/> - <pathelement location="${jboss.client}/jbossws-native-jaxws.jar"/> - <pathelement location="${jboss.client}/jbossws-native-jaxws-ext.jar"/> - <pathelement location="${jboss.client}/jbossws-native-saaj.jar"/> + <pathelement location="${jboss.client}/jaxrpc-api.jar"/> + <pathelement location="${jboss.client}/saaj-api.jar"/> + <pathelement location="${jboss.client}/jbossws-native-factories.jar"/> <pathelement location="${jboss.client}/jbossws-native-core.jar"/> <pathelement location="${jboss.client}/jbossws-native-client.jar"/> <path refid="integration.target.javac.classpath" /> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/src/main/distro/build.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -70,9 +70,8 @@ <path id="ws.stack.classpath"> <!-- Move the native API to the front of the classpath --> - <pathelement location="${thirdparty.dir}/jbossws-native-jaxws-ext.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-native-jaxrpc.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-native-saaj.jar"/> + <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> <fileset dir="${thirdparty.dir}"> <exclude name="**/jbossws-jboss*.jar"/> </fileset> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-01-13 10:48:32 UTC (rev 11392) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-01-13 11:46:29 UTC (rev 11393) @@ -43,10 +43,9 @@ <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> - <include>org.jboss.ws.native:jbossws-native-jaxrpc:jar</include> - <include>org.jboss.ws.native:jbossws-native-jaxws:jar</include> - <include>org.jboss.ws.native:jbossws-native-jaxws-ext:jar</include> - <include>org.jboss.ws.native:jbossws-native-saaj:jar</include> + <include>javax.xml:jaxrpc-api:jar</include> + <include>org.jboss.ws.native:jbossws-native-factories:jar</include> + <include>javax.xml.soap:saaj-api:jar</include> <include>org.codehaus.jettison:jettison:jar</include> <include>wscommons-policy:policy:jar</include> <include>stax:stax-api:jar</include>