JBossWS SVN: r15701 - in stack/native/branches/jbossws-native-4.0.x: modules/client and 8 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-22 04:48:26 -0500 (Wed, 22 Feb 2012)
New Revision: 15701
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
Build to 4.0.2-SNAPSHOT
Modified: stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -5,12 +5,12 @@
<name>JBoss Web Services - Stack Native Distribution</name>
<artifactId>jbossws-native-dist</artifactId>
<packaging>pom</packaging>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-02-22 09:48:26 UTC (rev 15701)
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<description>JBossWS Native stack</description>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -42,9 +42,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/jbos...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbossws-na...</url>
</scm>
<!-- Modules -->
12 years, 10 months
JBossWS SVN: r15700 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/scripts and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: ropalka
Date: 2012-02-22 03:52:57 -0500 (Wed, 22 Feb 2012)
New Revision: 15700
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/build.xml
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/Install.txt
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ant.properties.example
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-setup.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
Merged revisions 15696 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15696 | alessio.soldano(a)jboss.com | 2012-02-21 23:55:48 +0100 (Tue, 21 Feb 2012) | 2 lines
Adding jboss711 target and removing 700
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696
Modified: stack/native/branches/jbossws-native-4.0.x/build.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/build.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/build.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -65,9 +65,6 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
- <isset property="profiles.profile.properties.jboss700.home"/>
- </condition>
<condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}">
<isset property="profiles.profile.properties.jboss701.home"/>
</condition>
@@ -77,14 +74,14 @@
<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>
- <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss701.home"/>
- </not>
- <not>
<isset property="jboss702.home"/>
</not>
<not>
@@ -93,15 +90,18 @@
<not>
<isset property="jboss710.home"/>
</not>
+ <not>
+ <isset property="jboss711.home"/>
+ </not>
</and>
</condition>
</fail>
<echo/>
- <echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss701.home=${jboss701.home}"/>
<echo message="jboss702.home=${jboss702.home}"/>
<echo message="jboss710.home=${jboss710.home}"/>
+ <echo message="jboss711.home=${jboss711.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/scripts/antrun-beans-config.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/scripts/antrun-beans-config.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -31,22 +31,22 @@
<copy
file="${src.dir}/jbossws-native-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
file="${src.dir}/jbossws-native-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
file="${src.dir}/jbossws-native-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
file="${src.dir}/jbossws-native-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"
/>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -46,13 +46,6 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss700</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- <version>${project.version}</version>
<classifier>jboss701</classifier>
</dependency>
@@ -110,22 +103,6 @@
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</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-jboss701</artifactId>
<scope>provided</scope>
<exclusions>
@@ -209,11 +186,6 @@
<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-jboss700.txt">
- <param name="targetName" expression="jboss700" />
- </xslt>
- <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>
@@ -227,6 +199,11 @@
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>
</tasks>
</configuration>
<goals>
@@ -254,12 +231,6 @@
<!-- Libraries required for running binary distro testsuite and not available on server-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <classifier>tests-integration</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss701</artifactId>
<classifier>tests-integration</classifier>
<scope>provided</scope>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/Install.txt 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/Install.txt 2012-02-22 08:52:57 UTC (rev 15700)
@@ -13,10 +13,10 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss700
ant deploy-jboss701
ant deploy-jboss702
ant deploy-jboss710
+ ant deploy-jboss711
4.) Execute the samples to verify your installation
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-02-22 08:52:57 UTC (rev 15700)
@@ -3,13 +3,13 @@
#
# Optional JBoss Home
-jboss700.home=(a)jboss700.home@
jboss701.home=(a)jboss701.home@
jboss702.home=(a)jboss702.home@
jboss710.home=(a)jboss710.home@
+jboss711.home=(a)jboss711.home@
-# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710]
-jbossws.integration.target=jboss700
+# The JBoss server under test. This can be [jboss701|jboss702|jboss710|jboss711]
+jbossws.integration.target=jboss710
# The JBoss settings
jboss.bind.address=localhost
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -46,35 +46,6 @@
</antcall>
</target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss700 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss700">
- <property name="jbossws.integration.target" value="jboss700"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss70x" description="Deploy jbossws to jboss700">
- <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <copy todir="${jboss700.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="${jboss700.home}/modules">
- <fileset dir="${deploy.structure}/modules">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss700" depends="target-jboss700,init" description="Remove jbossws from jboss700">
- <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
<!-- ================================================================== -->
<!-- Deployment JBoss701 -->
<!-- ================================================================== -->
@@ -134,10 +105,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-7.1.0 -->
+ <!-- Prepare Deployment Structure JBoss-7.1.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss710" depends="prepare-deploy">
+ <target name="deploy-structure-jboss71x" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<path id="jbossws-common.path">
@@ -164,7 +135,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710" description="Deploy jbossws to jboss710">
+ <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss71x" 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}">
@@ -184,4 +155,33 @@
<macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Deployment jboss711 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss711">
+ <property name="jbossws.integration.target" value="jboss711"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss711" depends="undeploy-jboss711,deploy-structure-jboss71x" description="Deploy jbossws to jboss711">
+ <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
+ <copy todir="${jboss711.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="${jboss711.home}/modules">
+ <fileset dir="${deploy.structure}/modules">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </target>
+
+ <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711">
+ <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ </target>
+
</project>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -37,16 +37,16 @@
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<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"/>
- <available property="jboss700.available" file="${jboss700.available.file}"/>
<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}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -60,13 +60,15 @@
<condition property="jbossws.integration.jboss700" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss701"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss702"/>
</or>
</condition>
<condition property="jbossws.integration.jboss710" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+ </or>
</condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -35,7 +35,7 @@
<include>org.jboss.ws.native:jbossws-native-client</include>
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
- <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss700</include>
+ <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss701</include>
<include>org.jboss.ws.native:jbossws-native-core</include>
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>javax.jws:jsr181-api:jar</include>
@@ -69,7 +69,6 @@
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
- <include>org.jboss.ws:jbossws-jboss700:jar</include>
<include>org.jboss.ws:jbossws-jboss701:jar</include>
<include>org.jboss.ws:jbossws-jboss702:jar</include>
<include>org.jboss:jbossxb:jar</include>
@@ -84,17 +83,6 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss700:jar:*:tests-integration</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
- <scope>provided</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
- <includes>
<include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -418,15 +418,16 @@
</build>
</profile>
+
<!--
- Name: jboss700
- Descr: JBoss-7.0.0.Final specific options
+ Name: jboss701
+ Descr: JBoss-7.0.1.Final specific options
-->
<profile>
- <id>jboss700</id>
+ <id>jboss701</id>
<properties>
- <jboss.version>${jboss700.version}</jboss.version>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
+ <jboss.version>${jboss701.version}</jboss.version>
+ <jbossws.integration.target>jboss701</jbossws.integration.target>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
@@ -553,13 +554,8 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!-- [JBWS-3330] Restore RecordProcessor functionalities, solved in AS 7.0.1 or greater -->
- <exclude>org/jboss/test/ws/management/recording/**</exclude>
-
<!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7, solved in AS 7.0.1 or greater -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
@@ -579,7 +575,7 @@
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
+ <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
<!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only -->
@@ -593,14 +589,14 @@
</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>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
@@ -760,16 +756,16 @@
</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>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
@@ -777,15 +773,35 @@
<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.picketbox</groupId>
@@ -817,6 +833,18 @@
<artifactId>xalan</artifactId>
<version>2.7.1.patch01-brew</version>
</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>
</dependencies>
<build>
<plugins>
@@ -833,7 +861,7 @@
<testExcludes>
<!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
</testExcludes>
</configuration>
<goals>
@@ -845,7 +873,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
<excludes>
<!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
@@ -853,9 +881,6 @@
<!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
- <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
-
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
@@ -868,77 +893,153 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- [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/jbws2634/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude>
-
- <!-- TODO: Native webserviceref stuff -->
- <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>
-
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
- <!-- TODO: EJB3 DD driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
- <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][AS7-1125] waiting for metadata upgrade in AS7, solved in AS 7.0.1 or greater -->
- <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/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- # [AS7-1338] Remote JNDI support for AS7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
- <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</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>
+
+ <!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # Remote JNDI lookup & jaxrpc client issues -->
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>
- <!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude>
+ <!-- # webservices-description in jboss-web.xml / jboss.xml -->
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>
+ <!-- # unpackaged EAR deployment failure -->
+ <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude>
+
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</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>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-02-22 08:50:34 UTC (rev 15699)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-02-22 08:52:57 UTC (rev 15700)
@@ -63,13 +63,12 @@
<jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss700.version>4.0.1.GA</jbossws.jboss700.version>
<jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
- <jboss700.version>7.0.0.Final</jboss700.version>
<jboss701.version>7.0.1.Final</jboss701.version>
<jboss702.version>7.0.2.Final</jboss702.version>
- <jboss710.version>7.1.0.Final-SNAPSHOT</jboss710.version>
+ <jboss710.version>7.1.0.Final</jboss710.version>
+ <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<ant.version>1.7.1</ant.version>
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
@@ -126,17 +125,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <version>${jbossws.jboss700.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <version>${jbossws.jboss700.version}</version>
- <classifier>tests-integration</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss701</artifactId>
<version>${jbossws.jboss701.version}</version>
</dependency>
@@ -157,6 +145,8 @@
<version>${jbossws.jboss702.version}</version>
<classifier>tests-integration</classifier>
</dependency>
+ <!-- TODO Move dependency below to jboss711.version and add dependency on org.jboss.ws:jbossws-jboss710:${jbossws.jboss710.version}
+ when 710 container integration is needed and created -->
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
@@ -557,18 +547,6 @@
</profile>
<!--
- Name: jboss700
- Descr: JBoss-7.0.0 specific options
- -->
- <profile>
- <id>jboss700</id>
- <properties>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
- <jboss.home>${jboss700.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss701
Descr: JBoss-7.0.1 specific options
-->
@@ -604,7 +582,19 @@
</properties>
</profile>
+ <!--
+ Name: jboss711
+ Descr: JBoss-7.1.1 specific options
+ -->
+ <profile>
+ <id>jboss711</id>
+ <properties>
+ <jbossws.integration.target>jboss711</jbossws.integration.target>
+ <jboss.home>${jboss711.home}</jboss.home>
+ </properties>
+ </profile>
+
<!--
Name: smoketest
Descr: Executes the smoke tests
12 years, 10 months
JBossWS SVN: r15699 - in hudson/trunk: hudson-home and 17 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-22 03:50:34 -0500 (Wed, 22 Feb 2012)
New Revision: 15699
Added:
hudson/trunk/hudson-home/jobs/AS-7.1.1/
hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.1-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6/config.xml
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
Log:
Adding jboss711 target
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2012-02-22 08:43:19 UTC (rev 15698)
+++ hudson/trunk/ant.properties.example 2012-02-22 08:50:34 UTC (rev 15699)
@@ -29,9 +29,13 @@
hudson.jboss702.rev=7.0.2.Final
hudson.jboss710.url=https://github.com/jbossas/jboss-as
-hudson.jboss710.build=jboss-as-7.1.0.Final-SNAPSHOT
-hudson.jboss710.rev=master
+hudson.jboss710.build=jboss-as-7.1.0.Final
+hudson.jboss710.rev=7.1.0.Final
+hudson.jboss711.url=https://github.com/jbossas/jboss-as
+hudson.jboss711.build=jboss-as-7.1.1.Final-SNAPSHOT
+hudson.jboss711.rev=master
+
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2012-02-22 08:43:19 UTC (rev 15698)
+++ hudson/trunk/hudson-home/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -39,6 +39,7 @@
<tr><th align=left>@hudson.jboss701.build@</th><td>-r(a)hudson.jboss701.rev@ @hudson.jboss701.url@</td></tr>
<tr><th align=left>@hudson.jboss702.build@</th><td>-r(a)hudson.jboss702.rev@ @hudson.jboss702.url@</td></tr>
<tr><th align=left>@hudson.jboss710.build@</th><td>-r(a)hudson.jboss710.rev@ @hudson.jboss710.url@</td></tr>
+ <tr><th align=left>@hudson.jboss711.build@</th><td>-r(a)hudson.jboss711.rev@ @hudson.jboss711.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
@@ -58,6 +59,7 @@
<string>AS-7.0.1</string>
<string>AS-7.0.2</string>
<string>AS-7.1.0</string>
+ <string>AS-7.1.1</string>
</jobNames>
<name>AS Builds</name>
<description>
@@ -77,12 +79,15 @@
<string>NATIVE-CORE-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.2-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string>
+ <string>NATIVE-CORE-AS-7.1.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-7.0.2-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6</string>
+ <string>NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6</string>
</jobNames>
<name>Native Tests</name>
<description>
@@ -104,21 +109,27 @@
<string>CXF-CORE-AS-7.0.1-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.1.1-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.1.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.1-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.1.0-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-7.1.1-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -139,22 +150,28 @@
<string>CXF-CORE-AS-7.0.1-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.1.1-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.2-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.1.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6</string>
<string>NATIVE-LIGHT</string>
<string>NATIVE-CORE-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.2-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string>
+ <string>NATIVE-CORE-AS-7.1.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6</string>
</jobNames>
<name>Working Days Tests</name>
<description>
Added: hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <actions/>
+ <description>Builds JBoss AS 7.1.1</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <scm class="hudson.plugins.git.GitSCM">
+ <configVersion>1</configVersion>
+ <remoteRepositories>
+ <org.spearce.jgit.transport.RemoteConfig>
+ <string>origin</string>
+ <int>5</int>
+ <string>fetch</string>
+ <string>+refs/heads/*:refs/remotes/origin/*</string>
+ <string>receivepack</string>
+ <string>git-upload-pack</string>
+ <string>uploadpack</string>
+ <string>git-upload-pack</string>
+ <string>url</string>
+ <string>@hudson.jboss711.url@.git</string>
+ <string>tagopt</string>
+ <string></string>
+ </org.spearce.jgit.transport.RemoteConfig>
+ </remoteRepositories>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>@hudson.jboss711.rev@</name>
+ </hudson.plugins.git.BranchSpec>
+ </branches>
+ <localBranch></localBranch>
+ <mergeOptions/>
+ <recursiveSubmodules>false</recursiveSubmodules>
+ <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+ <authorOrCommitter>false</authorOrCommitter>
+ <clean>false</clean>
+ <wipeOutWorkspace>false</wipeOutWorkspace>
+ <pruneBranches>false</pruneBranches>
+ <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+ <gitTool>Default</gitTool>
+ <browser class="hudson.plugins.git.browser.GithubWeb">
+ <url>@hudson.jboss710.url@</url>
+ </browser>
+ <submoduleCfg class="list"/>
+ <relativeTargetDir></relativeTargetDir>
+ <excludedRegions></excludedRegions>
+ <excludedUsers></excludedUsers>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <triggers class="vector"/>
+ <concurrentBuild>false</concurrentBuild>
+ <builders>
+ <hudson.tasks.Shell>
+ <command>MAVEN_OPTS="-Xmx1024m -Xms512m -XX:MaxPermSize=128m"
+export MAVEN_OPTS
+
+./build.sh clean install -Dskip-download-sources -U -B</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers>
+ <hudson.tasks.Mailer>
+ <recipients></recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2012-02-22 08:43:19 UTC (rev 15698)
+++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-7.0.1, AS-7.0.2, AS-7.1.0</childProjects>
+ <childProjects>AS-7.0.1, AS-7.0.2, AS-7.1.0, AS-7.1.1</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2012-02-22 08:43:19 UTC (rev 15698)
+++ hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-7.1.0</childProjects>
+ <childProjects>AS-7.1.1</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2012-02-22 08:43:19 UTC (rev 15698)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -14,8 +14,12 @@
, CXF-CORE-AS-7.1.0-SUN-JDK-6
+, CXF-CORE-AS-7.1.1-SUN-JDK-6
+
, CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6
+, CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6
+
, CXF-BINDIST-AS-7.0.1-SUN-JDK-6
, CXF-BINDIST-AS-7.0.2-SUN-JDK-6
@@ -26,8 +30,12 @@
, CXF-BINDIST-AS-7.1.0-SUN-JDK-6
+, CXF-BINDIST-AS-7.1.1-SUN-JDK-6
+
, CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6
+, CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6
+
, CXF-SRCDIST-AS-7.0.1-SUN-JDK-6
, CXF-SRCDIST-AS-7.0.2-SUN-JDK-6
@@ -38,7 +46,11 @@
, CXF-SRCDIST-AS-7.1.0-SUN-JDK-6
+, CXF-SRCDIST-AS-7.1.1-SUN-JDK-6
+
, CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6
+
+, CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.1.1 with SpringFramework libraries available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.1-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-BINDIST-AS-7.1.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.1.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss711.build@ with SpringFramework libraires available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.1-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-7.1.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss711.build@ with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2012-02-22 08:43:19 UTC (rev 15698)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -16,6 +16,10 @@
, CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6
+, CXF-CORE-AS-7.1.1-SUN-JDK-6
+
+, CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6
+
, CXF-BINDIST-AS-7.0.1-SUN-JDK-6
, CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6
@@ -27,6 +31,10 @@
, CXF-BINDIST-AS-7.1.0-SUN-JDK-6
, CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6
+
+, CXF-BINDIST-AS-7.1.1-SUN-JDK-6
+
+, CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.1.1 with SpringFramework libraries available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.1-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-AS-7.1.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.1.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2012-02-22 08:43:19 UTC (rev 15698)
+++ hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -21,6 +21,12 @@
, NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6
, NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6
+
+, NATIVE-CORE-AS-7.1.1-SUN-JDK-6
+
+, NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6
+
+, NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-7.1.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.1-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.1-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-CORE-AS-7.1.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS="-Dinterop=true"
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ against @hudson.jboss711.build@ with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2012-02-22 08:43:19 UTC (rev 15698)
+++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -15,6 +15,10 @@
, NATIVE-CORE-AS-7.1.0-SUN-JDK-6
, NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6
+
+, NATIVE-CORE-AS-7.1.1-SUN-JDK-6
+
+, NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6/config.xml 2012-02-22 08:50:34 UTC (rev 15699)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss711
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.1/workspace/build/target/(a)hudson.jboss711.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-7.1.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
12 years, 10 months
JBossWS SVN: r15698 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: ropalka
Date: 2012-02-22 03:43:19 -0500 (Wed, 22 Feb 2012)
New Revision: 15698
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/build.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Merged revisions 15695,15697 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15695 | alessio.soldano(a)jboss.com | 2012-02-21 10:57:17 +0100 (Tue, 21 Feb 2012) | 2 lines
Adding jboss711 target and removing 700
.......
r15697 | alessio.soldano(a)jboss.com | 2012-02-21 23:56:16 +0100 (Tue, 21 Feb 2012) | 1 line
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15675,15682
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15675,15682,15695-15697
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/build.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/build.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -68,9 +68,6 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
- <isset property="profiles.profile.properties.jboss700.home"/>
- </condition>
<condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}">
<isset property="profiles.profile.properties.jboss701.home"/>
</condition>
@@ -80,15 +77,15 @@
<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>
- <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss700.home"/>
- </not>
- <not>
<isset property="jboss701.home"/>
</not>
<not>
@@ -97,15 +94,18 @@
<not>
<isset property="jboss710.home"/>
</not>
+ <not>
+ <isset property="jboss711.home"/>
+ </not>
</and>
</condition>
</fail>
<echo/>
- <echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss701.home=${jboss701.home}"/>
<echo message="jboss702.home=${jboss702.home}"/>
<echo message="jboss710.home=${jboss710.home}"/>
+ <echo message="jboss711.home=${jboss711.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -33,13 +33,6 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss700</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- <version>${project.version}</version>
<classifier>jboss701</classifier>
</dependency>
@@ -131,22 +124,6 @@
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</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-jboss701</artifactId>
<scope>provided</scope>
<exclusions>
@@ -227,9 +204,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-jboss700.txt">
- <param name="targetName" expression="jboss700" />
- </xslt>
<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>
@@ -239,6 +213,9 @@
<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>
</tasks>
</configuration>
<goals>
@@ -267,12 +244,6 @@
<!-- Libraries required for running binary distro testsuite and not available on server-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <classifier>tests-integration</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss701</artifactId>
<classifier>tests-integration</classifier>
<scope>provided</scope>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt 2012-02-22 08:43:19 UTC (rev 15698)
@@ -13,16 +13,16 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss700
ant deploy-jboss701
ant deploy-jboss702
ant deploy-jboss710
+ ant deploy-jboss711
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-jboss700
+ ant -Dspring=true deploy-jboss710
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/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-02-22 08:43:19 UTC (rev 15698)
@@ -3,13 +3,13 @@
#
# Optional JBoss Home
-jboss700.home=(a)jboss700.home@
jboss701.home=(a)jboss701.home@
jboss702.home=(a)jboss702.home@
jboss710.home=(a)jboss710.home@
+jboss711.home=(a)jboss711.home@
-# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710]
-jbossws.integration.target=jboss700
+# The JBoss server under test. This can be [jboss701|jboss702|jboss710|jboss711]
+jbossws.integration.target=jboss710
# The JBoss settings
jboss.bind.address=localhost
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -47,35 +47,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss700 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss700">
- <property name="jbossws.integration.target" value="jboss700"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss700">
- <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <copy todir="${jboss700.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="${jboss700.home}/modules">
- <fileset dir="${deploy.structure}/modules">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss700" depends="target-jboss700,init" description="Remove jbossws from jboss700">
- <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment JBoss701 -->
<!-- ================================================================== -->
@@ -134,10 +105,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-7.1.0 -->
+ <!-- Prepare Deployment Structure JBoss-7.1.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss710" depends="prepare-deploy">
+ <target name="deploy-structure-jboss71x" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<path id="jbossws-common.path">
@@ -164,7 +135,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710,check-spring,install-spring-module71x" description="Deploy jbossws to jboss710">
+ <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}">
@@ -185,6 +156,35 @@
</target>
<!-- ================================================================== -->
+ <!-- Deployment jboss711 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss711">
+ <property name="jbossws.integration.target" value="jboss711"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss711" depends="undeploy-jboss711,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss711">
+ <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
+ <copy todir="${jboss711.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="${jboss711.home}/modules">
+ <fileset dir="${deploy.structure}/modules">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </target>
+
+ <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711">
+ <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Spring -->
<!-- ================================================================== -->
<target name="check-spring">
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -36,15 +36,15 @@
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<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"/>
- <available property="jboss700.available" file="${jboss700.available.file}"/>
<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}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -60,13 +60,15 @@
<condition property="jbossws.integration.jboss700" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss701"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss702"/>
</or>
</condition>
<condition property="jbossws.integration.jboss710" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+ </or>
</condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -75,7 +75,6 @@
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
- <include>org.jboss.ws:jbossws-jboss700:jar</include>
<include>org.jboss.ws:jbossws-jboss701:jar</include>
<include>org.jboss.ws:jbossws-jboss702:jar</include>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
@@ -89,17 +88,6 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss700:jar:*:tests-integration</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
- <scope>provided</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
- <includes>
<include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -43,22 +43,12 @@
<phase>package</phase>
<configuration>
<excludes>
- <exclude>**/jbossws-jboss700/**</exclude>
<exclude>**/jbossws-jboss701/**</exclude>
<exclude>**/jbossws-jboss702/**</exclude>
</excludes>
</configuration>
</execution>
<execution>
- <id>jboss700</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>jboss700</classifier>
- <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss700/jbossws.beans</classesDirectory>
- </configuration>
- </execution>
- <execution>
<id>jboss701</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -31,15 +31,6 @@
<copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
- />
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-cxf-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
@@ -65,6 +56,15 @@
tofile="${dest.dir}/jbossws-jboss710/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"
+ />
+ <copy
+ file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
+ tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ />
+
</target>
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -552,15 +552,16 @@
</dependencies>
</profile>
+
<!--
- Name: jboss700
- Descr: JBoss-7.0.0.Final specific options
+ Name: jboss701
+ Descr: JBoss-7.0.1.Final specific options
-->
<profile>
- <id>jboss700</id>
+ <id>jboss701</id>
<properties>
- <jboss.version>${jboss700.version}</jboss.version>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
+ <jboss.version>${jboss701.version}</jboss.version>
+ <jbossws.integration.target>jboss701</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -660,6 +661,9 @@
<!--# Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</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>
+
<!-- ////////////////////////// -->
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
@@ -676,7 +680,7 @@
<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 -->
+ <!-- @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>
@@ -687,13 +691,8 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!-- # [JBWS-3330] fixed on AS 7.0.1 & above -->
- <exclude>org/jboss/test/ws/management/recording/**</exclude>
-
- <!-- [AS7-1101][JBWS-3322], fixed on AS 7.0.1 & above -->
+ <!-- [AS7-1101][JBWS-3322], fixed on AS 7.1.0 & above -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
@@ -739,16 +738,16 @@
</plugins>
</build>
</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>
@@ -922,31 +921,51 @@
</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>
@@ -954,6 +973,11 @@
<version>2.0.0-beta-1</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>
@@ -963,6 +987,69 @@
</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>
</dependencies>
<build>
<plugins>
@@ -980,11 +1067,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>
@@ -996,11 +1080,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 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 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 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-->
@@ -1013,9 +1102,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>
@@ -1025,80 +1111,32 @@
<!--# [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>
-
- <!--# Seems MSFT interop. endpoints are down :(-->
+ <!-- # Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
+ <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
+
<!-- ////////////////////////// -->
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</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-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>
- <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 -->
- <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
+ <!-- # TODO: appclient -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # TODO: remote JNDI support (non EJB objects) -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
- <!-- # [AS7-2961] Fixed on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude>
-
- <!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude>
-
</excludes>
</configuration>
</plugin>
@@ -1107,14 +1145,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>
@@ -1268,7 +1306,7 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
- <!-- JBossWS Native Core version available on 710 -->
+ <!-- JBossWS Native Core version available on 711 -->
<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 overwritten by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-21 22:56:16 UTC (rev 15697)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-22 08:43:19 UTC (rev 15698)
@@ -64,13 +64,12 @@
<jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss700.version>4.0.1.GA</jbossws.jboss700.version>
<jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
- <jboss700.version>7.0.0.Final</jboss700.version>
<jboss701.version>7.0.1.Final</jboss701.version>
<jboss702.version>7.0.2.Final</jboss702.version>
- <jboss710.version>7.1.0.Final-SNAPSHOT</jboss710.version>
+ <jboss710.version>7.1.0.Final</jboss710.version>
+ <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.4.6</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
@@ -150,17 +149,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <version>${jbossws.jboss700.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <version>${jbossws.jboss700.version}</version>
- <classifier>tests-integration</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss701</artifactId>
<version>${jbossws.jboss701.version}</version>
</dependency>
@@ -181,6 +169,8 @@
<version>${jbossws.jboss702.version}</version>
<classifier>tests-integration</classifier>
</dependency>
+ <!-- TODO Move dependency below to jboss711.version and add dependency on org.jboss.ws:jbossws-jboss710:${jbossws.jboss710.version}
+ when 710 container integration is needed and created -->
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
@@ -1265,18 +1255,6 @@
</profile>
<!--
- Name: jboss700
- Descr: JBoss-7.0.0.Final specific options
- -->
- <profile>
- <id>jboss700</id>
- <properties>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
- <jboss.home>${jboss700.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss701
Descr: JBoss-7.0.1.Final specific options
-->
@@ -1313,6 +1291,18 @@
</profile>
<!--
+ Name: jboss711
+ Descr: JBoss-7.1.1 specific options
+ -->
+ <profile>
+ <id>jboss711</id>
+ <properties>
+ <jbossws.integration.target>jboss711</jbossws.integration.target>
+ <jboss.home>${jboss711.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
12 years, 10 months
JBossWS SVN: r15697 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-21 17:56:16 -0500 (Tue, 21 Feb 2012)
New Revision: 15697
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
Log:
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-02-21 22:55:48 UTC (rev 15696)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-02-21 22:56:16 UTC (rev 15697)
@@ -8,7 +8,7 @@
jboss710.home=(a)jboss710.home@
jboss711.home=(a)jboss711.home@
-# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710]
+# The JBoss server under test. This can be [jboss701|jboss702|jboss710|jboss711]
jbossws.integration.target=jboss710
# The JBoss settings
12 years, 10 months
JBossWS SVN: r15696 - in stack/native/trunk: modules/core/src/main/scripts and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-21 17:55:48 -0500 (Tue, 21 Feb 2012)
New Revision: 15696
Modified:
stack/native/trunk/build.xml
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/trunk/modules/dist/pom.xml
stack/native/trunk/modules/dist/src/main/distro/Install.txt
stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
stack/native/trunk/modules/dist/src/main/distro/build.xml
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
Adding jboss711 target and removing 700
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/build.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -65,9 +65,6 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
- <isset property="profiles.profile.properties.jboss700.home"/>
- </condition>
<condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}">
<isset property="profiles.profile.properties.jboss701.home"/>
</condition>
@@ -77,14 +74,14 @@
<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>
- <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss701.home"/>
- </not>
- <not>
<isset property="jboss702.home"/>
</not>
<not>
@@ -93,15 +90,18 @@
<not>
<isset property="jboss710.home"/>
</not>
+ <not>
+ <isset property="jboss711.home"/>
+ </not>
</and>
</condition>
</fail>
<echo/>
- <echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss701.home=${jboss701.home}"/>
<echo message="jboss702.home=${jboss702.home}"/>
<echo message="jboss710.home=${jboss710.home}"/>
+ <echo message="jboss711.home=${jboss711.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -31,22 +31,22 @@
<copy
file="${src.dir}/jbossws-native-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
file="${src.dir}/jbossws-native-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
file="${src.dir}/jbossws-native-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
file="${src.dir}/jbossws-native-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"
/>
Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/dist/pom.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -45,13 +45,6 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss700</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- <version>${project.version}</version>
<classifier>jboss701</classifier>
</dependency>
@@ -109,22 +102,6 @@
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</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-jboss701</artifactId>
<scope>provided</scope>
<exclusions>
@@ -208,11 +185,6 @@
<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-jboss700.txt">
- <param name="targetName" expression="jboss700" />
- </xslt>
- <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>
@@ -226,6 +198,11 @@
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>
</tasks>
</configuration>
<goals>
@@ -253,12 +230,6 @@
<!-- Libraries required for running binary distro testsuite and not available on server-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <classifier>tests-integration</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss701</artifactId>
<classifier>tests-integration</classifier>
<scope>provided</scope>
Modified: stack/native/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/Install.txt 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/dist/src/main/distro/Install.txt 2012-02-21 22:55:48 UTC (rev 15696)
@@ -13,10 +13,10 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss700
ant deploy-jboss701
ant deploy-jboss702
ant deploy-jboss710
+ ant deploy-jboss711
4.) Execute the samples to verify your installation
Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2012-02-21 22:55:48 UTC (rev 15696)
@@ -3,13 +3,13 @@
#
# Optional JBoss Home
-jboss700.home=(a)jboss700.home@
jboss701.home=(a)jboss701.home@
jboss702.home=(a)jboss702.home@
jboss710.home=(a)jboss710.home@
+jboss711.home=(a)jboss711.home@
-# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710]
-jbossws.integration.target=jboss700
+# The JBoss server under test. This can be [jboss701|jboss702|jboss710|jboss711]
+jbossws.integration.target=jboss710
# The JBoss settings
jboss.bind.address=localhost
Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -46,35 +46,6 @@
</antcall>
</target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss700 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss700">
- <property name="jbossws.integration.target" value="jboss700"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss70x" description="Deploy jbossws to jboss700">
- <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <copy todir="${jboss700.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="${jboss700.home}/modules">
- <fileset dir="${deploy.structure}/modules">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss700" depends="target-jboss700,init" description="Remove jbossws from jboss700">
- <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
<!-- ================================================================== -->
<!-- Deployment JBoss701 -->
<!-- ================================================================== -->
@@ -134,10 +105,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-7.1.0 -->
+ <!-- Prepare Deployment Structure JBoss-7.1.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss710" depends="prepare-deploy">
+ <target name="deploy-structure-jboss71x" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<path id="jbossws-common.path">
@@ -164,7 +135,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710" description="Deploy jbossws to jboss710">
+ <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss71x" 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}">
@@ -184,4 +155,33 @@
<macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Deployment jboss711 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss711">
+ <property name="jbossws.integration.target" value="jboss711"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss711" depends="undeploy-jboss711,deploy-structure-jboss71x" description="Deploy jbossws to jboss711">
+ <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
+ <copy todir="${jboss711.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="${jboss711.home}/modules">
+ <fileset dir="${deploy.structure}/modules">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </target>
+
+ <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711">
+ <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ </target>
+
</project>
Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -37,16 +37,16 @@
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<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"/>
- <available property="jboss700.available" file="${jboss700.available.file}"/>
<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}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -60,13 +60,15 @@
<condition property="jbossws.integration.jboss700" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss701"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss702"/>
</or>
</condition>
<condition property="jbossws.integration.jboss710" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+ </or>
</condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -35,7 +35,7 @@
<include>org.jboss.ws.native:jbossws-native-client</include>
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
- <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss700</include>
+ <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss701</include>
<include>org.jboss.ws.native:jbossws-native-core</include>
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>javax.jws:jsr181-api:jar</include>
@@ -69,7 +69,6 @@
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
- <include>org.jboss.ws:jbossws-jboss700:jar</include>
<include>org.jboss.ws:jbossws-jboss701:jar</include>
<include>org.jboss.ws:jbossws-jboss702:jar</include>
<include>org.jboss:jbossxb:jar</include>
@@ -84,17 +83,6 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss700:jar:*:tests-integration</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
- <scope>provided</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
- <includes>
<include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -418,15 +418,16 @@
</build>
</profile>
+
<!--
- Name: jboss700
- Descr: JBoss-7.0.0.Final specific options
+ Name: jboss701
+ Descr: JBoss-7.0.1.Final specific options
-->
<profile>
- <id>jboss700</id>
+ <id>jboss701</id>
<properties>
- <jboss.version>${jboss700.version}</jboss.version>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
+ <jboss.version>${jboss701.version}</jboss.version>
+ <jbossws.integration.target>jboss701</jbossws.integration.target>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
@@ -553,13 +554,8 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!-- [JBWS-3330] Restore RecordProcessor functionalities, solved in AS 7.0.1 or greater -->
- <exclude>org/jboss/test/ws/management/recording/**</exclude>
-
<!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7, solved in AS 7.0.1 or greater -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
@@ -579,7 +575,7 @@
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
+ <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
<!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only -->
@@ -593,14 +589,14 @@
</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>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
@@ -760,16 +756,16 @@
</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>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
@@ -777,15 +773,35 @@
<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.picketbox</groupId>
@@ -817,6 +833,18 @@
<artifactId>xalan</artifactId>
<version>2.7.1.patch01-brew</version>
</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>
</dependencies>
<build>
<plugins>
@@ -833,7 +861,7 @@
<testExcludes>
<!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
</testExcludes>
</configuration>
<goals>
@@ -845,7 +873,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
<excludes>
<!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
@@ -853,9 +881,6 @@
<!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
- <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
-
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
@@ -868,77 +893,153 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- [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/jbws2634/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude>
-
- <!-- TODO: Native webserviceref stuff -->
- <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>
-
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
- <!-- TODO: EJB3 DD driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
- <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][AS7-1125] waiting for metadata upgrade in AS7, solved in AS 7.0.1 or greater -->
- <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/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- # [AS7-1338] Remote JNDI support for AS7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
- <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</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>
+
+ <!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # Remote JNDI lookup & jaxrpc client issues -->
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>
- <!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude>
+ <!-- # webservices-description in jboss-web.xml / jboss.xml -->
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>
+ <!-- # unpackaged EAR deployment failure -->
+ <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude>
+
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</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>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-02-21 09:57:17 UTC (rev 15695)
+++ stack/native/trunk/pom.xml 2012-02-21 22:55:48 UTC (rev 15696)
@@ -63,13 +63,12 @@
<jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss700.version>4.0.1.GA</jbossws.jboss700.version>
<jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
- <jboss700.version>7.0.0.Final</jboss700.version>
<jboss701.version>7.0.1.Final</jboss701.version>
<jboss702.version>7.0.2.Final</jboss702.version>
- <jboss710.version>7.1.0.Final-SNAPSHOT</jboss710.version>
+ <jboss710.version>7.1.0.Final</jboss710.version>
+ <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<ant.version>1.7.1</ant.version>
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
@@ -126,17 +125,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <version>${jbossws.jboss700.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <version>${jbossws.jboss700.version}</version>
- <classifier>tests-integration</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss701</artifactId>
<version>${jbossws.jboss701.version}</version>
</dependency>
@@ -157,6 +145,8 @@
<version>${jbossws.jboss702.version}</version>
<classifier>tests-integration</classifier>
</dependency>
+ <!-- TODO Move dependency below to jboss711.version and add dependency on org.jboss.ws:jbossws-jboss710:${jbossws.jboss710.version}
+ when 710 container integration is needed and created -->
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
@@ -557,18 +547,6 @@
</profile>
<!--
- Name: jboss700
- Descr: JBoss-7.0.0 specific options
- -->
- <profile>
- <id>jboss700</id>
- <properties>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
- <jboss.home>${jboss700.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss701
Descr: JBoss-7.0.1 specific options
-->
@@ -604,7 +582,19 @@
</properties>
</profile>
+ <!--
+ Name: jboss711
+ Descr: JBoss-7.1.1 specific options
+ -->
+ <profile>
+ <id>jboss711</id>
+ <properties>
+ <jbossws.integration.target>jboss711</jbossws.integration.target>
+ <jboss.home>${jboss711.home}</jboss.home>
+ </properties>
+ </profile>
+
<!--
Name: smoketest
Descr: Executes the smoke tests
12 years, 10 months
JBossWS SVN: r15695 - in stack/cxf/trunk: modules/dist and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-21 04:57:17 -0500 (Tue, 21 Feb 2012)
New Revision: 15695
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/dist/src/main/scripts/assembly-deploy-artifacts.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 and removing 700
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2012-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/build.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -68,9 +68,6 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
- <isset property="profiles.profile.properties.jboss700.home"/>
- </condition>
<condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}">
<isset property="profiles.profile.properties.jboss701.home"/>
</condition>
@@ -80,15 +77,15 @@
<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>
- <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss700.home"/>
- </not>
- <not>
<isset property="jboss701.home"/>
</not>
<not>
@@ -97,15 +94,18 @@
<not>
<isset property="jboss710.home"/>
</not>
+ <not>
+ <isset property="jboss711.home"/>
+ </not>
</and>
</condition>
</fail>
<echo/>
- <echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss701.home=${jboss701.home}"/>
<echo message="jboss702.home=${jboss702.home}"/>
<echo message="jboss710.home=${jboss710.home}"/>
+ <echo message="jboss711.home=${jboss711.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-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/dist/pom.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -33,13 +33,6 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss700</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- <version>${project.version}</version>
<classifier>jboss701</classifier>
</dependency>
@@ -138,22 +131,6 @@
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</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-jboss701</artifactId>
<scope>provided</scope>
<exclusions>
@@ -234,9 +211,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-jboss700.txt">
- <param name="targetName" expression="jboss700" />
- </xslt>
<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>
@@ -246,6 +220,9 @@
<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>
</tasks>
</configuration>
<goals>
@@ -274,12 +251,6 @@
<!-- Libraries required for running binary distro testsuite and not available on server-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <classifier>tests-integration</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss701</artifactId>
<classifier>tests-integration</classifier>
<scope>provided</scope>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-02-21 09:57:17 UTC (rev 15695)
@@ -13,16 +13,16 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss700
ant deploy-jboss701
ant deploy-jboss702
ant deploy-jboss710
+ ant deploy-jboss711
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-jboss700
+ ant -Dspring=true deploy-jboss710
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-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-02-21 09:57:17 UTC (rev 15695)
@@ -3,13 +3,13 @@
#
# Optional JBoss Home
-jboss700.home=(a)jboss700.home@
jboss701.home=(a)jboss701.home@
jboss702.home=(a)jboss702.home@
jboss710.home=(a)jboss710.home@
+jboss711.home=(a)jboss711.home@
# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710]
-jbossws.integration.target=jboss700
+jbossws.integration.target=jboss710
# 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-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -47,35 +47,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss700 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss700">
- <property name="jbossws.integration.target" value="jboss700"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss700">
- <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <copy todir="${jboss700.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="${jboss700.home}/modules">
- <fileset dir="${deploy.structure}/modules">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss700" depends="target-jboss700,init" description="Remove jbossws from jboss700">
- <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment JBoss701 -->
<!-- ================================================================== -->
@@ -134,10 +105,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-7.1.0 -->
+ <!-- Prepare Deployment Structure JBoss-7.1.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss710" depends="prepare-deploy">
+ <target name="deploy-structure-jboss71x" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<path id="jbossws-common.path">
@@ -164,7 +135,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710,check-spring,install-spring-module71x" description="Deploy jbossws to jboss710">
+ <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}">
@@ -185,6 +156,35 @@
</target>
<!-- ================================================================== -->
+ <!-- Deployment jboss711 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss711">
+ <property name="jbossws.integration.target" value="jboss711"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss711" depends="undeploy-jboss711,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss711">
+ <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
+ <copy todir="${jboss711.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="${jboss711.home}/modules">
+ <fileset dir="${deploy.structure}/modules">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </target>
+
+ <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711">
+ <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss711.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-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -36,15 +36,15 @@
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<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"/>
- <available property="jboss700.available" file="${jboss700.available.file}"/>
<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}"/>
<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-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -60,13 +60,15 @@
<condition property="jbossws.integration.jboss700" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss701"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss702"/>
</or>
</condition>
<condition property="jbossws.integration.jboss710" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+ </or>
</condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -79,7 +79,6 @@
<include>org.opensaml:xmltooling:jar</include>
<include>joda-time:joda-time:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
- <include>org.jboss.ws:jbossws-jboss700:jar</include>
<include>org.jboss.ws:jbossws-jboss701:jar</include>
<include>org.jboss.ws:jbossws-jboss702:jar</include>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
@@ -93,17 +92,6 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss700:jar:*:tests-integration</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
- <scope>provided</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
- <includes>
<include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2012-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/resources/pom.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -43,22 +43,12 @@
<phase>package</phase>
<configuration>
<excludes>
- <exclude>**/jbossws-jboss700/**</exclude>
<exclude>**/jbossws-jboss701/**</exclude>
<exclude>**/jbossws-jboss702/**</exclude>
</excludes>
</configuration>
</execution>
<execution>
- <id>jboss700</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>jboss700</classifier>
- <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss700/jbossws.beans</classesDirectory>
- </configuration>
- </execution>
- <execution>
<id>jboss701</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-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -31,15 +31,6 @@
<copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
- />
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-cxf-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
@@ -65,6 +56,15 @@
tofile="${dest.dir}/jbossws-jboss710/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"
+ />
+ <copy
+ file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
+ tofile="${dest.dir}/jbossws-jboss711/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-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -552,15 +552,16 @@
</dependencies>
</profile>
+
<!--
- Name: jboss700
- Descr: JBoss-7.0.0.Final specific options
+ Name: jboss701
+ Descr: JBoss-7.0.1.Final specific options
-->
<profile>
- <id>jboss700</id>
+ <id>jboss701</id>
<properties>
- <jboss.version>${jboss700.version}</jboss.version>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
+ <jboss.version>${jboss701.version}</jboss.version>
+ <jbossws.integration.target>jboss701</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -660,6 +661,9 @@
<!--# Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</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>
+
<!-- ////////////////////////// -->
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
@@ -676,7 +680,7 @@
<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 -->
+ <!-- @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>
@@ -687,20 +691,12 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!-- # [JBWS-3330] fixed on AS 7.0.1 & above -->
- <exclude>org/jboss/test/ws/management/recording/**</exclude>
-
- <!-- [AS7-1101][JBWS-3322], fixed on AS 7.0.1 & above -->
+ <!-- [AS7-1101][JBWS-3322], fixed on AS 7.1.0 & above -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</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>
-
<!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
@@ -742,16 +738,16 @@
</plugins>
</build>
</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>
@@ -928,31 +924,51 @@
</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>
@@ -960,6 +976,11 @@
<version>2.0.0-beta-1</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>
@@ -969,6 +990,69 @@
</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>
</dependencies>
<build>
<plugins>
@@ -986,11 +1070,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>
@@ -1002,11 +1083,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 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 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 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-->
@@ -1019,9 +1105,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>
@@ -1031,83 +1114,32 @@
<!--# [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>
-
- <!--# Seems MSFT interop. endpoints are down :(-->
+ <!-- # Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</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>
+ <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
<!-- ////////////////////////// -->
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</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-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>
- <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 -->
- <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
+ <!-- # TODO: appclient -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # TODO: remote JNDI support (non EJB objects) -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
- <!-- # [AS7-2961] Fixed on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude>
-
- <!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only -->
- <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude>
-
</excludes>
</configuration>
</plugin>
@@ -1116,14 +1148,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>
@@ -1277,7 +1309,7 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
- <!-- JBossWS Native Core version available on 710 -->
+ <!-- JBossWS Native Core version available on 711 -->
<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 overwritten by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-02-21 09:56:44 UTC (rev 15694)
+++ stack/cxf/trunk/pom.xml 2012-02-21 09:57:17 UTC (rev 15695)
@@ -64,13 +64,12 @@
<jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss700.version>4.0.1.GA</jbossws.jboss700.version>
<jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
- <jboss700.version>7.0.0.Final</jboss700.version>
<jboss701.version>7.0.1.Final</jboss701.version>
<jboss702.version>7.0.2.Final</jboss702.version>
- <jboss710.version>7.1.0.Final-SNAPSHOT</jboss710.version>
+ <jboss710.version>7.1.0.Final</jboss710.version>
+ <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.5.2</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
@@ -151,17 +150,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <version>${jbossws.jboss700.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss700</artifactId>
- <version>${jbossws.jboss700.version}</version>
- <classifier>tests-integration</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss701</artifactId>
<version>${jbossws.jboss701.version}</version>
</dependency>
@@ -182,6 +170,8 @@
<version>${jbossws.jboss702.version}</version>
<classifier>tests-integration</classifier>
</dependency>
+ <!-- TODO Move dependency below to jboss711.version and add dependency on org.jboss.ws:jbossws-jboss710:${jbossws.jboss710.version}
+ when 710 container integration is needed and created -->
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
@@ -1353,18 +1343,6 @@
</profile>
<!--
- Name: jboss700
- Descr: JBoss-7.0.0.Final specific options
- -->
- <profile>
- <id>jboss700</id>
- <properties>
- <jbossws.integration.target>jboss700</jbossws.integration.target>
- <jboss.home>${jboss700.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss701
Descr: JBoss-7.0.1.Final specific options
-->
@@ -1401,6 +1379,18 @@
</profile>
<!--
+ Name: jboss711
+ Descr: JBoss-7.1.1 specific options
+ -->
+ <profile>
+ <id>jboss711</id>
+ <properties>
+ <jbossws.integration.target>jboss711</jbossws.integration.target>
+ <jboss.home>${jboss711.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
12 years, 10 months
JBossWS SVN: r15694 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-21 04:56:44 -0500 (Tue, 21 Feb 2012)
New Revision: 15694
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Adding jboss711 target and removing jboss700 one
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-02-20 16:22:42 UTC (rev 15693)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-02-21 09:56:44 UTC (rev 15694)
@@ -31,9 +31,6 @@
<target name="tests-prepare" depends="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss700.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
- </condition>
<condition property="jboss.home" value="${jboss701.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss701"/>
</condition>
@@ -43,6 +40,9 @@
<condition property="jboss.home" value="${jboss710.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
</condition>
+ <condition property="jboss.home" value="${jboss711.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+ </condition>
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
12 years, 10 months
JBossWS SVN: r15693 - hudson/branches/jbossws-hudson-4.0.x/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-20 11:22:42 -0500 (Mon, 20 Feb 2012)
New Revision: 15693
Modified:
hudson/branches/jbossws-hudson-4.0.x/scripts/jboss.sh
hudson/branches/jbossws-hudson-4.0.x/scripts/jbossws-qa.sh
Log:
svnmerge -r 15690:15692
Modified: hudson/branches/jbossws-hudson-4.0.x/scripts/jboss.sh
===================================================================
--- hudson/branches/jbossws-hudson-4.0.x/scripts/jboss.sh 2012-02-20 15:49:53 UTC (rev 15692)
+++ hudson/branches/jbossws-hudson-4.0.x/scripts/jboss.sh 2012-02-20 16:22:42 UTC (rev 15693)
@@ -35,22 +35,27 @@
start)
# This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
# It relies on bash specific features
- /bin/bash $RUN_CMD &
+ /bin/bash $RUN_CMD >/dev/null 2>/dev/null &
;;
stop)
if [ -f "$PIDFILE" ]; then
pid=`cat "$PIDFILE"`
- echo "kill pid: $pid"
- kill $pid
+ #find out the pid of the shell script that started AS and which should be in background now
+ shell_pid=$(ps -ef | awk '$2 ~ /\<'$pid'\>/ { print $3; }')
+ echo "kill pid: $shell_pid"
+ kill $shell_pid
if [ "$?" -eq 0 ]; then
- # process exists, wait for it to die, and force if not
- sleep 20
- kill -9 $pid &> /dev/null
+ sleep 10
+ kill -9 $shell_pid &> /dev/null
fi
+ #try killing the AS process just in case it's still there
+ kill -9 $pid &> /dev/null
rm "$PIDFILE"
else
warn "No pid found!"
fi
+ echo "exiting stop method"
+ date
;;
restart)
$0 stop
Modified: hudson/branches/jbossws-hudson-4.0.x/scripts/jbossws-qa.sh
===================================================================
--- hudson/branches/jbossws-hudson-4.0.x/scripts/jbossws-qa.sh 2012-02-20 15:49:53 UTC (rev 15692)
+++ hudson/branches/jbossws-hudson-4.0.x/scripts/jbossws-qa.sh 2012-02-20 16:22:42 UTC (rev 15693)
@@ -76,7 +76,7 @@
# fi
# else
# echo "There's no admin console for AS7 yet"
- sleep 20
+ sleep 5
# fi
}
12 years, 10 months
JBossWS SVN: r15692 - hudson/trunk/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-20 10:49:53 -0500 (Mon, 20 Feb 2012)
New Revision: 15692
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Reduce wait for AS7 boot
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2012-02-20 15:17:04 UTC (rev 15691)
+++ hudson/trunk/scripts/jbossws-qa.sh 2012-02-20 15:49:53 UTC (rev 15692)
@@ -76,7 +76,7 @@
# fi
# else
# echo "There's no admin console for AS7 yet"
- sleep 20
+ sleep 5
# fi
}
12 years, 10 months