[jboss-cvs] JBossAS SVN: r106169 - in branches/Branch_No_Multicast/cluster/src/installers: mod_cluster-ec2 and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-06-18 12:02:50 -0400 (Fri, 18 Jun 2010)
New Revision: 106169

Removed:
   branches/Branch_No_Multicast/cluster/src/installers/mod_cluster-ec2/resources/mod_cluster/
Modified:
   branches/Branch_No_Multicast/cluster/src/installers/ec2/build.xml
   branches/Branch_No_Multicast/cluster/src/installers/mod_cluster-ec2/build.xml
Log:
Pull mod_cluster.sar from phantom location outside install.root.

Modified: branches/Branch_No_Multicast/cluster/src/installers/ec2/build.xml
===================================================================
--- branches/Branch_No_Multicast/cluster/src/installers/ec2/build.xml	2010-06-18 15:54:10 UTC (rev 106168)
+++ branches/Branch_No_Multicast/cluster/src/installers/ec2/build.xml	2010-06-18 16:02:50 UTC (rev 106169)
@@ -14,7 +14,7 @@
 <project default="install" name="EC2 Installer" basedir=".">
 
 	<property name="ec2.profile" value="cluster-ec2"/>
-   <property name="install.root" value="../../"/>
+   <property name="install.root" value="../.."/>
 
    <property name="install.server" value="${install.root}/server"/>
    <property name="install.production" value="${install.server}/production"/>

Modified: branches/Branch_No_Multicast/cluster/src/installers/mod_cluster-ec2/build.xml
===================================================================
--- branches/Branch_No_Multicast/cluster/src/installers/mod_cluster-ec2/build.xml	2010-06-18 15:54:10 UTC (rev 106168)
+++ branches/Branch_No_Multicast/cluster/src/installers/mod_cluster-ec2/build.xml	2010-06-18 16:02:50 UTC (rev 106169)
@@ -14,8 +14,7 @@
 <project default="install" name="mod_cluster EC2 Installer" basedir=".">
 
    <property name="ec2.profile" value="mod_cluster-ec2"/>
-	<property name="mod_cluster.sar" value="mod-cluster.sar"/>
-   <property name="install.root" value="../../"/>
+   <property name="install.root" value="../.."/>
 
    <property name="install.server" value="${install.root}/server"/>
    <property name="install.production" value="${install.server}/production"/>
@@ -46,13 +45,8 @@
          todir="${install.ec2.deploy}/cluster/jboss-cache-manager.sar/META-INF/"/>
 
       <!-- Add mod-cluster.sar -->
-      <mkdir dir="${install.ec2.deploy}/mod-cluster.sar/META-INF"/>
-<!-- From where do we get mod-cluster.jar?
-      <copy file="${basedir}/lib/mod-cluster.jar"
-         todir="${install.ec2.deploy}/${mod_cluster.sar}/"/>
--->
-      <copy file="${basedir}/resources/mod_cluster/mod-cluster-jboss-beans.xml"
-         todir="${install.ec2.deploy}/${mod_cluster.sar}/META-INF"/>
+      <copy file="${install.root}/../mod_cluster/mod-cluster.sar"
+         todir="${install.ec2.deploy}"/>
       
       <!-- Add in the modified-for-mod_cluster content -->
       <copy file="${basedir}/resources/jbossweb/server.xml"
@@ -61,4 +55,4 @@
          todir="${install.ec2.deploy}/jbossweb.sar/META-INF"/>
    </target>
    
-</project>
\ No newline at end of file
+</project>