[jbossws-commits] JBossWS SVN: r16938 - in stack/cxf/trunk: modules/dist and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Oct 22 10:08:18 EDT 2012
Author: richard.opalka at jboss.com
Date: 2012-10-22 10:08:18 -0400 (Mon, 22 Oct 2012)
New Revision: 16938
Added:
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/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:
removing AS 710 support, adding AS 713 support
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2012-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/build.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -68,33 +68,33 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss710.home" value="${profiles.profile.properties.jboss710.home}">
- <isset property="profiles.profile.properties.jboss710.home"/>
- </condition>
<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>
+ <condition property="jboss713.home" value="${profiles.profile.properties.jboss713.home}">
+ <isset property="profiles.profile.properties.jboss713.home"/>
+ </condition>
<condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}">
<isset property="profiles.profile.properties.jboss720.home"/>
</condition>
- <fail message="jboss home not set, use jboss710.home=value, jboss711.home=value, jboss712.home=value or jboss720.home=value to set">
+ <fail message="jboss home not set, use jboss711.home=value, jboss712.home=value, jboss713.home=value or jboss720.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss710.home"/>
- </not>
- <not>
<isset property="jboss711.home"/>
</not>
<not>
<isset property="jboss712.home"/>
</not>
<not>
+ <isset property="jboss713.home"/>
+ </not>
+ <not>
<isset property="jboss720.home"/>
</not>
</and>
@@ -102,9 +102,9 @@
</fail>
<echo/>
- <echo message="jboss710.home=${jboss710.home}"/>
<echo message="jboss711.home=${jboss711.home}"/>
<echo message="jboss712.home=${jboss712.home}"/>
+ <echo message="jboss713.home=${jboss713.home}"/>
<echo message="jboss720.home=${jboss720.home}"/>
</target>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2012-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/dist/pom.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -32,21 +32,21 @@
<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>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss712</classifier>
+ <classifier>jboss713</classifier>
</dependency>
<dependency>
@@ -133,17 +133,17 @@
<!-- container integration -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss710-server-integration</artifactId>
+ <artifactId>jbossws-jboss711-server-integration</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss711-server-integration</artifactId>
+ <artifactId>jbossws-jboss712-server-integration</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-server-integration</artifactId>
+ <artifactId>jbossws-jboss713-server-integration</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -199,15 +199,15 @@
<configuration>
<target>
<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-jboss710.txt">
- <param name="targetName" expression="jboss710" />
- </xslt>
<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>
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss713.txt">
+ <param name="targetName" expression="jboss713" />
+ </xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt">
<param name="targetName" expression="jboss720" />
</xslt>
@@ -239,17 +239,17 @@
<!-- Libraries required for running binary distro testsuite and not available on server-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss710-tests-integration</artifactId>
+ <artifactId>jbossws-jboss711-tests-integration</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss711-tests-integration</artifactId>
+ <artifactId>jbossws-jboss712-tests-integration</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-tests-integration</artifactId>
+ <artifactId>jbossws-jboss713-tests-integration</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-10-22 14:08:18 UTC (rev 16938)
@@ -13,16 +13,16 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss710
ant deploy-jboss711
ant deploy-jboss712
+ ant deploy-jboss713
ant deploy-jboss720
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-jboss712
+ ant -Dspring=true deploy-jboss713
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-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-10-22 14:08:18 UTC (rev 16938)
@@ -3,13 +3,13 @@
#
# Optional JBoss Home
-jboss710.home=@jboss710.home@
jboss711.home=@jboss711.home@
jboss712.home=@jboss712.home@
+jboss713.home=@jboss713.home@
jboss720.home=@jboss720.home@
-# The JBoss server under test. This can be [jboss710|jboss711|jboss712|jboss720]
-jbossws.integration.target=jboss712
+# The JBoss server under test. This can be [jboss711|jboss712|jboss713|jboss720]
+jbossws.integration.target=jboss713
# 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-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -54,35 +54,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment jboss710 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss710">
- <property name="jbossws.integration.target" value="jboss710"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss710">
- <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/>
- <copy todir="${jboss710.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="${jboss710.home}/modules">
- <fileset dir="${deploy.structure}/modules">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710">
- <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment jboss711 -->
<!-- ================================================================== -->
@@ -141,6 +112,35 @@
</target>
<!-- ================================================================== -->
+ <!-- Deployment jboss713 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss713">
+ <property name="jbossws.integration.target" value="jboss713"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss713" depends="undeploy-jboss713,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss713">
+ <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/>
+ <copy todir="${jboss713.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="${jboss713.home}/modules">
+ <fileset dir="${deploy.structure}/modules">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </target>
+
+ <target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713">
+ <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss713.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-7.2.x -->
<!-- ================================================================== -->
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -33,14 +33,14 @@
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
- <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"/>
+ <property name="jboss713.available.file" value="${jboss713.home}/jboss-modules.jar"/>
<property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/>
- <available property="jboss710.available" file="${jboss710.available.file}"/>
<available property="jboss711.available" file="${jboss711.available.file}"/>
<available property="jboss712.available" file="${jboss712.available.file}"/>
+ <available property="jboss713.available" file="${jboss713.available.file}"/>
<available property="jboss720.available" file="${jboss720.available.file}"/>
<tstamp>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -59,9 +59,9 @@
<condition property="jbossws.integration.jboss71x" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss712"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss713"/>
</or>
</condition>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2012-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/resources/pom.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -51,15 +51,6 @@
<phase>package</phase>
</execution>
<execution>
- <id>jboss710</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>jboss710</classifier>
- <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory>
- </configuration>
- </execution>
- <execution>
<id>jboss711</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
@@ -78,6 +69,15 @@
</configuration>
</execution>
<execution>
+ <id>jboss713</id>
+ <goals><goal>jar</goal></goals>
+ <phase>package</phase>
+ <configuration>
+ <classifier>jboss713</classifier>
+ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss713/jbossws.beans</classesDirectory>
+ </configuration>
+ </execution>
+ <execution>
<id>jboss720</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
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-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -31,29 +31,29 @@
<copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ 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-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.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-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss712/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"
+ tofile="${dest.dir}/jbossws-jboss713/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"
+ tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
/>
<copy
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -605,19 +605,19 @@
</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>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss710-tests-integration</artifactId>
+ <artifactId>jbossws-jboss711-tests-integration</artifactId>
</dependency>
</dependencies>
<build>
@@ -629,62 +629,28 @@
<endorseddirs>${project.build.directory}/endorsed</endorseddirs>
</compilerArguments>
</configuration>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <phase>test-compile</phase>
- <configuration>
- <testExcludes>
- <!-- EJB3 client API dependencies -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
- </testExcludes>
- </configuration>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<excludes>
- <!--# TestCases requiring trustore in jboss-web tomcat configuration-->
- <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.*</exclude>
-
<!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
<exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
<!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
- <!--# [JBWS-3503] Enable this after find out how to easily generate client classpath in as7-->
- <exclude>org/jboss/test/ws/jaxws/jbws1666/**</exclude>
-
<!--# [JBWS-2561] XOP request not properly inlined-->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
<!--# [JBWS-2480] Soap attachments are dropped on server response-->
<exclude>org/jboss/test/ws/jaxws/jbws1283/**</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-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</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>
-
<!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed -->
<exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
@@ -701,19 +667,19 @@
</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>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss711-tests-integration</artifactId>
+ <artifactId>jbossws-jboss712-tests-integration</artifactId>
</dependency>
</dependencies>
<build>
@@ -745,7 +711,6 @@
<!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude>
<!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed -->
<exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
@@ -763,19 +728,19 @@
</profile>
<!--
- Name: jboss712
- Descr: JBoss-7.1.2 specific options
+ Name: jboss713
+ Descr: JBoss-7.1.3 specific options
-->
<profile>
- <id>jboss712</id>
+ <id>jboss713</id>
<properties>
- <jboss.version>${jboss712.version}</jboss.version>
- <jbossws.integration.target>jboss712</jbossws.integration.target>
+ <jboss.version>${jboss713.version}</jboss.version>
+ <jbossws.integration.target>jboss713</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-tests-integration</artifactId>
+ <artifactId>jbossws-jboss713-tests-integration</artifactId>
</dependency>
</dependencies>
<build>
Added: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -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.3">
+
+ <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-10-22 14:06:11 UTC (rev 16937)
+++ stack/cxf/trunk/pom.xml 2012-10-22 14:08:18 UTC (rev 16938)
@@ -64,13 +64,13 @@
<jbossws.common.version>2.1.0.Final</jbossws.common.version>
<jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.1.1-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss710.version>4.1.1-SNAPSHOT</jbossws.jboss710.version>
<jbossws.jboss711.version>4.1.1-SNAPSHOT</jbossws.jboss711.version>
<jbossws.jboss712.version>4.1.1-SNAPSHOT</jbossws.jboss712.version>
+ <jbossws.jboss713.version>4.1.1-SNAPSHOT</jbossws.jboss713.version>
<jbossws.native.version>4.1.0.Final</jbossws.native.version>
- <jboss710.version>7.1.0.Final</jboss710.version>
<jboss711.version>7.1.1.Final</jboss711.version>
<jboss712.version>7.1.2.Final</jboss712.version>
+ <jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.7.1-SNAPSHOT</cxf.version>
@@ -150,16 +150,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss710-server-integration</artifactId>
- <version>${jbossws.jboss710.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss710-tests-integration</artifactId>
- <version>${jbossws.jboss710.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss711-server-integration</artifactId>
<version>${jbossws.jboss711.version}</version>
</dependency>
@@ -179,6 +169,16 @@
<version>${jbossws.jboss712.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss713-server-integration</artifactId>
+ <version>${jbossws.jboss713.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss713-tests-integration</artifactId>
+ <version>${jbossws.jboss713.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
<version>${jboss720.version}</version>
@@ -1346,18 +1346,6 @@
</profile>
<!--
- Name: jboss710
- Descr: JBoss-7.1.0 specific options
- -->
- <profile>
- <id>jboss710</id>
- <properties>
- <jbossws.integration.target>jboss710</jbossws.integration.target>
- <jboss.home>${jboss710.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss711
Descr: JBoss-7.1.1 specific options
-->
@@ -1382,6 +1370,18 @@
</profile>
<!--
+ Name: jboss713
+ Descr: JBoss-7.1.3 specific options
+ -->
+ <profile>
+ <id>jboss713</id>
+ <properties>
+ <jbossws.integration.target>jboss713</jbossws.integration.target>
+ <jboss.home>${jboss713.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: jboss720
Descr: JBoss-7.2.0 specific options
-->
More information about the jbossws-commits
mailing list