Author: thomas.diesler(a)jboss.com Date: 2008-04-23 07:49:47 -0400 (Wed, 23 Apr 2008) New Revision: 6631 Removed: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml Log: deploy-jboss422 ok Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml 2008-04-23 10:56:14 UTC (rev 6630) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml 2008-04-23 11:49:47 UTC (rev 6631) @@ -17,7 +17,7 @@ <!-- Binary distribution --> <!-- ================================================================== --> - <target name="build-bin-dist" depends="jars,prepare-deploy" description="Build the binary distribution"> + <target name="build-bin-dist" depends="jars" description="Build the binary distribution"> <property name="bindist.dir" value="${cxf.output.dir}/jbossws-cxf-dist"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 10:56:14 UTC (rev 6630) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 11:49:47 UTC (rev 6631) @@ -17,14 +17,13 @@ <!-- Prepare Deployment Structure JBoss-4.2.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss42" depends="prepare-deploy"> + <target name="deploy-structure-jboss42" depends="prepare"> <delete dir="${deploy.structure.jboss42}"/> - <antcall target="deploy-jbossws-cxf42" inheritall="false"> - <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> - <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="-Denv=jboss422"/> + <arg value="package"/> + <arg value="assembly:directory"/> + </exec> </target> <!-- ================================================================== --> @@ -36,84 +35,63 @@ <copy todir="${jboss422.home}" overwrite="true"> <fileset dir="${deploy.structure.jboss42}"/> </copy> - <unzip dest="${jboss422.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/> <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> </target> <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <delete dir="${jboss422.server.deploy}/juddi-service.sar"/> </target> <!-- ================================================================== --> <!-- Deployment JBoss423 --> <!-- ================================================================== --> - <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423"> + <target name="deploy-jboss423" depends="undeploy-jboss423" description="Deploy jbossws to jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> <copy todir="${jboss423.home}" overwrite="true"> <fileset dir="${deploy.structure.jboss42}"/> </copy> - <unzip dest="${jboss423.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/> <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> </target> <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <delete dir="${jboss423.server.deploy}/juddi-service.sar"/> </target> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-5.0.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss50" depends="prepare-deploy"> - <delete dir="${deploy.structure.jboss50}"/> - <antcall target="deploy-jbossws-cxf50" inheritall="false"> - <param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/> - </target> - - <!-- ================================================================== --> <!-- Deployment JBoss500 --> <!-- ================================================================== --> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> + <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws to jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <copy todir="${jboss500.home}" overwrite="true"> <fileset dir="${deploy.structure.jboss50}"/> </copy> - <unzip dest="${jboss500.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/> <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> </target> <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <delete dir="${jboss500.server.deploy}/juddi-service.sar"/> </target> <!-- ================================================================== --> <!-- Deployment JBoss501 --> <!-- ================================================================== --> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true"> <fileset dir="${deploy.structure.jboss50}"/> </copy> - <unzip dest="${jboss501.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/> <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> </target> <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <delete dir="${jboss501.server.deploy}/juddi-service.sar"/> </target> <!-- ================================================================== --> Deleted: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-23 10:56:14 UTC (rev 6630) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-23 11:49:47 UTC (rev 6631) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Prepare Deployment Source --> - <!-- ================================================================== --> - - <target name="prepare-deploy" depends="jars"> - - <delete dir="${deploy.artifacts.dir}"/> - - <unzip dest="${deploy.artifacts.dir}/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> - <copy file="${thirdparty.dir}/wstx-asl.jar" tofile="${thirdparty.dir}/wstx.jar"/> - <copy todir="${deploy.artifacts.dir}/lib"> - <fileset dir="${thirdparty.dir}"> - <patternset refid="jbossws.client.patternset"/> - <patternset refid="jbossws.lib.patternset"/> - <patternset refid="jbossws.lib.endorsed.patternset"/> - <patternset refid="jbossws.server.lib.patternset"/> - <patternset refid="jbossws.service.lib.patternset"/> - <include name="jbossws-jboss42.jar"/> - <include name="juddi-service.sar"/> - </fileset> - <fileset dir="${cxf.management.dir}/target"> - <include name="jbossws-cxf-management-${version.id}.war"/> - </fileset> - <fileset dir="${cxf.client.dir}/target"> - <include name="jbossws-cxf-client-${version.id}.jar"/> - </fileset> - <fileset dir="${cxf.server.dir}/target"> - <include name="jbossws-cxf-server-${version.id}.jar"/> - </fileset> - </copy> - <copy todir="${deploy.artifacts.dir}/resources"> - <fileset dir="${cxf.server.dir}/target/resources"> - <include name="jbossws-cxf42-beans.xml"/> - <include name="jbossws-cxf50-beans.xml"/> - <include name="jbossws-jboss42.sar/**"/> - <include name="jbossws-cxf.sar/**"/> - </fileset> - </copy> - </target> - -</project> Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 10:56:14 UTC (rev 6630) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 11:49:47 UTC (rev 6631) @@ -17,7 +17,6 @@ <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-bin-dist.xml"/> - <import file="${basedir}/ant-import/build-prepare-deploy.xml"/> <import file="${basedir}/ant-import/build-deploy.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/> @@ -39,13 +38,11 @@ <property name="cxf.java.dir" value="${cxf.src.dir}/java"/> <property name="cxf.resources.dir" value="${cxf.src.dir}/resources"/> <property name="cxf.output.dir" value="${cxf.dir}/target"/> - <property name="cxf.output.deploy.dir" value="${cxf.output.dir}/deploy"/> <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> <property name="cxf.output.resources.dir" value="${cxf.output.dir}/resources"/> - <property name="deploy.artifacts.dir" value="${cxf.output.deploy.dir}-artifacts"/> - <property name="deploy.structure.jboss42" value="${cxf.output.deploy.dir}-jboss42"/> - <property name="deploy.structure.jboss50" value="${cxf.output.deploy.dir}-jboss50"/> + <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/> + <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss50"/> <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> <!-- ================================================================== --> Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 10:56:14 UTC (rev 6630) +++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 11:49:47 UTC (rev 6631) @@ -126,11 +126,20 @@ <id>copy-dependencies</id> <phase>package</phase> <goals> - <goal>copy-dependencies</goal> + <goal>unpack</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/thirdparty</outputDirectory> - <stripVersion>true</stripVersion> + <artifactItems>org.jboss.ws:jbossws-jboss42:zip:resources</artifactItems> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <version>${jbossws.jboss42.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources</outputDirectory> + </artifactItem> + </artifactItems> </configuration> </execution> </executions> Modified: stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml 2008-04-23 10:56:14 UTC (rev 6630) +++ stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml 2008-04-23 11:49:47 UTC (rev 6631) @@ -31,7 +31,7 @@ <!-- concat jbossws-cxf50-beans.xml --> <echo message="Concat jbossws-cxf50-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-cxf50-beans.xml"> + <concat destfile="${project.build.resources.directory}/jbossws-beans50/META-INF/jboss-beans.xml"> <header trimleading="yes"> &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> @@ -41,8 +41,7 @@ <!-- Concat jbossws-cxf42-beans.xml --> <echo message="Concat jbossws-cxf42-beans.xml"/> - <unzip dest="${project.build.resources.directory}" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - <concat destfile="${project.build.resources.directory}/jbossws-cxf42-beans.xml"> + <concat destfile="${project.build.resources.directory}/jbossws-beans42/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> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 10:56:14 UTC (rev 6630) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 11:49:47 UTC (rev 6631) @@ -212,7 +212,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>deploy-structure-jboss422</finalName> + <finalName>deploy-jboss422</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 10:56:14 UTC (rev 6630) +++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 11:49:47 UTC (rev 6631) @@ -184,10 +184,10 @@ </fileSet> <!-- server/default/deploy/jbossws.sar/jbossws.beans --> <fileSet> - <directory>modules/server/target/resources/</directory> - <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans/META-INF</outputDirectory> + <directory>modules/server/target/resources/jbossws-beans42</directory> + <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans</outputDirectory> <includes> - <include>jbossws-cxf42-beans.xml</include> + <include>META-INF/**</include> </includes> </fileSet> </fileSets>