Author: alessio.soldano(a)jboss.com Date: 2010-06-24 14:12:27 -0400 (Thu, 24 Jun 2010) New Revision: 12516 Modified: stack/cxf/branches/no-spring-support/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/no-spring-support/pom.xml stack/cxf/branches/no-spring-support/src/main/distro/build-deploy.xml Log: -Dspring=true for including spring libs when deploying the stack Modified: stack/cxf/branches/no-spring-support/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-06-23 13:38:48 UTC (rev 12515) +++ stack/cxf/branches/no-spring-support/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-06-24 18:12:27 UTC (rev 12516) @@ -92,6 +92,9 @@ <include name="**/jbossws-cxf-client*.jar"/> <include name="**/jbossws-cxf-factories.jar"/> <include name="**/jbossws-cxf-server*.jar"/> + </patternset> + + <patternset id="spring.patternset"> <include name="**/spring-aop.jar"/> <include name="**/spring-asm.jar"/> <include name="**/spring-beans.jar"/> @@ -329,7 +332,30 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <!-- ================================================================== --> + <!-- Install Spring --> + <!-- ================================================================== --> + + <macrodef name="macro-install-spring"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="spring.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <target name="deploy-spring"> + <macro-install-spring targetdir="${installserver}/client" thirdpartydir="${thirdpartydir}"/> + <macro-install-spring targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/> + </target> + + <!-- ================================================================== --> <!-- Undeploy JBossWS --> <!-- ================================================================== --> Modified: stack/cxf/branches/no-spring-support/pom.xml =================================================================== --- stack/cxf/branches/no-spring-support/pom.xml 2010-06-23 13:38:48 UTC (rev 12515) +++ stack/cxf/branches/no-spring-support/pom.xml 2010-06-24 18:12:27 UTC (rev 12516) @@ -1258,29 +1258,6 @@ </profile> <!-- - Name: deploy-spring - Descr: Deploy Spring artifacts - --> - <profile> - <id>deploy-spring</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>deploy-spring</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/scripts/assembly-deploy-spring.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: srcdist Descr: Build the source distribution --> Modified: stack/cxf/branches/no-spring-support/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/no-spring-support/src/main/distro/build-deploy.xml 2010-06-23 13:38:48 UTC (rev 12515) +++ stack/cxf/branches/no-spring-support/src/main/distro/build-deploy.xml 2010-06-24 18:12:27 UTC (rev 12516) @@ -24,7 +24,6 @@ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="modifyjbossintegration" value="true"/> </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> <!-- ================================================================== --> @@ -36,7 +35,8 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50,check-spring,install-spring" description="Deploy jbossws to jboss501"> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"/> @@ -66,7 +66,6 @@ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="modifyjbossintegration" value="true"/> </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> <!-- ================================================================== --> @@ -78,7 +77,8 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51" description="Deploy jbossws to jboss510"> + <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51,check-spring,install-spring" description="Deploy jbossws to jboss510"> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> <copy todir="${jboss510.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"/> @@ -108,7 +108,6 @@ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] --> </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> <!-- ================================================================== --> @@ -120,7 +119,8 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy jbossws to jboss600"> + <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600,check-spring,install-spring" description="Deploy jbossws to jboss600"> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> <copy todir="${jboss600.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"/> @@ -150,7 +150,6 @@ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] --> </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> <!-- ================================================================== --> @@ -162,7 +161,8 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601" description="Deploy jbossws to jboss601"> + <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring" description="Deploy jbossws to jboss601"> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/> <copy todir="${jboss601.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"/> @@ -180,6 +180,24 @@ </target> <!-- ================================================================== --> + <!-- Spring --> + <!-- ================================================================== --> + <target name="check-spring"> + <condition property="spring-required"> + <and> + <istrue value="${spring}"/> + </and> + </condition> + </target> + + <target name="install-spring" if="spring-required"> + <antcall target="deploy-spring" inheritall="false"> + <param name="installserver" value="${deploy.structure}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + </target> + + <!-- ================================================================== --> <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf --> <!-- ================================================================== -->