Author: alessio.soldano(a)jboss.com Date: 2011-01-04 09:25:05 -0500 (Tue, 04 Jan 2011) New Revision: 13540 Removed: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/profiles.xml.example stack/cxf/trunk/src/main/distro/Install.txt stack/cxf/trunk/src/main/distro/ant.properties.example stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build-setup.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Updating to JBoss AS 6 Final and removing AS 5.x stuff Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/build.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -56,12 +56,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}"> - <isset property="profiles.profile.properties.jboss501.home"/> - </condition> - <condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}"> - <isset property="profiles.profile.properties.jboss510.home"/> - </condition> <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}"> <isset property="profiles.profile.properties.jboss600.home"/> </condition> @@ -71,14 +65,10 @@ <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> - <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/> - <property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/> <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/> <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/> <echo/> - <echo message="jboss501.home=${jboss501.home}"/> - <echo message="jboss510.home=${jboss510.home}"/> <echo message="jboss600.home=${jboss600.home}"/> <echo message="jboss601.home=${jboss601.home}"/> </target> Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/management/pom.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -29,46 +29,6 @@ <scope>provided</scope> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501-metadata</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510-metadata</artifactId> - <scope>provided</scope> - </dependency> <!-- [JBWS-2505] --> <!-- START --> <!-- Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/server/pom.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -268,6 +268,9 @@ </resource> </resources> <plugins> + <!-- JBWS-2505 --> + <!-- START --> + <!-- <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -282,46 +285,19 @@ <artifactItems> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <version>${jbossws.jboss501.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <version>${jbossws.jboss510.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> - </artifactItem> - <!-- JBWS-2505 --> - <!-- START --> - <!-- - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M5</artifactId> - <version>${jbossws.jboss600M5.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> <version>${jbossws.jboss601.version}</version> <classifier>resources</classifier> <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory> </artifactItem> - --> - <!-- END --> </artifactItems> </configuration> </execution> </executions> </plugin> + --> + <!-- END --> <!-- http://jira.codehaus.org/browse/MANTRUN-89 --> <plugin> <artifactId>maven-antrun-plugin</artifactId> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- CXF initializer, starts default bus, etc. --> - <bean name="CXFInitializer" class="org.jboss.wsf.stack.cxf.config.CXFInitializer" /> - - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - - <!-- Logging redirector --> - <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> - <property name="namespaces"> - <list class="java.util.LinkedList" elementClass="java.lang.String"> - <value>org.apache.cxf</value> - </list> - </property> - </bean> - - <!-- Installed Record Processors--> - <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> - <property name="recording">false</property> - </bean> - <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> - <property name="recording">false</property> - </bean> - - <!-- The stack specific deployment aspects --> - <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>stack.transport.class.provider</key> - <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value> - </entry> - </map> - </property> - <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround --> - </bean> - - <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect"> - <property name="requires">EndpointAddress,JAXBIntros</property> - <property name="provides">StackDescriptor</property> - <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> - <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> - <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround --> - </bean> - - <bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> - <property name="requires">JmsEndpointAddress</property> - <property name="provides">ResourceResolver</property> - <property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround --> - </bean> - - <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround --> - </bean> - - <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround --> - <property name="processors"> - <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> - </list> - </property> - </bean> - - <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect"> - <property name="provides">JAXBIntros</property> - <property name="relativeOrder">20</property> <!-- [JBDEPLOY-201] workaround --> - </bean> - - <bean name="WSCXFBusDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> - <property name="provides">BusHolder</property> - <property name="requires">ResourceResolver,StackDescriptor</property> - <property name="relativeOrder">24</property> <!-- [JBDEPLOY-201] workaround --> - </bean> - -</deployment> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -17,16 +17,6 @@ <target name="main"> <copy - file="${src.dir}/jbossws-cxf-config-as5.xml" - tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as5.xml" - tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy file="${src.dir}/jbossws-cxf-config-as6.xml" tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -366,161 +366,13 @@ </profile> <!-- - Name: jboss501 - Descr: JBoss-5.0.1 specific options - --> - <profile> - <id>jboss501</id> - <properties> - <jboss.version>5.0.1.GA</jboss.version> - <jbossws.integration.target>jboss501</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxws</groupId> - <artifactId>jaxws-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-security</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>${jboss.javaee.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> - <compilerArgument>-Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> - <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss510 - Descr: JBoss-5.1.0 specific options - --> - <profile> - <id>jboss510</id> - <properties> - <jboss.version>5.1.0.GA</jboss.version> - <jbossws.integration.target>jboss510</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxws</groupId> - <artifactId>jaxws-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-security</artifactId> - <version>${jboss.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> - <compilerArgument>-Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> - <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss600 Descr: JBoss-6.0.0 specific options --> <profile> <id>jboss600</id> <properties> - <jboss.version>6.0.0.20101110-CR1</jboss.version> + <jboss.version>6.0.0.Final</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> @@ -647,7 +499,7 @@ <profile> <id>jboss601</id> <properties> - <jboss.version>6.0.0-SNAPSHOT</jboss.version> + <jboss.version>6.0.1-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss601</jbossws.integration.target> </properties> <dependencies> Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2011-01-04 14:25:05 UTC (rev 13540) @@ -1,50 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-2006] RespectBinding feature and not understood required extensibility elements -org/jboss/test/ws/jaxws/jbws2449/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2480] Soap attachments are dropped on server response -org/jboss/test/ws/jaxws/jbws1283/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* - -# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 -org/jboss/test/ws/jaxrpc/** - -# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.* - -# [JBWS-2987] Review JMS integration -org/jboss/test/ws/jaxws/samples/jmstransport/** - -# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available on AS 5.x -org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* - -# [JBWS-3086] This have been merged to AS 600M3 and upstream only -org/jboss/test/ws/jaxws/samples/jmsendpoints/** - -# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only) -org/jboss/test/ws/jaxws/jbws2957/** - -# [JBWS-3140] mtom, wsaddressing support in webservices.xml; jboss-metadata-common doesn't support this metadata by in AS501 -org/jboss/test/ws/jaxws/jbws3140/** - -# Seems MSFT interop. endpoints are down :( -org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2011-01-04 14:25:05 UTC (rev 13540) @@ -1,50 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-2006] RespectBinding feature and not understood required extensibility elements -org/jboss/test/ws/jaxws/jbws2449/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2480] Soap attachments are dropped on server response -org/jboss/test/ws/jaxws/jbws1283/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* - -# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 -org/jboss/test/ws/jaxrpc/** - -# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.* - -# [JBWS-2987] Review JMS integration -org/jboss/test/ws/jaxws/samples/jmstransport/** - -# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available on AS 5.x -org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* - -# [JBWS-3086] This have been merged to AS 600M3 and upstream only -org/jboss/test/ws/jaxws/samples/jmsendpoints/** - -# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only) -org/jboss/test/ws/jaxws/jbws2957/** - -# [JBWS-3140] mtom, wsaddressing support in webservices.xml; jboss-metadata-common doesn't support this metadata by in AS510 -org/jboss/test/ws/jaxws/jbws3140/** - -# Seems MSFT interop. endpoints are down :( -org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/pom.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -49,12 +49,9 @@ <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>4.0.0-SNAPSHOT</jbossws.framework.version> - <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version> - <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version> <!-- JBWS-2505 --> <!-- START --> <!-- - <jbossws.jboss600M5.version>3.4.1-SNAPSHOT</jbossws.jboss600M5.version> <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> @@ -120,57 +117,11 @@ <classifier>testsuite</classifier> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <version>${jbossws.jboss501.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501-metadata</artifactId> - <version>${jbossws.jboss501.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <version>${jbossws.jboss501.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <version>${jbossws.jboss510.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510-metadata</artifactId> - <version>${jbossws.jboss510.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <version>${jbossws.jboss510.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> <!-- JBWS-2505 --> <!-- START --> <!-- <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M5</artifactId> - <version>${jbossws.jboss600M5.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M5</artifactId> - <version>${jbossws.jboss600M5.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> <version>${jbossws.jboss601.version}</version> </dependency> @@ -1380,30 +1331,6 @@ </profile> <!-- - Name: jboss501 - Descr: JBoss-5.0.1 specific options - --> - <profile> - <id>jboss501</id> - <properties> - <jbossws.integration.target>jboss501</jbossws.integration.target> - <jboss.home>${jboss501.home}</jboss.home> - </properties> - </profile> - - <!-- - Name: jboss510 - Descr: JBoss-5.1.0 specific options - --> - <profile> - <id>jboss510</id> - <properties> - <jbossws.integration.target>jboss510</jbossws.integration.target> - <jboss.home>${jboss510.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss600 Descr: JBoss-6.0.0 specific options --> Modified: stack/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/profiles.xml.example 2011-01-04 14:25:05 UTC (rev 13540) @@ -11,10 +11,8 @@ </property> </activation> <properties> - <jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home> - <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home> - <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20101110-CR1/build/target/jboss-6.0.0.20101110-CR1</jboss600.home> - <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home> + <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.Final/build/target/jboss-6.0.0.Final/jboss600.home> + <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.1-SNAPSHOT</jboss601.home> </properties> </profile> Modified: stack/cxf/trunk/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/src/main/distro/Install.txt 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/Install.txt 2011-01-04 14:25:05 UTC (rev 13540) @@ -13,8 +13,6 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss501 - ant deploy-jboss510 ant deploy-jboss600 ant deploy-jboss601 Modified: stack/cxf/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties.example 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/ant.properties.example 2011-01-04 14:25:05 UTC (rev 13540) @@ -3,13 +3,11 @@ # # Optional JBoss Home -jboss501.home=(a)jboss501.home@ -jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ jboss601.home=(a)jboss601.home@ -# The JBoss server under test. This can be [jboss501|jboss510|jboss600|jboss601] -jbossws.integration.target=jboss510 +# The JBoss server under test. This can be [jboss600|jboss601] +jbossws.integration.target=jboss601 # The JBoss settings jboss.server.instance=default Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -12,90 +12,6 @@ <project> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-5.0.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss50" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/> - </antcall> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss501 --> - <!-- ================================================================== --> - - <target name="target-jboss501"> - <property name="jbossws.integration.target" value="jboss501"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50,check-spring,install-spring" description="Deploy jbossws to jboss501"> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <copy todir="${jboss501.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws targetdir="${jboss501.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true" - removenativecore="true"/> - </target> - - <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-5.1.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss51" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/> - </antcall> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss510 --> - <!-- ================================================================== --> - - <target name="target-jboss510"> - <property name="jbossws.integration.target" value="jboss510"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51,check-spring,install-spring" description="Deploy jbossws to jboss510"> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <copy todir="${jboss510.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> - <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <macro-undeploy-jbossws targetdir="${jboss510.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true" - removenativecore="true"/> - </target> - - <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-6.0.0 --> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -21,20 +21,6 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jboss510.lib" value="${jboss510.home}/lib"/> - <property name="jboss510.client" value="${jboss510.home}/client"/> - <property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/> - <property name="jboss510.server.lib" value="${jboss510.home}/common/lib"/> - <property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/> - <property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/> - <property name="jboss600.lib" value="${jboss600.home}/lib"/> <property name="jboss600.client" value="${jboss600.home}/client"/> <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/> @@ -49,13 +35,9 @@ <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/> <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - <property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/> <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - <available property="jboss510.available" file="${jboss510.available.file}"/> <available property="jboss600.available" file="${jboss600.available.file}"/> <available property="jboss601.available" file="${jboss601.available.file}"/> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/build.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -46,16 +46,6 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - <condition property="jbossws.integration.jboss51" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss510"/> - </or> - </condition> <condition property="jbossws.integration.jboss60" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -130,61 +130,11 @@ <include>juddi:juddi:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss501:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss501-metadata.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss501-metadata:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss510:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss510-metadata.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss510-metadata:jar</include> - </includes> - </dependencySet> <!-- [JBWS-2505] --> <!-- START --> <!-- <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss600M5:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope>