Author: jim.ma Date: 2011-07-18 04:09:57 -0400 (Mon, 18 Jul 2011) New Revision: 14695 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/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/testsuite/pom.xml stack/native/trunk/pom.xml Log: Add jboss710 profile Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/build.xml 2011-07-18 08:09:57 UTC (rev 14695) @@ -64,7 +64,11 @@ <isset property="profiles.profile.properties.jboss700.home"/> </condition> - <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value or -Djboss700.home=value to set"> + <condition property="jboss710.home" value="${profiles.profile.properties.jboss710.home}"> + <isset property="profiles.profile.properties.jboss710.home"/> + </condition> + + <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value, -Djboss700.home=value or -Djboss710.home=value to set"> <condition> <and> <not> @@ -76,6 +80,9 @@ <not> <isset property="jboss700.home"/> </not> + <not> + <isset property="jboss710.home"/> + </not> </and> </condition> </fail> @@ -84,6 +91,7 @@ <echo message="jboss600.home=${jboss600.home}"/> <echo message="jboss601.home=${jboss601.home}"/> <echo message="jboss700.home=${jboss700.home}"/> + <echo message="jboss710.home=${jboss710.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 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-07-18 08:09:57 UTC (rev 14695) @@ -31,6 +31,12 @@ tofile="${dest.dir}/jbossws-jboss700/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" + /> + + </target> </project> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/modules/dist/pom.xml 2011-07-18 08:09:57 UTC (rev 14695) @@ -175,6 +175,11 @@ 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-jboss710.txt"> + <param name="targetName" expression="jboss710" /> + </xslt> </tasks> </configuration> <goals> Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-07-18 08:09:57 UTC (rev 14695) @@ -6,8 +6,9 @@ jboss600.home=(a)jboss600.home@ jboss601.home=(a)jboss601.home@ jboss700.home=(a)jboss700.home@ +jboss710.home=(a)jboss710.home@ -# The JBoss server under test. This can be [jboss600|jboss601|jboss700] +# The JBoss server under test. This can be [jboss600|jboss601|jboss700|jboss710] jbossws.integration.target=jboss601 # The JBoss settings Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-07-18 08:09:57 UTC (rev 14695) @@ -142,6 +142,55 @@ <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> </target> + <!-- ================================================================== --> + <!-- Prepare Deployment Structure JBoss-7.1.0 --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss710" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + + <path id="jbossws-common.path"> + <fileset dir="${deploy.artifacts.dir}"> + <include name="**/jbossws-common-tools.jar"/> + </fileset> + </path> + <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> + + <antcall target="deploy-jbossws-native-modules" inheritall="false"> + <param name="installserver" value="${deploy.structure}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + </target> + + <!-- ================================================================== --> + <!-- Deployment jboss710 --> + <!-- ================================================================== --> + + <target name="target-jboss710"> + <property name="jbossws.integration.target" value="jboss710"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710" description="Deploy jbossws to jboss710"> + <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> + <copy todir="${jboss710.home}" overwrite="true" verbose="true"> + <fileset dir="${deploy.structure}"> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> + <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> + <installModules targetDir="${jboss710.home}/modules"> + <fileset dir="${deploy.structure}/modules"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + </target> + + <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> + <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> + </target> + <!-- ================================================================== --> <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf --> <!-- ================================================================== --> Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-07-18 08:09:57 UTC (rev 14695) @@ -36,14 +36,18 @@ <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/> <property name="jboss700.modules" value="${jboss700.home}/modules"/> + <property name="jboss710.modules" value="${jboss710.home}/modules"/> <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/> <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/> + <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/> + <available property="jboss600.available" file="${jboss600.available.file}"/> <available property="jboss601.available" file="${jboss601.available.file}"/> <available property="jboss700.available" file="${jboss700.available.file}"/> + <available property="jboss710.available" file="${jboss710.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 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-07-18 08:09:57 UTC (rev 14695) @@ -56,6 +56,7 @@ <condition property="jbossws.integration.jboss70" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> </or> </condition> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-07-18 08:09:57 UTC (rev 14695) @@ -678,12 +678,12 @@ <!-- Name: jboss700 - Descr: JBoss-7.0.0 specific options + Descr: JBoss-7.0.0.Final specific options --> <profile> <id>jboss700</id> <properties> - <jboss.version>7.0.0.CR2-SNAPSHOT</jboss.version> + <jboss.version>7.0.0.Final</jboss.version> <jbossws.integration.target>jboss700</jbossws.integration.target> <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> </properties> @@ -843,6 +843,172 @@ </profile> <!-- + Name: jboss710 + Descr: JBoss-7.1.0 specific options + --> + <profile> + <id>jboss710</id> + <properties> + <jboss.version>7.1.0.Alpha1-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss710</jbossws.integration.target> + <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <version>${jboss.version}</version> + </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> + </dependency> + <dependency> + <groupId>org.picketbox</groupId> + <artifactId>jbosssx-client</artifactId> + <version>3.0.0.CR2</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </dependency> + <!-- provides org.jboss.ejb3.annotation.SecurityDomain annotation --> + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-ext-api</artifactId> + <version>2.0.0-beta-1</version> + </dependency> + <!-- Apache XML security depends on Xalan impl classes :( --> + <dependency> + <groupId>apache-xalan</groupId> + <artifactId>serializer</artifactId> + <version>2.7.1.patch01-brew</version> + </dependency> + <dependency> + <groupId>apache-xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1.patch01-brew</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> + </configuration> + <executions> + <execution> + <id>default-testCompile</id> + <phase>test-compile</phase> + <configuration> + <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> + </testExcludes> + </configuration> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -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> + + <!--# [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> + + <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives --> + <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude> + + <!-- # [JBWS-3252] Investigate WSA interop tests regression --> + <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude> + + <!-- ////////////////////////// --> + <!-- AS7 integration exclusions --> + <!-- ////////////////////////// --> + + <!-- 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> + + <!-- 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> + + <!-- TODO: JMX client to AS7 server --> + <exclude>org/jboss/test/ws/management/recording/**</exclude> + + <!-- TODO: will we support wars bundled in jars on AS7? --> + <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude> + + <!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7 --> + <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> + + <!-- 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> + + <!-- JAXR not available --> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + + <!-- # [JBWS-3234] JNDI over RMI not available on 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> + <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2011-07-15 14:10:16 UTC (rev 14694) +++ stack/native/trunk/pom.xml 2011-07-18 08:09:57 UTC (rev 14695) @@ -56,7 +56,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> - <jboss700.version>7.0.0.Beta4-SNAPSHOT</jboss700.version> + <jboss700.version>7.0.0.Final</jboss700.version> <ant.version>1.7.1</ant.version> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -570,6 +570,19 @@ </profile> <!-- + Name: jboss710 + Descr: JBoss-7.1.0 specific options + --> + <profile> + <id>jboss710</id> + <properties> + <jbossws.integration.target>jboss710</jbossws.integration.target> + <jboss.home>${jboss710.home}</jboss.home> + </properties> + </profile> + + + <!-- Name: smoketest Descr: Executes the smoke tests -->