[jbossws-commits] JBossWS SVN: r7183 - in stack/native/trunk: src/main/distro and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-05-27 05:02:32 -0400 (Tue, 27 May 2008) New Revision: 7183 Modified: stack/native/trunk/pom.xml stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Deploy jbossxb to as421 Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-27 09:01:11 UTC (rev 7182) +++ stack/native/trunk/pom.xml 2008-05-27 09:02:32 UTC (rev 7183) @@ -105,22 +105,21 @@ <classifier>testsuite</classifier> <type>zip</type> </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> + + <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> </dependency> @@ -222,6 +221,12 @@ <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <version>${jboss.microcontainer.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </exclusion> + </exclusions> </dependency> <!-- transitve dependencies --> Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-27 09:01:11 UTC (rev 7182) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-27 09:02:32 UTC (rev 7183) @@ -42,11 +42,24 @@ <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/> + + <!-- Extras for jboss-4.2.1 --> + <copy todir="${jboss421.home}/client" overwrite="true"> + <fileset dir="${deploy.artifacts.dir}/lib"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss421.home}/lib" overwrite="true"> + <fileset dir="${deploy.artifacts.dir}/lib"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> </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}"/> + <delete file="${jboss421.server.lib}/jbossws-integration.jar"/> </target> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-27 09:01:11 UTC (rev 7182) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-27 09:02:32 UTC (rev 7183) @@ -103,6 +103,15 @@ <include>*:wstx-lgpl:jar</include> </includes> </dependencySet> + <!-- required for AS4.2.1 only --> + <dependencySet> + <outputFileNameMapping>jboss-xml-binding.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <includes> + <include>org.jboss:jbossxb:jar:1.0.0.SP1</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet>