[jbossws-commits] JBossWS SVN: r15933 - in stack/cxf/trunk: modules/dist and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Mar 13 09:52:31 EDT 2012
Author: alessio.soldano at jboss.com
Date: 2012-03-13 09:52:29 -0400 (Tue, 13 Mar 2012)
New Revision: 15933
Added:
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss712/
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/resources/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
Log:
Adding jboss711 target container, removing 701
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/build.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -68,9 +68,6 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}">
- <isset property="profiles.profile.properties.jboss701.home"/>
- </condition>
<condition property="jboss702.home" value="${profiles.profile.properties.jboss702.home}">
<isset property="profiles.profile.properties.jboss702.home"/>
</condition>
@@ -80,15 +77,15 @@
<condition property="jboss711.home" value="${profiles.profile.properties.jboss711.home}">
<isset property="profiles.profile.properties.jboss711.home"/>
</condition>
+ <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}">
+ <isset property="profiles.profile.properties.jboss712.home"/>
+ </condition>
- <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set">
+ <fail message="jboss home not set, use jboss702.home=value, jboss710.home=value, jboss711.home=value or jboss712.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss701.home"/>
- </not>
- <not>
<isset property="jboss702.home"/>
</not>
<not>
@@ -97,15 +94,18 @@
<not>
<isset property="jboss711.home"/>
</not>
+ <not>
+ <isset property="jboss712.home"/>
+ </not>
</and>
</condition>
</fail>
<echo/>
- <echo message="jboss701.home=${jboss701.home}"/>
<echo message="jboss702.home=${jboss702.home}"/>
<echo message="jboss710.home=${jboss710.home}"/>
<echo message="jboss711.home=${jboss711.home}"/>
+ <echo message="jboss712.home=${jboss712.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/dist/pom.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -33,28 +33,28 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss701</classifier>
+ <classifier>jboss702</classifier>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss702</classifier>
+ <classifier>jboss710</classifier>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss710</classifier>
+ <classifier>jboss711</classifier>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss711</classifier>
+ <classifier>jboss712</classifier>
</dependency>
<dependency>
@@ -146,7 +146,7 @@
<!-- Container integrations -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss701</artifactId>
+ <artifactId>jbossws-jboss702</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -162,23 +162,13 @@
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss702</artifactId>
+ <artifactId>jbossws-jboss710</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-jboss710</artifactId>
+ <artifactId>jbossws-jboss711</artifactId>
<scope>provided</scope>
</dependency>
@@ -232,9 +222,6 @@
<configuration>
<tasks>
<mkdir dir="${basedir}/target/exclude-file" />
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss701.txt">
- <param name="targetName" expression="jboss701" />
- </xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss702.txt">
<param name="targetName" expression="jboss702" />
</xslt>
@@ -244,6 +231,9 @@
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss711.txt">
<param name="targetName" expression="jboss711" />
</xslt>
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss712.txt">
+ <param name="targetName" expression="jboss712" />
+ </xslt>
</tasks>
</configuration>
<goals>
@@ -272,19 +262,19 @@
<!-- Libraries required for running binary distro testsuite and not available on server-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss701</artifactId>
+ <artifactId>jbossws-jboss702</artifactId>
<classifier>tests-integration</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss702</artifactId>
+ <artifactId>jbossws-jboss710</artifactId>
<classifier>tests-integration</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss710</artifactId>
+ <artifactId>jbossws-jboss711</artifactId>
<classifier>tests-integration</classifier>
<scope>provided</scope>
</dependency>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-03-13 13:52:29 UTC (rev 15933)
@@ -13,16 +13,16 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss701
ant deploy-jboss702
ant deploy-jboss710
ant deploy-jboss711
+ ant deploy-jboss712
By default Spring Framework libraries are not installed to application
server. In order to do that, please add the -Dspring=true property option when
running the ant script:
- ant -Dspring=true deploy-jboss710
+ ant -Dspring=true deploy-jboss711
Please note Spring is required for advanced configuration only, whenever users
want to provide their own jbossws-cxf.xml Spring configuration file.
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-03-13 13:52:29 UTC (rev 15933)
@@ -3,13 +3,13 @@
#
# Optional JBoss Home
-jboss701.home=@jboss701.home@
jboss702.home=@jboss702.home@
jboss710.home=@jboss710.home@
jboss711.home=@jboss711.home@
+jboss712.home=@jboss712.home@
-# The JBoss server under test. This can be [jboss701|jboss702|jboss710|jboss711]
-jbossws.integration.target=jboss710
+# The JBoss server under test. This can be [jboss702|jboss710|jboss711|jboss712]
+jbossws.integration.target=jboss711
# The JBoss settings
jboss.bind.address=localhost
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -47,35 +47,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss701 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss701">
- <property name="jbossws.integration.target" value="jboss701"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss701" depends="undeploy-jboss701,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss701">
- <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/>
- <copy todir="${jboss701.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}">
- <exclude name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
- <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
- <installModules targetDir="${jboss701.home}/modules">
- <fileset dir="${deploy.structure}/modules">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss701" depends="target-jboss701,init" description="Remove jbossws from jboss701">
- <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss701.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment JBoss702 -->
<!-- ================================================================== -->
@@ -185,6 +156,35 @@
</target>
<!-- ================================================================== -->
+ <!-- Deployment jboss712 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss712">
+ <property name="jbossws.integration.target" value="jboss712"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss712" depends="undeploy-jboss712,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss712">
+ <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/>
+ <copy todir="${jboss712.home}" overwrite="true" verbose="true">
+ <fileset dir="${deploy.structure}">
+ <exclude name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
+ <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
+ <installModules targetDir="${jboss712.home}/modules">
+ <fileset dir="${deploy.structure}/modules">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </target>
+
+ <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712">
+ <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Spring -->
<!-- ================================================================== -->
<target name="check-spring">
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -36,15 +36,15 @@
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/>
<property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/>
<property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
<property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/>
+ <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/>
- <available property="jboss701.available" file="${jboss701.available.file}"/>
<available property="jboss702.available" file="${jboss702.available.file}"/>
<available property="jboss710.available" file="${jboss710.available.file}"/>
<available property="jboss711.available" file="${jboss711.available.file}"/>
+ <available property="jboss712.available" file="${jboss712.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -60,7 +60,6 @@
<condition property="jbossws.integration.jboss700" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss701"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss702"/>
</or>
</condition>
@@ -68,6 +67,7 @@
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss712"/>
</or>
</condition>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/resources/pom.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -43,15 +43,6 @@
<phase>package</phase>
</execution>
<execution>
- <id>jboss701</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>jboss701</classifier>
- <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss701/jbossws.beans</classesDirectory>
- </configuration>
- </execution>
- <execution>
<id>jboss702</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
@@ -78,6 +69,15 @@
<classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory>
</configuration>
</execution>
+ <execution>
+ <id>jboss712</id>
+ <goals><goal>jar</goal></goals>
+ <phase>package</phase>
+ <configuration>
+ <classifier>jboss712</classifier>
+ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
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 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -31,15 +31,6 @@
<copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
- />
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-cxf-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
@@ -65,6 +56,15 @@
tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
/>
+ <copy
+ file="${src.dir}/jbossws-cxf-config-as7.xml"
+ tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ />
+ <copy
+ file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
+ tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ />
+
</target>
</project>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -564,17 +564,16 @@
</dependency>
</dependencies>
</profile>
-
-
+
<!--
- Name: jboss701
- Descr: JBoss-7.0.1.Final specific options
+ Name: jboss702
+ Descr: JBoss-7.0.2.Final specific options
-->
<profile>
- <id>jboss701</id>
+ <id>jboss702</id>
<properties>
- <jboss.version>${jboss701.version}</jboss.version>
- <jbossws.integration.target>jboss701</jbossws.integration.target>
+ <jboss.version>${jboss702.version}</jboss.version>
+ <jbossws.integration.target>jboss702</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -741,38 +740,63 @@
</plugins>
</build>
</profile>
-
+
<!--
- Name: jboss702
- Descr: JBoss-7.0.2.Final specific options
+ Name: jboss710
+ Descr: JBoss-7.1.0 specific options
-->
<profile>
- <id>jboss702</id>
+ <id>jboss710</id>
<properties>
- <jboss.version>${jboss702.version}</jboss.version>
- <jbossws.integration.target>jboss702</jbossws.integration.target>
+ <jboss.version>${jboss710.version}</jboss.version>
+ <jbossws.integration.target>jboss710</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-transactions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <version>5.0.5.Final</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb-client</artifactId>
+ <version>1.0.2.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
- <version>2.0.0-beta-1</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.12.1.GA</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<exclusions>
@@ -782,6 +806,81 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jboss.xb.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>remoting-jmx</artifactId>
+ <version>1.0.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>3.2.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>2.2.11.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ <version>2.2.11.Final</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -799,11 +898,8 @@
<configuration>
<testExcludes>
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- AS7 compilation excludes -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<!-- EJB3 client API dependencies -->
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
</testExcludes>
</configuration>
<goals>
@@ -815,11 +911,16 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
- <!-- Lib 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>
+ <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
+ <!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
+ <!-- JBossWS Native Core version available on 710 -->
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement>
+ <!-- JBossWS Native Core version specified through system property -->
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
</additionalClasspathElements>
<excludes>
<!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
@@ -832,9 +933,6 @@
<!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
-
<!--# [JBWS-2561] XOP request not properly inlined-->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
@@ -844,73 +942,22 @@
<!--# [JBWS-2397] Fix jbws1797 testcase-->
<exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+ <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher // also see compile exclude above -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
- <!-- # [JBWS-3434] Apache CXF STS integration available on AS 7.1 only -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude>
-
- <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!-- [JBWS-3276] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
-
- <!-- TODO: Injections support for WS components -->
- <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude>
-
- <!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7.0.x -->
- <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
-
- <!-- TODO: EJB3 DD driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
-
- <!-- [AS7-1101][JBWS-3322], fixed on AS 7.1.0 & above -->
- <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
-
- <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
- <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
- <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
-
- <!-- # [AS7-1338] Remote JNDI support for AS7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
-
- <!-- # [JBWS-3225] jbossws console not yet available -->
- <exclude>org/jboss/test/ws/console/**</exclude>
-
- <!-- # [JBWS-3227] handlers config file not found on classpath -->
- <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
-
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
- <!-- JAXR not available -->
+ <!-- # TODO: JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # TODO: appclient -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
- <!-- # [AS7-2961] Fixed on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude>
+ <!-- # TODO: remote JNDI support (non EJB objects) -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
- <!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude>
-
</excludes>
</configuration>
</plugin>
@@ -919,14 +966,14 @@
</profile>
<!--
- Name: jboss710
- Descr: JBoss-7.1.0 specific options
+ Name: jboss711
+ Descr: JBoss-7.1.1 specific options
-->
<profile>
- <id>jboss710</id>
+ <id>jboss711</id>
<properties>
- <jboss.version>${jboss710.version}</jboss.version>
- <jbossws.integration.target>jboss710</jbossws.integration.target>
+ <jboss.version>${jboss711.version}</jboss.version>
+ <jbossws.integration.target>jboss711</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -942,16 +989,25 @@
<groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-remote-naming</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-remote-naming</artifactId>
+ <version>1.0.2.Final</version>
+ </dependency>
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.2.Final</version>
+ <version>1.0.4.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
@@ -1035,15 +1091,15 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.remoting3</groupId>
+ <groupId>org.jboss.remotingjmx</groupId>
<artifactId>remoting-jmx</artifactId>
- <version>1.0.0.Final</version>
+ <version>1.0.2.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>3.2.1.GA</version>
+ <version>3.2.2.GA</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1075,8 +1131,6 @@
<configuration>
<testExcludes>
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- EJB3 client API dependencies -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
</testExcludes>
</configuration>
<goals>
@@ -1094,8 +1148,8 @@
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version available on 710 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement>
+ <!-- JBossWS Native Core version available on 711 -->
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement>
<!-- JBossWS Native Core version specified through system property -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
</additionalClasspathElements>
@@ -1119,22 +1173,11 @@
<!--# [JBWS-2397] Fix jbws1797 testcase-->
<exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher // also see compile exclude above -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
-
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
<!-- # TODO: JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- # TODO: appclient -->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
-
- <!-- # TODO: remote JNDI support (non EJB objects) -->
- <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
-
</excludes>
</configuration>
</plugin>
@@ -1143,14 +1186,14 @@
</profile>
<!--
- Name: jboss711
- Descr: JBoss-7.1.1 specific options
+ Name: jboss712
+ Descr: JBoss-7.1.2 specific options
-->
<profile>
- <id>jboss711</id>
+ <id>jboss712</id>
<properties>
- <jboss.version>${jboss711.version}</jboss.version>
- <jbossws.integration.target>jboss711</jbossws.integration.target>
+ <jboss.version>${jboss712.version}</jboss.version>
+ <jbossws.integration.target>jboss712</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -1325,7 +1368,7 @@
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version available on 711 -->
+ <!-- JBossWS Native Core version available on 712 -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement>
<!-- JBossWS Native Core version specified through system property -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
@@ -1361,7 +1404,7 @@
</plugins>
</build>
</profile>
-
+
<!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
Added: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -0,0 +1,115 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<server xmlns="urn:jboss:domain:1.2">
+
+ <extensions>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.webservices"/>
+ </extensions>
+
+ <profile>
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+
+ <periodic-rotating-file-handler name="FILE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="appclient.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ <append value="true"/>
+ </periodic-rotating-file-handler>
+
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup -->
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" />
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required"/>
+ </authentication>
+ </security-domain>
+ <security-domain name="jboss-web-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ <security-domain name="jboss-ejb-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:remoting:1.1">
+ <connector name="remoting-connector" socket-binding="remoting"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1"/>
+ </profile>
+
+ <interfaces>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <socket-binding-group name="standard-sockets" default-interface="public">
+ <socket-binding name="remoting" port="4448"/>
+ </socket-binding-group>
+
+</server>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-03-13 13:51:15 UTC (rev 15932)
+++ stack/cxf/trunk/pom.xml 2012-03-13 13:52:29 UTC (rev 15933)
@@ -66,11 +66,12 @@
<jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
- <jbossws.jboss710.version>4.0.3-SNAPSHOT</jbossws.jboss710.version>
- <jboss701.version>7.0.1.Final</jboss701.version>
+ <jbossws.jboss710.version>4.0.2.GA</jbossws.jboss710.version>
+ <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version>
<jboss702.version>7.0.2.Final</jboss702.version>
<jboss710.version>7.1.0.Final</jboss710.version>
- <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version>
+ <jboss711.version>7.1.1.Final</jboss711.version>
+ <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.5.3-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
@@ -151,17 +152,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss701</artifactId>
- <version>${jbossws.jboss701.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss701</artifactId>
- <version>${jbossws.jboss701.version}</version>
- <classifier>tests-integration</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss702</artifactId>
<version>${jbossws.jboss702.version}</version>
</dependency>
@@ -183,9 +173,20 @@
<classifier>tests-integration</classifier>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss711</artifactId>
+ <version>${jbossws.jboss711.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss711</artifactId>
+ <version>${jbossws.jboss711.version}</version>
+ <classifier>tests-integration</classifier>
+ </dependency>
+ <dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss711.version}</version>
+ <version>${jboss712.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.projects</groupId>
@@ -1353,18 +1354,6 @@
</profile>
<!--
- Name: jboss701
- Descr: JBoss-7.0.1.Final specific options
- -->
- <profile>
- <id>jboss701</id>
- <properties>
- <jbossws.integration.target>jboss701</jbossws.integration.target>
- <jboss.home>${jboss701.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss702
Descr: JBoss-7.0.2.Final specific options
-->
@@ -1401,6 +1390,18 @@
</profile>
<!--
+ Name: jboss712
+ Descr: JBoss-7.1.2 specific options
+ -->
+ <profile>
+ <id>jboss712</id>
+ <properties>
+ <jbossws.integration.target>jboss712</jbossws.integration.target>
+ <jboss.home>${jboss712.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
More information about the jbossws-commits
mailing list