[portal-commits] JBoss Portal SVN: r8452 - in branches/JBoss_Portal_Branch_2_6/core-wsrp: src and 3 other directories.
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 03:57:46 -0400 (Mon, 24 Sep 2007)
New Revision: 8452
Added:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/
Removed:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/img/
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
Log:
Images must be in src/bin (or they will be broken)
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-09-24 05:08:23 UTC (rev
8451)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-09-24 07:57:46 UTC (rev
8452)
@@ -224,8 +224,12 @@
<fileset dir="${build.resources}/portal-wsrp-admin-war"
includes="**/*"/>
</copy>
+ <copy todir="${build.resources}/portal-wsrp-admin.war">
+ <fileset dir="${source.bin}/portal-wsrp-admin-war"
includes="**/*"/>
+ </copy>
+
<jar jarfile="${build.lib}/portal-wsrp-admin.war">
- <fileset dir="${build.resources}/portal-wsrp-admin-war"
includes="**/*"/>
+ <fileset dir="${build.resources}/portal-wsrp-admin.war"
includes="**/*"/>
</jar>
</target>
@@ -268,7 +272,6 @@
<!-- ================================================================== -->
<!-- Deployment -->
<!-- ================================================================== -->
-
<!--
<target name="deploy" description="Deploy."
depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
@@ -281,6 +284,7 @@
<delete
file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp-admin.war"/>
</target>
+
<target name="deploy-ha" description="Deploy in clustered
environment." depends="output">
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
<copy file="${build.lib}/portal-wsrp-admin.war"
todir="${jboss.home}/server/${portal-ha.deploy.dir}"
Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img (from
rev 8451,
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/img)