[Jboss-svn-commits] JBL Code SVN: r1846 - trunk/labs/kosmos

[<jbo...@li...>]

Author: aron.gombas
Date: 2005-12-18 10:18:30 -0500 (Sun, 18 Dec 2005)
New Revision: 1846

Modified:
   trunk/labs/kosmos/build-distro.xml
Log:
Preconf distro package generation almost complete

Modified: trunk/labs/kosmos/build-distro.xml
===================================================================
--- trunk/labs/kosmos/build-distro.xml	2005-12-18 15:15:02 UTC (rev 1845)
+++ trunk/labs/kosmos/build-distro.xml	2005-12-18 15:18:30 UTC (rev 1846)
@@ -21,7 +21,7 @@
   <property name="distro-bin-exo.name" value="${distro-bin.name}-for-exo"/>
   <property name="distro-bin-gridsphere.name" value="${distro-bin.name}-for-gridsphere"/>
   <property name="distro-bin-jboss-portal.name" value="${distro-bin.name}-for-jboss-portal"/>
-  <property name="distro-bin-liferay.name" value="${distro-bin.name}-for-liferay"/>
+  <property name="distro-bin-liferay-portal.name" value="${distro-bin.name}-for-liferay-portal"/>
 	
   <!-- generated paths -->
   <property name="src.dir" location="src"/>
@@ -39,7 +39,7 @@
   <property name="dist-bin-exo.dir" location="${dist.dir}/${distro-bin-exo.name}"/>
   <property name="dist-bin-gridsphere.dir" location="${dist.dir}/${distro-bin-gridsphere.name}"/>
   <property name="dist-bin-jboss-portal.dir" location="${dist.dir}/${distro-bin-jboss-portal.name}"/>
-  <property name="dist-bin-liferay.dir" location="${dist.dir}/${distro-bin-liferay.name}"/>
+  <property name="dist-bin-liferay-portal.dir" location="${dist.dir}/${distro-bin-liferay-portal.name}"/>
   	
   <property name="xdocs.dir" location="xdocs"/>
   <property name="reference.dir" location="${xdocs.dir}/reference"/>
@@ -56,7 +56,7 @@
     <delete dir="${dist.dir}"/>
   </target>
 
-  <target name="dist" depends="init,clean,dist-bin,dist-src,dist-bin-exo,dist-bin-gridsphere,dist-bin-jboss-portal,dist-bin-liferay" description="Prepares all distributables"/>
+  <target name="dist" depends="init,clean,dist-bin,dist-src,dist-bin-exo,dist-bin-gridsphere,dist-bin-jboss-portal,dist-bin-liferay-portal" description="Prepares all distributables"/>
 
   <!-- generic distribution package targets -->
   <target name="dist-bin" depends="init,clean,manual" description="Prepares all binary distributables">
@@ -156,8 +156,9 @@
     <mkdir dir="${dist-bin-exo.dir}"/>
 
     <!-- deploy -->
-    <!-- set CATALINA_HOME -->
-    <!-- TODO call 2x deploy -->
+    <!-- TODO set CATALINA_HOME -->
+    <ant antfile="${dist-bin.dir}/portlet/deploy-portlet-exo.xml" dir="${dist-bin.dir}/portlet"/>
+    <ant antfile="${dist-bin.dir}/server/deploy-server-tomcat.xml" dir="${dist-bin.dir}/server"/>
 
     <!-- copy all webapps -->
     <copy todir="${dist-bin-exo.dir}/webapps">
@@ -181,8 +182,9 @@
     <mkdir dir="${dist-bin-gridsphere.dir}"/>
 
     <!-- deploy -->
-    <!-- set CATALINA_HOME -->
-    <!-- TODO call 2x deploy -->
+    <!-- TODO set CATALINA_HOME -->
+    <ant antfile="${dist-bin.dir}/portlet/deploy-portlet-gridsphere.xml" dir="${dist-bin.dir}/portlet"/>
+    <ant antfile="${dist-bin.dir}/server/deploy-server-tomcat.xml" dir="${dist-bin.dir}/server"/>
 
     <!-- copy all webapps -->
     <copy todir="${dist-bin-gridsphere.dir}/webapps">
@@ -206,7 +208,8 @@
     <mkdir dir="${dist-bin-jboss-portal.dir}"/>
   	
     <!-- deploy -->
-    <!-- TODO call 2x deploy -->
+    <ant antfile="${dist-bin.dir}/portlet/deploy-portlet-jboss-portal.xml" dir="${dist-bin.dir}/portlet"/>
+    <ant antfile="${dist-bin.dir}/server/deploy-server-jboss-as.xml" dir="${dist-bin.dir}/server"/>
 
     <!-- copy all webapps -->
     <mkdir dir="${dist-bin-jboss-portal.dir}/deploy"/>
@@ -227,28 +230,29 @@
     <tar destfile="${dist.dir}/${distro-bin-jboss-portal.name}.tar.gz" basedir="${dist.dir}" includes="${distro-bin-jboss-portal.name}/**" compression="gzip" longfile="gnu"/>
   </target>
 	
-  <target name="dist-bin-liferay" depends="dist-bin" description="Prepares all binary distributables for Liferay">
-    <mkdir dir="${dist-bin-liferay.dir}"/>
+  <target name="dist-bin-liferay-portal" depends="dist-bin" description="Prepares all binary distributables for Liferay">
+    <mkdir dir="${dist-bin-liferay-portal.dir}"/>
 
     <!-- deploy -->
-    <!-- set CATALINA_HOME -->
-    <!-- TODO call 2x deploy -->
+    <!-- TODO set CATALINA_HOME -->
+    <ant antfile="${dist-bin.dir}/portlet/deploy-portlet-liferay-portal.xml" dir="${dist-bin.dir}/portlet"/>
+    <ant antfile="${dist-bin.dir}/server/deploy-server-tomcat.xml" dir="${dist-bin.dir}/server"/>
 
     <!-- copy all webapps -->
-    <copy todir="${dist-bin-liferay.dir}/webapps">
+    <copy todir="${dist-bin-liferay-portal.dir}/webapps">
       <fileset dir="${env.CATALINA_HOME}/webapps" includes="kosmos-portlet/**/*"/>
       <fileset dir="${env.CATALINA_HOME}/webapps" includes="kosmos-server/**/*"/>
       <fileset dir="${env.CATALINA_HOME}/webapps" includes="slide/**/*"/>
     </copy>
 
     <!-- copy all documents -->
-    <copy todir="${dist-bin-liferay.dir}">
+    <copy todir="${dist-bin-liferay-portal.dir}">
       <fileset dir="${dist-bin.dir}" includes="docs/**/*"/>
       <fileset dir="${dist-bin.dir}" includes="*.*"/>
     </copy>
 
     <!-- pack -->
-    <zip file="${dist.dir}/${distro-bin-liferay.name}.zip" basedir="${dist.dir}" includes="${distro-bin-liferay.name}/**"/>
-    <tar destfile="${dist.dir}/${distro-bin-liferay.name}.tar.gz" basedir="${dist.dir}" includes="${distro-bin-liferay.name}/**" compression="gzip" longfile="gnu"/>
+    <zip file="${dist.dir}/${distro-bin-liferay-portal.name}.zip" basedir="${dist.dir}" includes="${distro-bin-liferay-portal.name}/**"/>
+    <tar destfile="${dist.dir}/${distro-bin-liferay-portal.name}.tar.gz" basedir="${dist.dir}" includes="${distro-bin-liferay-portal.name}/**" compression="gzip" longfile="gnu"/>
   </target>
 </project>