[jbossws-commits] JBossWS SVN: r10332 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/management and 5 other directories.

Author: alessio.soldano(a)jboss.com Date: 2009-07-17 08:54:39 -0400 (Fri, 17 Jul 2009) New Revision: 10332 Removed: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss500.txt stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss501.txt stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss600.txt Modified: stack/cxf/branches/jbossws-cxf-3.1.2/build.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/profiles.xml.example stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/Install.txt stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/ant.properties.example stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-deploy.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-setup.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBPAPP-2273] Support jboss510 only Modified: stack/cxf/branches/jbossws-cxf-3.1.2/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -54,31 +54,16 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}"> - <isset property="profiles.profile.properties.jboss500.home"/> - </condition> - <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> <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> - <property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/> - <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}"/> <echo/> - <echo message="jboss500.home=${jboss500.home}"/> - <echo message="jboss501.home=${jboss501.home}"/> <echo message="jboss510.home=${jboss510.home}"/> - <echo message="jboss600.home=${jboss600.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/pom.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/pom.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -29,16 +29,6 @@ <scope>provided</scope> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <scope>provided</scope> - </dependency> <!-- [JBWS-2505] --> <!-- START --> <!-- @@ -47,11 +37,6 @@ <artifactId>jbossws-jboss510x</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600x</artifactId> - <scope>provided</scope> - </dependency> --> <!-- END --> <dependency> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -178,6 +178,9 @@ </resource> </resources> <plugins> + <!-- JBWS-2505 --> + <!-- START --> + <!-- <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -192,46 +195,19 @@ <artifactItems> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <version>${jbossws.jboss500.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> - </artifactItem> - <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> - <!-- JBWS-2505 --> - <!-- START --> - <!-- - <artifactItem> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510x</artifactId> <version>${jbossws.jboss510.version}</version> <classifier>resources</classifier> <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600x</artifactId> - <version>${jbossws.jboss600.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> - </artifactItem> - --> - <!-- END --> </artifactItems> </configuration> </execution> </executions> </plugin> + --> + <!-- END --> <!-- http://jira.codehaus.org/browse/MANTRUN-89 --> <plugin> <artifactId>maven-antrun-plugin</artifactId> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -27,26 +27,6 @@ <!-- Compile resource files --> <target name="main" depends="init"> - <!-- Concat jbossws-jboss500/jbossws.beans --> - <echo message="Concat jbossws-jboss500/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - <!-- Concat jbossws-jboss501/jbossws.beans --> - <echo message="Concat jbossws-jboss501/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - <!-- Concat jbossws-jboss510/jbossws.beans --> <echo message="Concat jbossws-jboss510/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml"> @@ -57,16 +37,6 @@ &lt;/deployment&gt; </footer> </concat> - <!-- Concat jbossws-jboss600/jbossws.beans --> - <echo message="Concat jbossws-jboss600/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - </target> </project> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -276,122 +276,6 @@ </profile> <!-- - Name: jboss500 - Descr: JBoss-5.0.0 specific options - --> - <profile> - <id>jboss500</id> - <properties> - <jboss.version>5.0.0.GA</jboss.version> - <jbossws.integration.target>jboss500</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - </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> - </exclusions> - </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-jboss500.txt</testExcludeFile> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.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> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </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.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - </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> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>${jboss.javaee.version}</version> - </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-jboss501.txt</testExcludeFile> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss510 Descr: JBoss-5.1.0 specific options --> @@ -447,61 +331,6 @@ </profile> <!-- - Name: jboss600 - Descr: JBoss-6.0.0 specific options - --> - <profile> - <id>jboss600</id> - <properties> - <jboss.version>6.0.0-SNAPSHOT</jboss.version> - <jbossws.integration.target>jboss600</jbossws.integration.target> - </properties> - <dependencies> - <!-- [JBWS-2505] --> - <!-- START --> - <!-- - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600x</artifactId> - </dependency> - --> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-webservices</artifactId> - <version>${jboss.version}</version> - </dependency> - <!-- END --> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.version}</version> - </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-jboss600.txt</testExcludeFile> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss500.txt 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss500.txt 2009-07-17 12:54:39 UTC (rev 10332) @@ -1,55 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** - -# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [CXF-1516] Type inheritance with document/literal/bare -org/jboss/test/ws/jaxws/jbws1702/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [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-1655] Add support for endpoint address rewriting -org/jboss/test/ws/jaxws/jbws2150/** - -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2571] Mode.INOUT parameter not generated -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF -org/jboss/test/ws/jaxws/jbws1178/** - -# [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/** Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss501.txt 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss501.txt 2009-07-17 12:54:39 UTC (rev 10332) @@ -1,55 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** - -# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [CXF-1516] Type inheritance with document/literal/bare -org/jboss/test/ws/jaxws/jbws1702/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [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-1655] Add support for endpoint address rewriting -org/jboss/test/ws/jaxws/jbws2150/** - -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2571] Mode.INOUT parameter not generated -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF -org/jboss/test/ws/jaxws/jbws1178/** - -# [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/** Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss600.txt 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss600.txt 2009-07-17 12:54:39 UTC (rev 10332) @@ -1,55 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** - -# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [CXF-1516] Type inheritance with document/literal/bare -org/jboss/test/ws/jaxws/jbws1702/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [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-1655] Add support for endpoint address rewriting -org/jboss/test/ws/jaxws/jbws2150/** - -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2571] Mode.INOUT parameter not generated -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF -org/jboss/test/ws/jaxws/jbws1178/** - -# [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/** Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -44,15 +44,12 @@ <!-- Properties --> <properties> <jbossws.common.version>1.1.0.SP2</jbossws.common.version> - <jbossws.framework.version>3.1.2.SP3</jbossws.framework.version> + <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>1.1.2.SP1</jbossws.spi.version> - <jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version> - <jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version> <!-- JBWS-2505 --> <!-- START --> <!-- <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version> - <jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version> --> <!-- END --> <cxf.version>2.2.2</cxf.version> @@ -104,30 +101,6 @@ <classifier>testsuite</classifier> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <version>${jbossws.jboss500.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <version>${jbossws.jboss500.version}</version> - <classifier>resources</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</artifactId> - <version>${jbossws.jboss501.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> <!-- JBWS-2505 --> <!-- START --> <!-- @@ -143,18 +116,6 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600x</artifactId> - <version>${jbossws.jboss600.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600x</artifactId> - <version>${jbossws.jboss600.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> --> <!-- END --> @@ -523,30 +484,6 @@ </profile> <!-- - Name: jboss500 - Descr: JBoss-5.0.0 specific options - --> - <profile> - <id>jboss500</id> - <properties> - <jbossws.integration.target>jboss500</jbossws.integration.target> - <jboss.home>${jboss500.home}</jboss.home> - </properties> - </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 --> @@ -559,18 +496,6 @@ </profile> <!-- - Name: jboss600 - Descr: JBoss-6.0.0 specific options - --> - <profile> - <id>jboss600</id> - <properties> - <jbossws.integration.target>jboss600</jbossws.integration.target> - <jboss.home>${jboss600.home}</jboss.home> - </properties> - </profile> - - <!-- Name: smoketest Descr: Executes the smoke tests --> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/profiles.xml.example =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/profiles.xml.example 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/profiles.xml.example 2009-07-17 12:54:39 UTC (rev 10332) @@ -11,10 +11,7 @@ </property> </activation> <properties> - <jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> - <jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home> <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.GA</jboss510.home> - <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home> </properties> </profile> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/Install.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/Install.txt 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/Install.txt 2009-07-17 12:54:39 UTC (rev 10332) @@ -11,11 +11,9 @@ 1.) Copy ant.properties.examples to ant.properties 2.) Modify the target container location in ant.properties -3.) Execute one of the following +3.) Execute - ant deploy-jboss50x - ant deploy-jboss51x - ant deploy-jboss60x + ant deploy-jboss510 4.) Execute the samples to verify your installation Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/ant.properties.example 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/ant.properties.example 2009-07-17 12:54:39 UTC (rev 10332) @@ -3,13 +3,10 @@ # # Optional JBoss Home -jboss500.home=(a)jboss500.home@ -jboss501.home=(a)jboss501.home@ jboss510.home=(a)jboss510.home@ -jboss600.home=(a)jboss600.home@ -# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600] -jbossws.integration.target=jboss500 +# The JBoss server under test. This can be [jboss510] +jbossws.integration.target=jboss510 # The JBoss settings jboss.server.instance=default Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-deploy.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-deploy.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -27,50 +27,6 @@ </target> <!-- ================================================================== --> - <!-- Deployment JBoss500 --> - <!-- ================================================================== --> - - <target name="target-jboss500"> - <property name="jbossws.integration.target" value="jboss500"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <copy todir="${jboss500.home}" overwrite="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - </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" description="Deploy jbossws to jboss501"> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <copy todir="${jboss501.home}" overwrite="true"> - <fileset dir="${deploy.structure}"/> - </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-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - </target> - - <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-5.1.x --> <!-- ================================================================== --> @@ -108,43 +64,6 @@ </target> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-6.0.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss60" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf60" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss600 --> - <!-- ================================================================== --> - - <target name="target-jboss600"> - <property name="jbossws.integration.target" value="jboss600"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss60" description="Deploy jbossws to jboss600"> - <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <copy todir="${jboss600.home}" overwrite="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> - <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - </target> - - <!-- ================================================================== --> <!-- Create jbossws-deploy.conf --> <!-- ================================================================== --> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-setup.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-setup.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -21,20 +21,6 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <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}"/> @@ -42,22 +28,9 @@ <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}"/> - <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/> - <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/> - <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/> - - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <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"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> <available property="jboss510.available" file="${jboss510.available.file}"/> - <available property="jboss600.available" file="${jboss600.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -45,22 +45,11 @@ <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="jboss500"/> - <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"/> - </or> - </condition> <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-17 11:03:54 UTC (rev 10331) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-17 12:54:39 UTC (rev 10332) @@ -92,22 +92,11 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-framework:jar</include> - <include>org.jboss.ws:jbossws-jboss500:jar</include> <include>org.jboss.jaxr:juddi-service:sar</include> <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>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> <!-- [JBWS-2505] --> <!-- START --> <!-- @@ -121,16 +110,6 @@ <include>org.jboss.ws:jbossws-jboss510x:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss600x:jar</include> - </includes> - </dependencySet> --> <!-- END --> </dependencySets>