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

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

Author: aron.gombas
Date: 2005-12-27 12:30:40 -0500 (Tue, 27 Dec 2005)
New Revision: 1934

Added:
   trunk/labs/kosmos/deploy-server-tomcat-liferay-portal.xml
Modified:
   trunk/labs/kosmos/build-distro.xml
   trunk/labs/kosmos/deploy-portlet-liferay-portal.xml
   trunk/labs/kosmos/deploy-server-tomcat.xml
Log:
Separate deploy script for Liferay Tomcat

Modified: trunk/labs/kosmos/build-distro.xml
===================================================================
--- trunk/labs/kosmos/build-distro.xml	2005-12-27 09:44:37 UTC (rev 1933)
+++ trunk/labs/kosmos/build-distro.xml	2005-12-27 17:30:40 UTC (rev 1934)
@@ -9,8 +9,6 @@
 <!-- $Id$ -->
 <project basedir="." default="dist" name="Kosmos Distro">
   <description>Kosmos Distro build-file</description>
-
-<!-- TODO kitakarit es valtozokat hasznal -->	
 	
   <!-- read basic properties -->
   <property environment="env"/>
@@ -156,7 +154,6 @@
     <mkdir dir="${dist-bin-exo.dir}"/>
 
     <!-- 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"/>
 
@@ -182,7 +179,6 @@
     <mkdir dir="${dist-bin-gridsphere.dir}"/>
 
     <!-- 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"/>
 
@@ -234,9 +230,8 @@
     <mkdir dir="${dist-bin-liferay-portal.dir}"/>
 
     <!-- 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"/>
+    <ant antfile="${dist-bin.dir}/server/deploy-server-tomcat-liferay-portal.xml" dir="${dist-bin.dir}/server"/>
 
     <!-- copy all webapps -->
     <copy todir="${dist-bin-liferay-portal.dir}/webapps">

Modified: trunk/labs/kosmos/deploy-portlet-liferay-portal.xml
===================================================================
--- trunk/labs/kosmos/deploy-portlet-liferay-portal.xml	2005-12-27 09:44:37 UTC (rev 1933)
+++ trunk/labs/kosmos/deploy-portlet-liferay-portal.xml	2005-12-27 17:30:40 UTC (rev 1934)
@@ -3,13 +3,11 @@
 <!-- $Id$ -->
 <project basedir="." default="build" name="Kosmos Portlet on Liferay Portal">
   <description>Kosmos Portlet Module deploy-file</description>
-
-<!-- TODO this script needs serious cleaning up -->
 	
   <property environment="env"/>
   <property name="module.name" value="portlet"/>
   <property name="container.name" value="liferay-portal"/>
-  <property name="temp.dir" value="tmp"/>
+  <property name="temp.dir" value="temp"/>
 
   <!-- the following properties need to be customized to your environment -->
   <!-- for JBoss AS: <property name="container.dir" value="${env.JBOSS_HOME}/server/default" /> -->
@@ -23,7 +21,7 @@
   <target name="build" >
     <!-- unpack -->
     <mkdir dir="${temp.dir}"/>
-    <unzip src="kosmos-portlet.war" dest="${temp.dir}"/>
+    <unzip src="kosmos-${module.name}.war" dest="${temp.dir}"/>
 
     <!-- prepare dependencies -->
     <copy todir="${temp.dir}/WEB-INF">
@@ -38,7 +36,7 @@
       <fileset dir="${temp.dir}/WEB-INF/lib" includes="commons-logging-1.0.4.jar"/>
     </delete>
     <copy todir="${temp.dir}/WEB-INF/lib">
-      <fileset dir="../etc" includes="commons-logging-1.0.3.jar"/><!-- TODO fix reference and this should be done for the server, too -->
+      <fileset dir="../etc" includes="commons-logging-1.0.3.jar"/>
       <fileset dir="${liferay.home}/WEB-INF/lib" includes="util-taglib.jar"/>
     </copy>
 
@@ -66,7 +64,8 @@
     </replace>
   	
     <!-- repack -->
-    <zip destfile="conf/${container.name}/kosmos-portlet.war" basedir="${temp.dir}"/>
+    <zip destfile="conf/${container.name}/kosmos-${module.name}.war" basedir="${temp.dir}"/>
+    <delete dir="${temp.dir}"/>
   	
     <!-- prepare container -->
     <delete>

Added: trunk/labs/kosmos/deploy-server-tomcat-liferay-portal.xml
===================================================================
--- trunk/labs/kosmos/deploy-server-tomcat-liferay-portal.xml	2005-12-27 09:44:37 UTC (rev 1933)
+++ trunk/labs/kosmos/deploy-server-tomcat-liferay-portal.xml	2005-12-27 17:30:40 UTC (rev 1934)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Kosmos Server deploy-script for Liferay Portal's Apache Tomcat -->
+<!-- $Id$ -->
+<project basedir="." default="build" name="Kosmos Server on Liferay Portal's Apache Tomcat">
+  <description>Kosmos Server Module deploy-file</description>
+	
+  <property environment="env"/>
+  <property name="module.name" value="server"/>
+  <property name="container.name" value="liferay-portal-tomcat"/>
+  <property name="container.dir" value="\Java\liferay-portal-pro-3.6.1-tomcat\webapps\kosmos-${module.name}"/><!-- TODO why hardwired? -->
+  <property name="temp.dir" value="temp"/>
+
+  <target name="build" >
+    <!-- unpack -->
+    <mkdir dir="${temp.dir}"/>
+    <unzip src="kosmos-${module.name}.war" dest="${temp.dir}"/>
+
+    <!-- prepare dependencies -->
+    <delete>
+      <fileset dir="${temp.dir}/WEB-INF/lib" includes="commons-logging-1.0.4.jar"/>
+    </delete>
+    <copy todir="${temp.dir}/WEB-INF/lib">
+      <fileset dir="../etc" includes="commons-logging-1.0.3.jar"/>
+    </copy>
+  	
+    <!-- repack -->
+    <zip destfile="conf/${container.name}/kosmos-${module.name}.war" basedir="${temp.dir}"/>
+    <delete dir="${temp.dir}"/>
+
+    <!-- deploy the repacked war -->
+    <delete dir="${container.dir}"/>
+    <mkdir dir="${container.dir}"/>
+    <unzip src="conf/${container.name}/kosmos-${module.name}.war" dest="${container.dir}"/>
+  </target>
+</project>

Modified: trunk/labs/kosmos/deploy-server-tomcat.xml
===================================================================
--- trunk/labs/kosmos/deploy-server-tomcat.xml	2005-12-27 09:44:37 UTC (rev 1933)
+++ trunk/labs/kosmos/deploy-server-tomcat.xml	2005-12-27 17:30:40 UTC (rev 1934)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Kosmos Portlet deploy-script for JBoss Portal -->
+<!-- Kosmos Server deploy-script for Apache Tomcat -->
 <!-- $Id$ -->
-<project basedir="." default="redeploy" name="Kosmos Portlet on JBoss Portal">
+<project basedir="." default="redeploy" name="Kosmos Server on Apache Tomcat">
   <description>Kosmos Server Module deploy-file</description>
 
   <property name="module.name" value="server"/>