September 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4653 - in stack/native/branches/jbossws-native-2.0.1.CP: ant-import and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-29 07:07:26 -0400 (Sat, 29 Sep 2007) New Revision: 4653 Added: stack/native/branches/jbossws-native-2.0.1.CP/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl Removed: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl Modified: stack/native/branches/jbossws-native-2.0.1.CP/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.CP/ant-import-tests/build-testsuite.xml stack/native/branches/jbossws-native-2.0.1.CP/ant-import/build-thirdparty.xml stack/native/branches/jbossws-native-2.0.1.CP/build.xml stack/native/branches/jbossws-native-2.0.1.CP/src/main/resources/jbossws-native-config.xml stack/native/branches/jbossws-native-2.0.1.CP/version.properties Log: Merge changes up to 2.0.1.SP1 Modified: stack/native/branches/jbossws-native-2.0.1.CP/ant-import/build-thirdparty.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/ant-import/build-thirdparty.xml 2007-09-29 10:57:09 UTC (rev 4652) +++ stack/native/branches/jbossws-native-2.0.1.CP/ant-import/build-thirdparty.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -90,6 +90,7 @@ <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jaxbintros/${jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> @@ -167,6 +168,7 @@ <pathelement location="${thirdparty.dir}/xalan.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> + <pathelement location="${thirdparty.dir}/jboss-jaxb-intros.jar"/> </path> </target> Modified: stack/native/branches/jbossws-native-2.0.1.CP/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/ant-import-tests/build-jars-jaxws.xml 2007-09-29 10:57:09 UTC (rev 4652) +++ stack/native/branches/jbossws-native-2.0.1.CP/ant-import-tests/build-jars-jaxws.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -119,7 +119,19 @@ </classes> </war> -  +  + <war warfile="${tests.output.dir}/libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/resources/jaxws/jaxbintros/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jaxbintros/**/*.class"/> + </classes> + + <webinf dir="${tests.output.dir}/resources/jaxws/jaxbintros/WEB-INF"> + <include name="*.xml"/> + <include name="**/*.wsdl"/> + </webinf> + </war> + +  <jar destfile="${tests.output.dir}/libs/jaxws-jbws771.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws771/*.class"/> Modified: stack/native/branches/jbossws-native-2.0.1.CP/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/ant-import-tests/build-testsuite.xml 2007-09-29 10:57:09 UTC (rev 4652) +++ stack/native/branches/jbossws-native-2.0.1.CP/ant-import-tests/build-testsuite.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -46,6 +46,7 @@ <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> <pathelement location="${core.dir}/thirdparty/wstx.jar"/> <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/> </path>  Modified: stack/native/branches/jbossws-native-2.0.1.CP/build.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/build.xml 2007-09-29 10:57:09 UTC (rev 4652) +++ stack/native/branches/jbossws-native-2.0.1.CP/build.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -233,6 +233,7 @@ <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> <include name="wstx.jar"/> + <include name="jboss-jaxb-intros.jar"/> </fileset> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> @@ -281,6 +282,7 @@ <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> <include name="wstx.jar"/> + <include name="jboss-jaxb-intros.jar"/> </fileset> <fileset dir="${core.output.lib.dir}/jbossws-native42"> <include name="jbossws.beans/**"/> @@ -328,6 +330,7 @@ <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> <include name="wstx.jar"/> + <include name="jboss-jaxb-intros.jar"/> </fileset> <fileset dir="${core.output.lib.dir}/jbossws-native40"> <include name="jbossws.beans/**"/> Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.jbws; + +import com.sun.xml.bind.api.JAXBRIContext; +import org.jboss.jaxb.intros.IntroductionsAnnotationReader; +import org.jboss.jaxb.intros.IntroductionsConfigParser; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import org.jboss.logging.Logger; +import org.jboss.ws.core.jaxws.JAXBBindingCustomization; +import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; + +import java.io.IOException; +import java.io.InputStream; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JAXBIntroDeploymentAspect extends DeploymentAspect +{ + private static Logger logger = Logger.getLogger(JAXBIntroDeploymentAspect.class); + + public void create(Deployment deployment) + { + + InputStream introsConfigStream = null; + + try { // META-INF first + ClassLoader classLoader = deployment.getRuntimeClassLoader(); + introsConfigStream = classLoader.getResource("META-INF/jaxb-intros.xml").openStream(); + } catch (Exception e) {} + + if(null == introsConfigStream) + { + try { // WEB-INF second + + ClassLoader classLoader = deployment.getRuntimeClassLoader(); + introsConfigStream = classLoader.getResource("WEB-INF/jaxb-intros.xml").openStream(); + } catch (Exception e) { + return; + } + } + + try { + if(introsConfigStream != null) { + JaxbIntros jaxbIntros = IntroductionsConfigParser.parseConfig(introsConfigStream); + IntroductionsAnnotationReader annotationReader = new IntroductionsAnnotationReader(jaxbIntros); + String defaultNamespace = jaxbIntros.getDefaultNamespace(); + BindingCustomization jaxbCustomizations = new JAXBBindingCustomization(); + + jaxbCustomizations.put(JAXBRIContext.ANNOTATION_READER, annotationReader); + if(defaultNamespace != null) { + jaxbCustomizations.put(JAXBRIContext.DEFAULT_NAMESPACE_REMAP, defaultNamespace); + } + + // ServerEndpointMetaData#getBindingCustomization becomes the consumer later on + for(Endpoint endpoint : deployment.getService().getEndpoints()) + { + endpoint.addAttachment(BindingCustomization.class, jaxbCustomizations); + } + + } + } finally { + if(introsConfigStream != null) { + try { + introsConfigStream.close(); + } catch (IOException e) { + logger.error("[" + deployment.getService().getContextRoot() + "] Error closing JAXB Introductions Configurations stream ", e); + } + } + } + } +} Modified: stack/native/branches/jbossws-native-2.0.1.CP/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/main/resources/jbossws-native-config.xml 2007-09-29 10:57:09 UTC (rev 4652) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/main/resources/jbossws-native-config.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -73,8 +73,12 @@ <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot</property> <property name="provides">UnifiedMetaDataModel</property> </bean> - -  + + <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel, RuntimeLoader</property> + </bean> + +   <bean name="WSNativeDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> @@ -98,6 +102,7 @@ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSJAXBIntroDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerPostJSE</depends> @@ -115,6 +120,7 @@ <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + <inject bean="WSJAXBIntroDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerEJB</depends> @@ -132,6 +138,7 @@ <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + <inject bean="WSJAXBIntroDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerEndpointAPI</depends> Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros) Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,116 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jaxbintros; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.namespace.QName; - -/** - * <p>Java class for UserType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="UserType"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="string" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="qname" type="{http://www.w3.org/2001/XMLSchema}QName"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -@XmlRootElement(namespace = "http://org.jboss.ws/provider", name = "user") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "UserType", propOrder = { "string", "qname" }) -public class AnnotatedUserType -{ - - @XmlAttribute(required = true) - protected String string; - @XmlElement(required = true) - protected QName qname; - - /** - * Gets the value of the string property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getString() - { - return string; - } - - /** - * Sets the value of the string property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setString(String value) - { - this.string = value; - } - - /** - * Gets the value of the qname property. - * - * @return - * possible object is - * {@link javax.xml.namespace.QName } - * - */ - public QName getQname() - { - return qname; - } - - /** - * Sets the value of the qname property. - * - * @param value - * allowed object is - * {@link javax.xml.namespace.QName } - * - */ - public void setQname(QName value) - { - this.qname = value; - } - -} - Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotatedUserType.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,116 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jaxbintros; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.namespace.QName; + +/** + * <p>Java class for UserType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="UserType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="string" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="qname" type="{http://www.w3.org/2001/XMLSchema}QName"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlRootElement(namespace = "http://org.jboss.ws/provider", name = "user") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "UserType", propOrder = { "string", "qname" }) +public class AnnotatedUserType +{ + + @XmlAttribute(required = true) + protected String string; + @XmlElement(required = true) + protected QName qname; + + /** + * Gets the value of the string property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getString() + { + return string; + } + + /** + * Sets the value of the string property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setString(String value) + { + this.string = value; + } + + /** + * Gets the value of the qname property. + * + * @return + * possible object is + * {@link javax.xml.namespace.QName } + * + */ + public QName getQname() + { + return qname; + } + + /** + * Sets the value of the qname property. + * + * @param value + * allowed object is + * {@link javax.xml.namespace.QName } + * + */ + public void setQname(QName value) + { + this.qname = value; + } + +} + Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jaxbintros; - -import com.sun.xml.bind.api.JAXBRIContext; -import junit.framework.TestCase; -import org.jboss.jaxb.intros.IntroductionsAnnotationReader; -import org.jboss.jaxb.intros.IntroductionsConfigParser; -import org.jboss.jaxb.intros.configmodel.JaxbIntros; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; -import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.util.HashMap; -import java.util.Map; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class AnnotationReaderTestCase extends TestCase -{ - public void testUnmarshal() throws Exception - { - String reqString = - " <ns1:user xmlns:ns1='http://org.jboss.ws/provider' string='Kermit'>" + - " <qname>The Frog</qname>" + - " </ns1:user>"; - - JaxbIntros config = IntroductionsConfigParser.parseConfig( - new FileInputStream("resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml") - ); - - IntroductionsAnnotationReader reader = new IntroductionsAnnotationReader(config); - Map<String, Object> jaxbConfig = new HashMap<String, Object>(); - - jaxbConfig.put(JAXBRIContext.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.ws/provider"); - jaxbConfig.put(JAXBRIContext.ANNOTATION_READER, reader); - - JAXBContext jaxbContext = JAXBContext.newInstance(new Class[] {UserType.class}, jaxbConfig); - Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); - - JAXBElement jbe = unmarshaller.unmarshal( - new StreamSource( - new ByteArrayInputStream(reqString.getBytes()) - - ), UserType.class - ); - - UserType ut = (UserType)jbe.getValue(); - assertEquals("Kermit", ut.getString()); - assertEquals("The Frog", ut.getQname().getLocalPart()); - - } -} Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jaxbintros; + +import com.sun.xml.bind.api.JAXBRIContext; +import junit.framework.TestCase; +import org.jboss.jaxb.intros.IntroductionsAnnotationReader; +import org.jboss.jaxb.intros.IntroductionsConfigParser; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.stream.StreamSource; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class AnnotationReaderTestCase extends TestCase +{ + public void testUnmarshal() throws Exception + { + String reqString = + " <ns1:user xmlns:ns1='http://org.jboss.ws/provider' string='Kermit'>" + + " <qname>The Frog</qname>" + + " </ns1:user>"; + + JaxbIntros config = IntroductionsConfigParser.parseConfig( + new FileInputStream("resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml") + ); + + IntroductionsAnnotationReader reader = new IntroductionsAnnotationReader(config); + Map<String, Object> jaxbConfig = new HashMap<String, Object>(); + + jaxbConfig.put(JAXBRIContext.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.ws/provider"); + jaxbConfig.put(JAXBRIContext.ANNOTATION_READER, reader); + + JAXBContext jaxbContext = JAXBContext.newInstance(new Class[] {UserType.class}, jaxbConfig); + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + + JAXBElement jbe = unmarshaller.unmarshal( + new StreamSource( + new ByteArrayInputStream(reqString.getBytes()) + + ), UserType.class + ); + + UserType ut = (UserType)jbe.getValue(); + assertEquals("Kermit", ut.getString()); + assertEquals("The Frog", ut.getQname().getLocalPart()); + + } +} Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,93 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jaxbintros; - -import junit.framework.Test; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Element; - -import javax.xml.bind.JAXBContext; -import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; -import javax.xml.transform.dom.DOMSource; -import java.io.ByteArrayInputStream; -import java.net.URL; - -/** - * Test the JAXBIntroduction features. - * - * jaxb-intros.xml can reside under META-INF or WEB-INF and should be - * picked up by JAXBIntroduction deployment aspect. - * - * On the server side the default JAXBContextFactory takes it into consideration. - * The client side is still missing this feature. - * - * @author heiko.braun(a)jboss.com - */ -public class JAXBIntroTestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JAXBIntroTestCase.class, "jaxws-jaxbintros.war"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jaxbintros/ProviderEndpoint?wsdl"); - Element wsdl = DOMUtils.parse(wsdlURL.openStream()); - assertNotNull(wsdl); - } - - public void testProviderMessage() throws Exception - { - String reqString = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <ns1:user xmlns:ns1='http://org.jboss.ws/provider' string='Kermit'>" + - " <qname>The Frog</qname>" + - " </ns1:user>" + - " </env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqString.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-jaxbintros/ProviderEndpoint"); - SOAPMessage resMsg = con.call(reqMsg, epURL); - SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - - Element child = (Element)resEnv.getBody().getChildElements().next(); - JAXBContext jc = JAXBContext.newInstance(new Class[]{AnnotatedUserType.class}); - AnnotatedUserType user = (AnnotatedUserType)jc.createUnmarshaller().unmarshal(new DOMSource(child)); - - assertEquals("Kermit", user.getString()); - assertEquals(new QName("The Frog"), user.getQname()); - } -} Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/JAXBIntroTestCase.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jaxbintros; + +import junit.framework.Test; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; + +import javax.xml.bind.JAXBContext; +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.dom.DOMSource; +import java.io.ByteArrayInputStream; +import java.net.URL; + +/** + * Test the JAXBIntroduction features. + * + * jaxb-intros.xml can reside under META-INF or WEB-INF and should be + * picked up by JAXBIntroduction deployment aspect. + * + * On the server side the default JAXBContextFactory takes it into consideration. + * The client side is still missing this feature. + * + * @author heiko.braun(a)jboss.com + */ +public class JAXBIntroTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JAXBIntroTestCase.class, "jaxws-jaxbintros.war"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jaxbintros/ProviderEndpoint?wsdl"); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); + } + + public void testProviderMessage() throws Exception + { + String reqString = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <ns1:user xmlns:ns1='http://org.jboss.ws/provider' string='Kermit'>" + + " <qname>The Frog</qname>" + + " </ns1:user>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqString.getBytes())); + + URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-jaxbintros/ProviderEndpoint"); + SOAPMessage resMsg = con.call(reqMsg, epURL); + SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); + + Element child = (Element)resEnv.getBody().getChildElements().next(); + JAXBContext jc = JAXBContext.newInstance(new Class[]{AnnotatedUserType.class}); + AnnotatedUserType user = (AnnotatedUserType)jc.createUnmarshaller().unmarshal(new DOMSource(child)); + + assertEquals("Kermit", user.getString()); + assertEquals(new QName("The Frog"), user.getQname()); + } +} Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jaxbintros; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.JAXBContextFactory; -import org.jboss.wsf.common.DOMWriter; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.util.JAXBSource; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.ws.Provider; -import javax.xml.ws.Service; -import javax.xml.ws.ServiceMode; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.WebServiceProvider; - -/** - * Test the JAXBBindingCustomization that rely on JAXBIntrodcutions - * - * @author heiko.braun(a)jboss.com - */ -@WebServiceProvider(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/provider", wsdlLocation = "WEB-INF/wsdl/Provider.wsdl") -@ServiceMode(value = Service.Mode.PAYLOAD) -public class ProviderBeanJAXB implements Provider<Source> -{ - // provide logging - private static Logger log = Logger.getLogger(ProviderBeanJAXB.class); - - public Source invoke(Source request) - { - try - { - DOMSource dsource = (DOMSource)request; - String payload = DOMWriter.printNode(dsource.getNode(), true); - - System.out.println("Payload: \n" + payload); - - // defaults to CustomizableJAXBContextFactory, which takes BindingCustomizations into consideration - JAXBContext jc = JAXBContextFactory.newInstance().createContext(new Class[] { UserType.class }); - Unmarshaller unmarshaller = jc.createUnmarshaller(); - JAXBElement jbe = unmarshaller.unmarshal(request, UserType.class); - UserType user = (UserType)jbe.getValue(); - - log.info("[string=" + user.getString() + ",qname=" + user.getQname() + "]"); - - return new JAXBSource(jc, user); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new WebServiceException(e); - } - } -} Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/ProviderBeanJAXB.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jaxbintros; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.jaxws.JAXBContextFactory; +import org.jboss.wsf.common.DOMWriter; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.util.JAXBSource; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.Provider; +import javax.xml.ws.Service; +import javax.xml.ws.ServiceMode; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceProvider; + +/** + * Test the JAXBBindingCustomization that rely on JAXBIntrodcutions + * + * @author heiko.braun(a)jboss.com + */ +@WebServiceProvider(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/provider", wsdlLocation = "WEB-INF/wsdl/Provider.wsdl") +@ServiceMode(value = Service.Mode.PAYLOAD) +public class ProviderBeanJAXB implements Provider<Source> +{ + // provide logging + private static Logger log = Logger.getLogger(ProviderBeanJAXB.class); + + public Source invoke(Source request) + { + try + { + DOMSource dsource = (DOMSource)request; + String payload = DOMWriter.printNode(dsource.getNode(), true); + + System.out.println("Payload: \n" + payload); + + // defaults to CustomizableJAXBContextFactory, which takes BindingCustomizations into consideration + JAXBContext jc = JAXBContextFactory.newInstance().createContext(new Class[] { UserType.class }); + Unmarshaller unmarshaller = jc.createUnmarshaller(); + JAXBElement jbe = unmarshaller.unmarshal(request, UserType.class); + UserType user = (UserType)jbe.getValue(); + + log.info("[string=" + user.getString() + ",qname=" + user.getQname() + "]"); + + return new JAXBSource(jc, user); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new WebServiceException(e); + } + } +} Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jaxbintros; - -import javax.xml.namespace.QName; - -/** - * <p>Java class for UserType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="UserType"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="string" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="qname" type="{http://www.w3.org/2001/XMLSchema}QName"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -public class UserType -{ - protected String string; - - protected QName qname; - - /** - * Gets the value of the string property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getString() - { - return string; - } - - /** - * Sets the value of the string property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setString(String value) - { - this.string = value; - } - - /** - * Gets the value of the qname property. - * - * @return - * possible object is - * {@link javax.xml.namespace.QName } - * - */ - public QName getQname() - { - return qname; - } - - /** - * Sets the value of the qname property. - * - * @param value - * allowed object is - * {@link javax.xml.namespace.QName } - * - */ - public void setQname(QName value) - { - this.qname = value; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/UserType.java 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jaxbintros; + +import javax.xml.namespace.QName; + +/** + * <p>Java class for UserType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="UserType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="string" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="qname" type="{http://www.w3.org/2001/XMLSchema}QName"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class UserType +{ + protected String string; + + protected QName qname; + + /** + * Gets the value of the string property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getString() + { + return string; + } + + /** + * Sets the value of the string property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setString(String value) + { + this.string = value; + } + + /** + * Gets the value of the qname property. + * + * @return + * possible object is + * {@link javax.xml.namespace.QName } + * + */ + public QName getQname() + { + return qname; + } + + /** + * Sets the value of the qname property. + * + * @param value + * allowed object is + * {@link javax.xml.namespace.QName } + * + */ + public void setQname(QName value) + { + this.qname = value; + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros) Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,43 +0,0 @@ -<?xml version='1.0'?> -<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='user' type='tns:UserType'/> - <xs:complexType name='UserType'> - <xs:sequence> - <xs:element name='string' type='xs:string'/> - <xs:element name='qname' type='xs:QName'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='echo'> - <part element='tns:user' name='user'/> - </message> - <message name='echoResponse'> - <part element='tns:user' name='user'/> - </message> - <portType name='Provider'> - <operation name='echo'> - <input message='tns:echo'/> - <output message='tns:echoResponse'/> - </operation> - </portType> - <binding name='ProviderBinding' type='tns:Provider'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='ProviderService'> - <port binding='tns:ProviderBinding' name='ProviderPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/Provider.wsdl 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,43 @@ +<?xml version='1.0'?> +<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='user' type='tns:UserType'/> + <xs:complexType name='UserType'> + <xs:sequence> + <xs:element name='string' type='xs:string'/> + <xs:element name='qname' type='xs:QName'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='echo'> + <part element='tns:user' name='user'/> + </message> + <message name='echoResponse'> + <part element='tns:user' name='user'/> + </message> + <portType name='Provider'> + <operation name='echo'> + <input message='tns:echo'/> + <output message='tns:echoResponse'/> + </operation> + </portType> + <binding name='ProviderBinding' type='tns:Provider'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='ProviderService'> + <port binding='tns:ProviderBinding' name='ProviderPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,33 +0,0 @@ -<?xml version = "1.0" encoding = "UTF-8"?> -<jaxb-intros xmlns="http://www.jboss.org/xsd/jaxb/intros" default-namespace="http://org.jboss.ws/provider"> - -  - -  - -  - -  - <Class name="org.jboss.test.ws.jaxws.jaxbintros.UserType"> - <XmlAccessorType value="FIELD"/> - <XmlRootElement name="user" namespace="http://org.jboss.ws/provider"/> - - <Field name="string"> - <XmlAttribute /> - </Field> - </Class> - -</jaxb-intros> Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,33 @@ +<?xml version = "1.0" encoding = "UTF-8"?> +<jaxb-intros xmlns="http://www.jboss.org/xsd/jaxb/intros" default-namespace="http://org.jboss.ws/provider"> + +  + +  + +  + +  + <Class name="org.jboss.test.ws.jaxws.jaxbintros.UserType"> + <XmlAccessorType value="FIELD"/> + <XmlRootElement name="user" namespace="http://org.jboss.ws/provider"/> + + <Field name="string"> + <XmlAttribute /> + </Field> + </Class> + +</jaxb-intros> Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>ProviderEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jaxbintros.ProviderBeanJAXB</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ProviderEndpoint</servlet-name> - <url-pattern>/ProviderEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/web.xml 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>ProviderEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jaxbintros.ProviderBeanJAXB</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ProviderEndpoint</servlet-name> + <url-pattern>/ProviderEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl) Deleted: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl 2007-09-24 09:37:52 UTC (rev 4614) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl 2007-09-29 11:07:26 UTC (rev 4653) @@ -1,43 +0,0 @@ -<?xml version='1.0'?> -<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='user' type='tns:UserType'/> - <xs:complexType name='UserType'> - <xs:sequence> - <xs:element name='string' type='xs:string'/> - <xs:element name='qname' type='xs:QName'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='echo'> - <part element='tns:user' name='user'/> - </message> - <message name='echoResponse'> - <part element='tns:user' name='user'/> - </message> - <portType name='Provider'> - <operation name='echo'> - <input message='tns:echo'/> - <output message='tns:echoResponse'/> - </operation> - </portType> - <binding name='ProviderBinding' type='tns:Provider'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='ProviderService'> - <port binding='tns:ProviderBinding' name='ProviderPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> Copied: stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl (from rev 4614, stack/native/tags/jbossws-native-2.0.1.SP1/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.CP/src/test/resources/jaxws/jaxbintros/WEB-INF/wsdl/Provider.wsdl 2007-09-29 11:07:26 UTC (rev 4653) @@ -0,0 +1,43 @@ +<?xml version='1.0'?> +<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='user' type='tns:UserType'/> + <xs:complexType name='UserType'> + <xs:sequence> + <xs:element name='string' type='xs:string'/> + <xs:element name='qname' type='xs:QName'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='echo'> + <part element='tns:user' name='user'/> + </message> + <message name='echoResponse'> + <part element='tns:user' name='user'/> + </message> + <portType name='Provider'> + <operation name='echo'> + <input message='tns:echo'/> + <output message='tns:echoResponse'/> + </operation> + </portType> + <binding name='ProviderBinding' type='tns:Provider'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='ProviderService'> + <port binding='tns:ProviderBinding' name='ProviderPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> Modified: stack/native/branches/jbossws-native-2.0.1.CP/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.CP/version.properties 2007-09-29 10:57:09 UTC (rev 4652) +++ stack/native/branches/jbossws-native-2.0.1.CP/version.properties 2007-09-29 11:07:26 UTC (rev 4653) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.GA -repository.id=2.0.1.GA +version.id=2.0.1.SP1 +repository.id=2.0.1.SP1 implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws @@ -33,7 +33,7 @@ # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR4 -jboss-remoting-jboss50=2.2.0.SP4 +jboss-remoting-jboss50=2.2.2.SP1 # JBossAS-4.2 jboss-jbossxb-jboss42=1.0.0.CR11 @@ -66,6 +66,7 @@ jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.2.0.GA +jaxbintros=1.0.0.beta2 junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4652 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-29 06:57:09 -0400 (Sat, 29 Sep 2007) New Revision: 4652 Added: stack/native/branches/jbossws-native-2.0.1.CP/ Log: Copy 2.0.1.GA to 2.0.1.CP Copied: stack/native/branches/jbossws-native-2.0.1.CP (from rev 4651, stack/native/tags/jbossws-native-2.0.1.GA)

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4651 - in stack/native/trunk: ant-import and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-09-28 10:46:13 -0400 (Fri, 28 Sep 2007) New Revision: 4651 Added: stack/native/trunk/src/main/resources/jboss-jaxws-ext.jar/ stack/native/trunk/src/main/resources/jboss-jaxws-ext.jar/META-INF/ Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-release.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/build.xml Log: Move jax-ws extensions to seperate jar (jboss-jaxws-ext.jar). It's necessary to endorse these API's for JDK 6 Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2007-09-28 13:52:42 UTC (rev 4650) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2007-09-28 14:46:13 UTC (rev 4651) @@ -97,7 +97,8 @@ </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2007-09-28 13:52:42 UTC (rev 4650) +++ stack/native/trunk/ant-import/build-release.xml 2007-09-28 14:46:13 UTC (rev 4651) @@ -47,7 +47,8 @@ <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-core-src.zip"/> <include name="jbossws-core-scripts.zip"/> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-09-28 13:52:42 UTC (rev 4650) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-09-28 14:46:13 UTC (rev 4651) @@ -32,6 +32,7 @@ <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> @@ -59,6 +60,7 @@ <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> </fileset> </copy> @@ -92,6 +94,7 @@ <include name="jaxws-rt.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> <include name="policy.jar"/> @@ -106,6 +109,7 @@ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/>  <include name="jbossws-integration.jar"/> @@ -132,6 +136,7 @@ <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> @@ -191,6 +196,7 @@ <include name="jaxws-rt.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-jboss42.jar"/> @@ -214,6 +220,7 @@ <include name="jbossws-jboss42.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/>  <include name="jbossws-integration.jar"/> @@ -239,6 +246,7 @@ <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> @@ -270,6 +278,7 @@ <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> </fileset> <fileset dir="@{thirdpartylibs}"> @@ -324,6 +333,7 @@ <include name="jaxws-rt.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-jboss40.jar"/> @@ -346,6 +356,7 @@ <include name="jbossws-jboss40.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> </fileset> </delete> @@ -369,6 +380,7 @@ <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> </fileset> </copy> @@ -384,6 +396,7 @@ <include name="jaxb-api.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> </fileset> </delete> Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-09-28 13:52:42 UTC (rev 4650) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-09-28 14:46:13 UTC (rev 4651) @@ -31,7 +31,8 @@ <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws-ext.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2007-09-28 13:52:42 UTC (rev 4650) +++ stack/native/trunk/build.xml 2007-09-28 14:46:13 UTC (rev 4651) @@ -13,169 +13,149 @@ <project default="main" basedir="." name="JBossWS-Native"> - <property name="core.dir" value="${basedir}"/> - - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-bin-dist.xml"/> - <import file="${basedir}/ant-import/build-deploy.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> + <property name="core.dir" value="${basedir}"/> - <property name="core.src.dir" value="${core.dir}/src/main"/> - <property name="core.etc.dir" value="${core.src.dir}/etc"/> - <property name="core.distro.dir" value="${core.src.dir}/distro"/> - <property name="core.java.dir" value="${core.src.dir}/java"/> - <property name="core.resources.dir" value="${core.src.dir}/resources"/> - <property name="core.output.dir" value="${core.dir}/output"/> - <property name="core.output.apidocs.dir" value="${core.output.dir}/apidocs"/> - <property name="core.output.etc.dir" value="${core.output.dir}/etc"/> - <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> - <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> - <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> + <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-bin-dist.xml"/> + <import file="${basedir}/ant-import/build-deploy.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> - <target name="init" depends="prepare,thirdparty"> - </target> + <property name="core.src.dir" value="${core.dir}/src/main"/> + <property name="core.etc.dir" value="${core.src.dir}/etc"/> + <property name="core.distro.dir" value="${core.src.dir}/distro"/> + <property name="core.java.dir" value="${core.src.dir}/java"/> + <property name="core.resources.dir" value="${core.src.dir}/resources"/> + <property name="core.output.dir" value="${core.dir}/output"/> + <property name="core.output.apidocs.dir" value="${core.output.dir}/apidocs"/> + <property name="core.output.etc.dir" value="${core.output.dir}/etc"/> + <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> + <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> + <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> -  -  -  + <target name="init" depends="prepare,thirdparty"> + </target> -  +  +  +  - <target name="compile" depends="init,compile-classes,compile-etc" - description="Compile all source files."/> +  -  - <target name="compile-classes" depends="init"> + <target name="compile" depends="init,compile-classes,compile-etc" + description="Compile all source files."/> -  - <mkdir dir="${core.output.classes14.dir}"/> - <javac srcdir="${core.java.dir}" destdir="${core.output.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" source="1.4" target="1.4"> - <include name="javax/xml/rpc/**"/> - <include name="javax/xml/soap/**"/> - <classpath refid="thirdparty.classpath"/> - </javac> +  + <target name="compile-classes" depends="init"> -  - <mkdir dir="${core.output.classes.dir}"/> - <javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> - <include name="javax/annotation/**"/> - <include name="javax/xml/ws/**"/> - <include name="javax/jws/**"/> - <include name="org/jboss/annotation/**"/> - <include name="org/jboss/ws/**"/> +  + <mkdir dir="${core.output.classes14.dir}"/> + <javac srcdir="${core.java.dir}" destdir="${core.output.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" source="1.4" target="1.4"> + <include name="javax/xml/rpc/**"/> + <include name="javax/xml/soap/**"/> + <classpath refid="thirdparty.classpath"/> + </javac> + +  + <mkdir dir="${core.output.classes.dir}"/> + <javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> + <include name="javax/annotation/**"/> + <include name="javax/xml/ws/**"/> + <include name="javax/jws/**"/> + <include name="org/jboss/annotation/**"/> + <include name="org/jboss/ws/**"/> <include name="org/jboss/wsf/stack/jbws/**"/> - <classpath path="${core.output.classes14.dir}"/> - <classpath refid="thirdparty.classpath"/> - </javac> - </target> + <classpath path="${core.output.classes14.dir}"/> + <classpath refid="thirdparty.classpath"/> + </javac> + </target> -  - <target name="compile-etc" depends="init"> - <mkdir dir="${core.output.etc.dir}"/> - <copy todir="${core.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${core.etc.dir}"/> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-native-${version.id}"/> - <filtersfile file="${core.dir}/version.properties"/> - </filterset> - </copy> - </target> - -  -  -  +  + <target name="compile-etc" depends="init"> + <mkdir dir="${core.output.etc.dir}"/> + <copy todir="${core.output.etc.dir}" filtering="yes" overwrite="true"> + <fileset dir="${core.etc.dir}"/> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-native-${version.id}"/> + <filtersfile file="${core.dir}/version.properties"/> + </filterset> + </copy> + </target> -  - <target name="jars" depends="compile,jars-jboss40,jars-jboss42,jars-jboss50" description="Builds all jar files."> - </target> +  +  +  -  - <target name="jars-common" depends="compile"> +  + <target name="jars" depends="compile,jars-jboss40,jars-jboss42,jars-jboss50" description="Builds all jar files."> + </target> -  - <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.classes14.dir}"> - <include name="javax/xml/rpc/**"/> - </fileset> - </jar> +  + <target name="jars-common" depends="compile"> -  - <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.classes14.dir}"> - <include name="javax/xml/soap/**"/> - </fileset> - <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/> - </jar> +  + <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.classes14.dir}"> + <include name="javax/xml/rpc/**"/> + </fileset> + </jar> -  +  <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.classes14.dir}"> + <include name="javax/xml/soap/**"/> + </fileset> + <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/> + </jar> + +  + <mkdir dir="${core.output.lib.dir}"/> <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> - <include name="javax/annotation/**"/> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> - <exclude name="javax/xml/ws/**/*21.class"/> - <exclude name="javax/xml/ws/Action.class"/> - <exclude name="javax/xml/ws/EndpointReference.class"/> - <exclude name="javax/xml/ws/FaultAction.class"/> - <exclude name="javax/xml/ws/RespectBinding.class"/> - <exclude name="javax/xml/ws/RespectBindingFeature.class"/> - <exclude name="javax/xml/ws/WebServiceFeature.class"/> - <exclude name="javax/xml/ws/spi/WebServiceFeatureAnnotation.class"/> - <exclude name="javax/xml/ws/soap/MTOMFeature.class"/> - <exclude name="javax/xml/ws/soap/AddressingFeature.class"/> - <exclude name="javax/xml/ws/addressing/**"/> - <exclude name="javax/xml/ws/soap/Addressing.class"/> - <exclude name="javax/xml/ws/soap/MTOM.class"/> - <exclude name="javax/xml/ws/soap/MTOMFeature.class"/> - <exclude name="javax/xml/ws/wsaddressing/**"/> + <include name="javax/annotation/**"/> + <include name="javax/jws/**"/> + <include name="javax/xml/ws/**"/> + <exclude name="javax/xml/ws/**/*21.class"/> + <exclude name="javax/xml/ws/Action.class"/> + <exclude name="javax/xml/ws/EndpointReference.class"/> + <exclude name="javax/xml/ws/FaultAction.class"/> + <exclude name="javax/xml/ws/RespectBinding.class"/> + <exclude name="javax/xml/ws/RespectBindingFeature.class"/> + <exclude name="javax/xml/ws/WebServiceFeature.class"/> + <exclude name="javax/xml/ws/spi/WebServiceFeatureAnnotation.class"/> + <exclude name="javax/xml/ws/soap/MTOMFeature.class"/> + <exclude name="javax/xml/ws/soap/AddressingFeature.class"/> + <exclude name="javax/xml/ws/addressing/**"/> + <exclude name="javax/xml/ws/soap/Addressing.class"/> + <exclude name="javax/xml/ws/soap/MTOM.class"/> + <exclude name="javax/xml/ws/soap/MTOMFeature.class"/> + <exclude name="javax/xml/ws/wsaddressing/**"/> </fileset> - <metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/> + <metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/> </jar>  -  - -  - <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.classes.dir}"> - <include name="org/jboss/annotation/**"/> - <include name="org/jboss/ws/**"/> -  <include name="javax/xml/ws/**/*21.class"/> <include name="javax/xml/ws/Action.class"/> @@ -191,22 +171,29 @@ <include name="javax/xml/ws/soap/Addressing.class"/> <include name="javax/xml/ws/soap/MTOM.class"/> <include name="javax/xml/ws/soap/MTOMFeature.class"/> + <include name="javax/xml/ws/wsaddressing/**"/> </fileset> + <metainf dir="${core.resources.dir}/jboss-jaxws-ext.jar/META-INF"/> + </jar> - <include name="javax/xml/ws/wsaddressing/**"/> - +  + <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="org/jboss/annotation/**"/> + <include name="org/jboss/ws/**"/> </fileset> - <fileset dir="${core.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/> - </jar> + <fileset dir="${core.resources.dir}"> + <include name="schema/**"/> + <include name="dtd/**"/> + </fileset> + <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/> + </jar> -  - <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.classes.dir}"> - <include name="org/jboss/wsf/**"/> - <include name="org/jboss/ws/**"/> +  + <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="org/jboss/wsf/**"/> + <include name="org/jboss/ws/**"/>  <include name="javax/xml/ws/**/*21.class"/> @@ -224,20 +211,20 @@ <include name="javax/xml/ws/soap/MTOM.class"/> <include name="javax/xml/ws/soap/MTOMFeature.class"/> <include name="javax/xml/ws/wsaddressing/**"/> - + </fileset> - <fileset dir="${core.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - <fileset dir="${core.etc.dir}"> - <include name="log4j.properties"/> - <include name="ws*.bat"/> - <include name="ws*.sh"/> - </fileset> - <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/> - <metainf dir="${core.resources.dir}/standard-config"/> - </jar> + <fileset dir="${core.resources.dir}"> + <include name="schema/**"/> + <include name="dtd/**"/> + </fileset> + <fileset dir="${core.etc.dir}"> + <include name="log4j.properties"/> + <include name="ws*.bat"/> + <include name="ws*.sh"/> + </fileset> + <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/> + <metainf dir="${core.resources.dir}/standard-config"/> + </jar>  <jar jarfile="${core.output.lib.dir}/jbossws-native.jar" manifest="${core.output.etc.dir}/default.mf"> @@ -246,7 +233,7 @@ </fileset> <metainf dir="${core.resources.dir}/jbossws-native.jar/META-INF"/> </jar> - +  <copy todir="${core.output.lib.dir}/jbossws-context.war"> <fileset dir="${core.resources.dir}/jbossws-context.war"> @@ -255,28 +242,28 @@ <include name="WEB-INF/**"/> </fileset> </copy> - -  - <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" > - <fileset dir="${core.output.etc.dir}"> - <include name="wsrunclient.bat"/> - <include name="wstools.bat"/> - </fileset> - <zipfileset dir="${core.output.etc.dir}" filemode="755"> - <include name="wsrunclient.sh"/> - <include name="wstools.sh"/> - </zipfileset> - </zip> -  - <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" > - <fileset dir="${core.java.dir}"/> - </zip> +  + <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" > + <fileset dir="${core.output.etc.dir}"> + <include name="wsrunclient.bat"/> + <include name="wstools.bat"/> + </fileset> + <zipfileset dir="${core.output.etc.dir}" filemode="755"> + <include name="wsrunclient.sh"/> + <include name="wstools.sh"/> + </zipfileset> + </zip> - </target> +  + <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" > + <fileset dir="${core.java.dir}"/> + </zip> + </target> + <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> - +  <concat destfile="${core.output.lib.dir}/jbossws-native50/jbossws-beans.xml"> <header trimleading="yes"> @@ -287,7 +274,7 @@ </deployment> </footer> </concat> - +  <jar jarfile="${core.output.lib.dir}/jbossws-native50.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> @@ -301,7 +288,7 @@ <include name="policy.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> - <include name="wstx.jar"/> + <include name="wstx.jar"/> <include name="jboss-jaxb-intros.jar"/> </fileset> <metainf dir="${core.dir}/src/main/resources/standard-config"> @@ -311,13 +298,13 @@ <include name="jbossws-beans.xml"/> </metainf> </jar> - + </target> - + <target name="jars-jboss42" depends="jars-common" if="jboss42.home"> - + <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - +  <concat destfile="${core.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> @@ -329,7 +316,7 @@ </deployment> </footer> </concat> - +  <jar jarfile="${core.output.lib.dir}/jbossws-native42.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> @@ -338,6 +325,7 @@ </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-core.jar"/> @@ -350,7 +338,7 @@ <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> - <include name="wstx.jar"/> + <include name="wstx.jar"/> <include name="jboss-jaxb-intros.jar"/> </fileset> <fileset dir="${core.output.lib.dir}/jbossws-native42"> @@ -364,11 +352,11 @@ </metainf> </jar> </target> - + <target name="jars-jboss40" depends="jars-common" if="jboss40.home"> - + <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss40-resources.zip"/> - +  <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> @@ -380,7 +368,7 @@ </deployment> </footer> </concat> - +  <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> <header trimleading="yes"> @@ -401,6 +389,7 @@ </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jbossws-core.jar"/> </fileset> <fileset dir="${core.dir}/thirdparty"> @@ -410,7 +399,7 @@ <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> - <include name="wstx.jar"/> + <include name="wstx.jar"/> <include name="jboss-jaxb-intros.jar"/> </fileset> <fileset dir="${core.output.lib.dir}/jbossws-native40"> @@ -426,42 +415,42 @@ </jar> </target> -  -  -  +  +  +  -  - <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> +  + <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> - <mkdir dir="${core.output.apidocs.dir}"/> - <javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath refid="thirdparty.classpath"/> - <packageset dir="${core.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/ws/**"/> - </packageset> - <doctitle><![CDATA[<h1>JBossWS Native</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - <group title="Core" packages="org.jboss.ws.core*"/> - <group title="Metadata" packages="org.jboss.ws.metadata*"/> - <group title="Integration" packages="org.jboss.ws.integration*"/> - <group title="Extensions" packages="org.jboss.ws.extensions*"/> - <group title="Tools" packages="org.jboss.ws.tools*"/> - </javadoc> - </target> + <mkdir dir="${core.output.apidocs.dir}"/> + <javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath refid="thirdparty.classpath"/> + <packageset dir="${core.java.dir}" defaultexcludes="yes"> + <include name="org/jboss/ws/**"/> + </packageset> + <doctitle><![CDATA[<h1>JBossWS Native</h1>]]></doctitle> + <tag name="todo" scope="all" description="To do:"/> + <group title="Core" packages="org.jboss.ws.core*"/> + <group title="Metadata" packages="org.jboss.ws.metadata*"/> + <group title="Integration" packages="org.jboss.ws.integration*"/> + <group title="Extensions" packages="org.jboss.ws.extensions*"/> + <group title="Tools" packages="org.jboss.ws.tools*"/> + </javadoc> + </target> - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${core.output.dir}"/> - </target> + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${core.output.dir}"/> + </target> - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${core.dir}/thirdparty"/> - </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${core.dir}/thirdparty"/> + </target> - <target name="main" description="Executes the default target (most)." depends="most"/> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="jars,tests-main"/> + <target name="most" description="Builds almost everything." depends="jars,tests-main"/> - <target name="all" description="Create a distribution zip file" depends="most"> - </target> + <target name="all" description="Create a distribution zip file" depends="most"> + </target> </project>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4650 - stack/native/trunk/src.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-28 09:52:42 -0400 (Fri, 28 Sep 2007) New Revision: 4650 Modified: stack/native/trunk/src/ Log: Switch to http://anonsvn.jboss.org/repos Property changes on: stack/native/trunk/src ___________________________________________________________________ Name: svn:externals - test-framework https://svn.jboss.org/repos/jbossws/framework/trunk/src/test + test-framework http://anonsvn.jboss.org/repos/jbossws/framework/trunk/src/test

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4649 - stack/native/branches/ropalka/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-28 04:12:19 -0400 (Fri, 28 Sep 2007) New Revision: 4649 Modified: stack/native/branches/ropalka/trunk/build.xml Log: [JBWS-1796] fixing step description Modified: stack/native/branches/ropalka/trunk/build.xml =================================================================== --- stack/native/branches/ropalka/trunk/build.xml 2007-09-28 08:11:37 UTC (rev 4648) +++ stack/native/branches/ropalka/trunk/build.xml 2007-09-28 08:12:19 UTC (rev 4649) @@ -310,7 +310,7 @@ </footer> </concat> -  +  <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> <header trimleading="yes"> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4648 - stack/native/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-28 04:11:37 -0400 (Fri, 28 Sep 2007) New Revision: 4648 Modified: stack/native/trunk/build.xml Log: [JBWS-1796] fixing step description Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2007-09-28 08:00:58 UTC (rev 4647) +++ stack/native/trunk/build.xml 2007-09-28 08:11:37 UTC (rev 4648) @@ -381,7 +381,7 @@ </footer> </concat> -  +  <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> <header trimleading="yes"> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4647 - stack/native/branches/ropalka/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-28 04:00:58 -0400 (Fri, 28 Sep 2007) New Revision: 4647 Added: stack/native/branches/ropalka/trunk/mergeinfo.txt Log: [JBWS-1796] creating merge information file Added: stack/native/branches/ropalka/trunk/mergeinfo.txt =================================================================== --- stack/native/branches/ropalka/trunk/mergeinfo.txt (rev 0) +++ stack/native/branches/ropalka/trunk/mergeinfo.txt 2007-09-28 08:00:58 UTC (rev 4647) @@ -0,0 +1 @@ +svn merge -r4641:4642 https://svn.jboss.org/repos/jbossws/stack/native/branches/ropalka/trunk Property changes on: stack/native/branches/ropalka/trunk/mergeinfo.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 7 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-28 03:58:50 -0400 (Fri, 28 Sep 2007) New Revision: 4646 Added: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/ant.properties.example stack/native/trunk/build.xml Log: [JBWS-1796] reparing the JBoss AS 4.0 no EJB3 integration - merge to trunk Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2007-09-28 07:50:56 UTC (rev 4645) +++ stack/native/trunk/ant-import/build-deploy.xml 2007-09-28 07:58:50 UTC (rev 4646) @@ -97,13 +97,7 @@ </target> <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> - <macro-setup-native40-no-ejb3/> - <echo> - *********************************** - * JBossWS EJB3 support disabled * - * All EJB3 tests will fail. * - *********************************** - </echo> + <macro-setup-native40-no-ejb3/> </target>  Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-09-28 07:50:56 UTC (rev 4645) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-09-28 07:58:50 UTC (rev 4646) @@ -278,6 +278,7 @@ </fileset> </copy> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-09-28 07:50:56 UTC (rev 4645) +++ stack/native/trunk/ant.properties.example 2007-09-28 07:58:50 UTC (rev 4646) @@ -6,9 +6,10 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA +#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA #jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -# The JBoss server under test. This can be [jboss50|jboss42|jboss40] +# The JBoss server under test. This can be [jboss50|jboss42|jboss40|jboss40.no.ejb3] jbossws.integration.target=jboss50 # The JBoss server instance Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2007-09-28 07:50:56 UTC (rev 4645) +++ stack/native/trunk/build.xml 2007-09-28 07:58:50 UTC (rev 4646) @@ -381,6 +381,18 @@ </footer> </concat> +  + <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> + <header trimleading="yes"> + <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <fileset file="${core.output.dir}/resources/jbossws-jboss40-config-no-ejb3.xml"/> + <footer trimleading="yes"> + </deployment> + </footer> + </concat> +  <jar jarfile="${core.output.lib.dir}/jbossws-native40.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> @@ -406,6 +418,7 @@ </fileset> <metainf dir="${core.output.dir}/resources/jbossws-jboss40.sar/META-INF"> <include name="jboss-service.xml"/> + <include name="jboss-service-no-ejb3.xml"/> </metainf> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> Copied: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt (from rev 4642, stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-09-28 07:58:50 UTC (rev 4646) @@ -0,0 +1,48 @@ +# JBossAS-4.0 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + +# EJB3 compilation excludes +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxws/samples/context/EndpointEJB* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/swaref/** +org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/serviceref/*EJB* +org/jboss/test/ws/jaxws/samples/webservice/*EJB3* +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1422/** +org/jboss/test/ws/jaxws/jbws1446/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1556/** +org/jboss/test/ws/jaxws/jbws1566/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws771/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/webserviceref/** +org/jboss/test/ws/jaxws/handlerlifecycle/** + +# EJB3 runtime excludes +org/jboss/test/ws/interop/wsa/AddressingTestCase* +org/jboss/test/ws/interop/wsse/EncryptTestCase* +org/jboss/test/ws/interop/wsse/SignTestCase* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase* +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase* +org/jboss/test/ws/jaxws/wseventing/EventingTestCase* +org/jboss/test/ws/jaxws/wseventing/NotificationTestCase* +org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase* +org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase* +org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase*

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4645 - container/jboss40/branches/ropalka/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-28 03:50:56 -0400 (Fri, 28 Sep 2007) New Revision: 4645 Modified: container/jboss40/branches/ropalka/trunk/mergeinfo.txt Log: [JBWS-1796] updating merge information Modified: container/jboss40/branches/ropalka/trunk/mergeinfo.txt =================================================================== --- container/jboss40/branches/ropalka/trunk/mergeinfo.txt 2007-09-28 07:49:18 UTC (rev 4644) +++ container/jboss40/branches/ropalka/trunk/mergeinfo.txt 2007-09-28 07:50:56 UTC (rev 4645) @@ -1 +1,2 @@ svn merge -r4622:4623 https://svn.jboss.org/repos/jbossws/container/jboss40/branches/ropalka/trunk +svn merge -r4642:4643 https://svn.jboss.org/repos/jbossws/container/jboss40/branches/ropalka/trunk

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4644 - container/jboss40/trunk/src/main/resources.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-28 03:49:18 -0400 (Fri, 28 Sep 2007) New Revision: 4644 Added: container/jboss40/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml Log: [JBWS-1796] reparing the JBoss AS 4.0 no EJB3 integration - merge to trunk Copied: container/jboss40/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml (from rev 4643, container/jboss40/branches/ropalka/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml) =================================================================== --- container/jboss40/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml (rev 0) +++ container/jboss40/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml 2007-09-28 07:49:18 UTC (rev 4644) @@ -0,0 +1,266 @@ + +  + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/> + +  + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss40.DeploymentAspectHttpServer"/> + +  + +  +  + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> +  + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> +  + <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + +  + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEJB</property> + </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> + +  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss40.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData, VFSRoot</property> + <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> + </bean> + + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContextRoot</property> + </bean> + + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> + </bean> + + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContainerEndpointHandler</property> + </bean> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <property name="provides">EndpointMetrics</property> + </bean> + + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointName</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="requires">EndpointName</property> + <property name="provides">RegisteredEndpoint</property> + </bean> + + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss40.ModifyWebMetaDataDeploymentAspect"> + <property name="requires">ContextProperties, ContainerMetaData</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss40.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> + <property name="requires">ContextRoot, ContainerMetaData</property> + <property name="provides">URLPattern</property> + </bean> + + <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss40.WebAppDeploymentAspect"> + <property name="requires">WebMetaData, ContextProperties</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">WebMetaData</property> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + </bean> + +  + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.EJBArchiveMetaDataAdapterEJB21"/> + <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ContainerMetaDataAdapter"> + <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss40.SecurityHandlerEJB21"/> + <bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss40.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss40.JSEArchiveMetaDataAdapter"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss40.WebXMLRewriterImpl"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + +  + +  + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + </set> + </property> + </bean> + +  + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> + + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean>

16 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits September 2007