[jbossws-commits] JBossWS SVN: r7177 - in stack/native/trunk: modules/core and 4 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-05-26 09:43:31 -0400 (Mon, 26 May 2008) New Revision: 7177 Modified: stack/native/trunk/build.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/distro/ant.properties stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/build-setup.xml stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Include 4.2.1 deployment Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/build.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -44,7 +44,7 @@ <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> <condition property="jboss421.home" value="${profiles.profile.properties.jboss421.home}"> <isset property="profiles.profile.properties.jboss421.home"/> - </condition> + </condition> <condition property="jboss422.home" value="${profiles.profile.properties.jboss422.home}"> <isset property="profiles.profile.properties.jboss422.home"/> </condition> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/modules/core/pom.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -144,6 +144,14 @@ <artifactItems> <artifactItem> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss421</artifactId> + <version>${jbossws.jboss421.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss421</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <version>${jbossws.jboss422.version}</version> <classifier>resources</classifier> 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 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -28,8 +28,20 @@ <!-- Compile resource files --> <target name="main" depends="init"> - - <!-- Concat jbossws-jboss422/jbossws.beans --> + + <!-- Concat jbossws-jboss422/jbossws.beans --> + <echo message="Concat jbossws-jboss421/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss421/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> + <fileset file="${project.build.resources.directory}/jbossws-jboss421/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + + <!-- Concat jbossws-jboss422/jbossws.beans --> <echo message="Concat jbossws-jboss422/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss422/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -261,7 +261,47 @@ </plugins> </build> </profile> - + + <!-- + Name: jboss421 + Descr: JBoss-4.2.2 specific options + --> + <profile> + <id>jboss421</id> + <properties> + <jboss.version>4.2.1.GA</jboss.version> + <jbossws.integration.target>jboss421</jbossws.integration.target> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jbossall-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss421</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss421.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss421.home}/lib/endorsed</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <!-- Name: jboss422 Descr: JBoss-4.2.2 specific options Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/pom.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -46,6 +46,7 @@ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>3.0.2-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + <jbossws.jboss421.version>3.0.0-SNAPSHOT</jbossws.jboss421.version> <jbossws.jboss422.version>3.0.0-SNAPSHOT</jbossws.jboss422.version> <jbossws.jboss423.version>3.0.0-SNAPSHOT</jbossws.jboss423.version> <jbossws.jboss500.version>3.0.0-SNAPSHOT</jbossws.jboss500.version> @@ -104,7 +105,21 @@ <classifier>testsuite</classifier> <type>zip</type> </dependency> - <dependency> + + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss421</artifactId> + <version>${jbossws.jboss421.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss421</artifactId> + <version>${jbossws.jboss421.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <version>${jbossws.jboss422.version}</version> @@ -333,6 +348,18 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss421</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss421</artifactId> + <classifier>resources</classifier> + <scope>provided</scope> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <scope>provided</scope> </dependency> @@ -508,7 +535,19 @@ </plugins> </build> </profile> - + + <!-- + Name: jboss421 + Descr: JBoss-4.2.1 specific options + --> + <profile> + <id>jboss421</id> + <properties> + <jbossws.integration.target>jboss421</jbossws.integration.target> + <jboss.home>${jboss421.home}</jboss.home> + </properties> + </profile> + <!-- Name: jboss422 Descr: JBoss-4.2.2 specific options Modified: stack/native/trunk/src/main/distro/ant.properties =================================================================== --- stack/native/trunk/src/main/distro/ant.properties 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/src/main/distro/ant.properties 2008-05-26 13:43:31 UTC (rev 7177) @@ -4,6 +4,7 @@ # $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ # Optional JBoss Home +jboss421.home=(a)jboss421.home@ jboss422.home=(a)jboss422.home@ jboss423.home=(a)jboss423.home@ jboss500.home=(a)jboss500.home@ Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -26,8 +26,30 @@ </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> - + <!-- ================================================================== --> + <!-- Deployment JBoss421 --> + <!-- ================================================================== --> + + <target name="target-jboss421"> + <property name="jbossws.integration.target" value="jboss421"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss421" depends="undeploy-jboss421,deploy-structure-jboss42" description="Deploy jbossws to jboss421"> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <copy todir="${jboss421.home}" overwrite="true"> + <fileset dir="${deploy.structure}"/> + </copy> + <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss421" depends="target-jboss421,init" description="Remove jbossws from jboss421"> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> <!-- Deployment JBoss422 --> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/src/main/distro/build-setup.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -22,7 +22,13 @@ <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - + + <property name="jboss421.lib" value="${jboss421.home}/lib"/> + <property name="jboss421.client" value="${jboss421.home}/client"/> + <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> + <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> + <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> + <property name="jboss422.lib" value="${jboss422.home}/lib"/> <property name="jboss422.client" value="${jboss422.home}/client"/> <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> @@ -48,12 +54,14 @@ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - + + <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - + + <available property="jboss421.available" file="${jboss421.available.file}"/> <available property="jboss422.available" file="${jboss422.available.file}"/> <available property="jboss423.available" file="${jboss423.available.file}"/> <available property="jboss500.available" file="${jboss500.available.file}"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/src/main/distro/build.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -47,9 +47,10 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - + <condition property="jbossws.integration.jboss42" value="true"> <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> </or> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-26 13:27:52 UTC (rev 7176) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-26 13:43:31 UTC (rev 7177) @@ -29,6 +29,7 @@ <unpack>false</unpack> <includes> <include>*:jbossws-framework:jar</include> + <include>*:jbossws-jboss421:jar:*</include> <include>*:jbossws-jboss422:jar:*</include> <include>*:jbossws-jboss423:jar:*</include> <include>*:jbossws-jboss500:jar:*</include>