From: <jbo...@li...> - 2005-09-24 16:47:26
|
Author: adamw Date: 2005-09-24 12:47:20 -0400 (Sat, 24 Sep 2005) New Revision: 1203 Modified: trunk/forge/portal-extensions/forge-kosmos/maven.xml Log: Build fix Modified: trunk/forge/portal-extensions/forge-kosmos/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/maven.xml 2005-09-24 16:16:18 UTC (rev 1202) +++ trunk/forge/portal-extensions/forge-kosmos/maven.xml 2005-09-24 16:47:20 UTC (rev 1203) @@ -13,48 +13,21 @@ </goal> <goal name="build"> - <!--<ant:exec dir="kosmos-portlet" executable="ant" failonerror="true"> - <ant:arg line="-f build-portlet.xml" /> - <ant:arg value="compile" /> - </ant:exec> - <ant:exec dir="kosmos-server" executable="ant" failonerror="true"> - <ant:arg line="-f build-server.xml" /> - <ant:arg value="compile" /> - </ant:exec>--> </goal> <goal name="deploy"> - <!--<ant:mkdir dir="${local.deploy.dir}/kosmos-portlet.war" /> - <ant:copy todir="${local.deploy.dir}/kosmos-portlet.war" overwrite="true"> - <ant:fileset dir="kosmos-portlet/dist-bin-portlet/kosmos-portlet-0.1.0RC3/kosmos-portlet.war-expanded"> - <ant:filename name="**/*" /> - </ant:fileset> - </ant:copy> - <ant:copy todir="${local.deploy.dir}/kosmos-portlet.war/WEB-INF" overwrite="true"> - <ant:fileset dir="kosmos-portlet/conf-portlet/jboss-portal"> - <ant:filename name="**/*" /> - </ant:fileset> - </ant:copy> - - <ant:mkdir dir="${local.deploy.dir}/kosmos-server.war" /> - <ant:copy todir="${local.deploy.dir}/kosmos-server.war" overwrite="true"> - <ant:fileset dir="kosmos-server/dist-bin-server/kosmos-server-0.1.0RC3/kosmos-server.war-expanded"> - <ant:filename name="**/*" /> - </ant:fileset> - </ant:copy>--> - <!-- Unzipping the jar-s --> <ant:unzip src="to-copy/kosmos-server.war" dest="target/kosmos-server.war" overwrite="true" /> <ant:unzip src="to-copy/kosmos-portlet.war" dest="target/kosmos-portlet.war" overwrite="true" /> <!-- Copying configuration files --> - <ant:copy todir="target/kosmos-server.war/WEB-INF"> - <ant:fileset dir="conf/server" flatten="true" overwrite="true"> + <ant:copy todir="target/kosmos-server.war/WEB-INF" overwrite="true"> + <ant:fileset dir="conf/server"> <ant:filename name="**/*" /> </ant:fileset> </ant:copy> - <ant:copy todir="target/kosmos-portlet.war/WEB-INF"> - <ant:fileset dir="conf/portlet" flatten="true" overwrite="true"> + <ant:copy todir="target/kosmos-portlet.war/WEB-INF" overwrite="true"> + <ant:fileset dir="conf/portlet"> <ant:filename name="**/*" /> </ant:fileset> </ant:copy> @@ -64,8 +37,8 @@ <ant:delete dir="${local.deploy.dir}/kosmos-portlet.war" /> <!-- Deploying new packages --> - <ant:copy todir="${local.deploy.dir}"> - <ant:fileset dir="target" flatten="true" overwrite="true"> + <ant:copy todir="${local.deploy.dir}" overwrite="true"> + <ant:fileset dir="target"> <ant:filename name="**/*" /> </ant:fileset> </ant:copy> |