Author: jim.ma Date: 2011-07-13 03:56:05 -0400 (Wed, 13 Jul 2011) New Revision: 14684 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/dist/pom.xml 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/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: Add jboss710 profile Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/build.xml 2011-07-13 07:56:05 UTC (rev 14684) @@ -67,8 +67,12 @@ <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}"> <isset property="profiles.profile.properties.jboss700.home"/> </condition> + <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 jboss601.home=value, jboss600.home=value or jboss700.home=value to set"> + + <fail message="jboss home not set, use jboss601.home=value, jboss600.home=value, jboss700.home=value or jboss710.home=value to set"> <condition> <and> <not> @@ -80,6 +84,9 @@ <not> <isset property="jboss700.home"/> </not> + <not> + <isset property="jboss710.home"/> + </not> </and> </condition> </fail> @@ -88,6 +95,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/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/modules/dist/pom.xml 2011-07-13 07:56:05 UTC (rev 14684) @@ -194,7 +194,10 @@ </xslt> <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> + <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/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-07-13 07:56:05 UTC (rev 14684) @@ -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/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-07-13 07:56:05 UTC (rev 14684) @@ -145,6 +145,56 @@ </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-cxf-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,check-spring,install-spring-module" 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> + + + <!-- ================================================================== --> <!-- 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 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-07-13 07:56:05 UTC (rev 14684) @@ -36,14 +36,17 @@ <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/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-07-13 07:56:05 UTC (rev 14684) @@ -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/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-07-13 07:56:05 UTC (rev 14684) @@ -40,6 +40,10 @@ 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-cxf-config-as7.xml" + tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + /> </target> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-13 07:56:05 UTC (rev 14684) @@ -896,12 +896,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> </properties> <dependencies> @@ -1078,6 +1078,189 @@ </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> + </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.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-ext-api</artifactId> + <version>2.0.0-beta-1</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArguments> + <endorseddirs>${project.build.directory}/endorsed</endorseddirs> + </compilerArguments> + </configuration> + <executions> + <execution> + <id>default-testCompile</id> + <phase>test-compile</phase> + <configuration> + <testExcludes> + <!-- 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> + </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=${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> + </additionalClasspathElements> + <excludes> + <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> + <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> + + <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + + <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements--> + <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> + + <!--# [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> + + <!--# [JBWS-2480] Soap attachments are dropped on server response--> + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + + <!--# [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> + + <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives --> + <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude> + + <!--# Seems MSFT interop. endpoints are down :(--> + <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> + + <!-- ////////////////////////// --> + <!-- AS7 integration exclusions --> + <!-- ////////////////////////// --> + + <!-- 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> + + <!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7 --> + <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> + + <!-- 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][JBWS-3322] --> + <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/samples/webserviceref/**</exclude> + + <!-- # [JBWS-3234] JNDI over RMI not available on 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> + + <!-- TODO: investigate --> + <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase*</exclude> + + <!-- # [JBWS-3205] JDKLogManager not used --> + <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</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 --> + <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> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-07-13 05:23:58 UTC (rev 14683) +++ stack/cxf/trunk/pom.xml 2011-07-13 07:56:05 UTC (rev 14684) @@ -57,7 +57,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> - <jboss700.version>7.0.0.CR2-SNAPSHOT</jboss700.version> + <jboss700.version>7.0.0.Final</jboss700.version> <cxf.version>2.4.1</cxf.version> <cxf.asm.version>3.3</cxf.asm.version> <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version> @@ -1303,7 +1303,7 @@ <!-- Name: jboss700 - Descr: JBoss-7.0.0 specific options + Descr: JBoss-7.0.0.Final specific options --> <profile> <id>jboss700</id> @@ -1314,6 +1314,18 @@ </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 -->