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