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

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

Author: aron.gombas
Date: 2005-11-10 12:24:35 -0500 (Thu, 10 Nov 2005)
New Revision: 1550

Modified:
   trunk/labs/kosmos/build/deploy.xml
   trunk/labs/kosmos/build/portlet-exo-deploy.properties
   trunk/labs/kosmos/build/portlet-gridsphere-deploy.properties
   trunk/labs/kosmos/build/portlet-jboss-portal-deploy.properties
   trunk/labs/kosmos/build/portlet-liferay-portal-deploy.properties
   trunk/labs/kosmos/build/portlet-pluto-deploy.properties
   trunk/labs/kosmos/build/server-jboss-as-deploy.properties
   trunk/labs/kosmos/build/server-tomcat-deploy.properties
Log:
Fix: ".war" can't appear in the TC/webapps/dirname

Modified: trunk/labs/kosmos/build/deploy.xml
===================================================================
--- trunk/labs/kosmos/build/deploy.xml	2005-11-10 01:17:01 UTC (rev 1549)
+++ trunk/labs/kosmos/build/deploy.xml	2005-11-10 17:24:35 UTC (rev 1550)
@@ -14,6 +14,7 @@
   <property environment="env"/>
   <property file="build/kosmos-project.properties"/>
   <property file="build/${module.name}-module.properties"/>
+  <property name="webapp.name" value="${project.name.short}-${module.name}"/>
   <property name="war.name" value="${project.name.short}-${module.name}.war"/>
   <property file="build/${module.name}-${container.name}-deploy.properties"/>
 
@@ -29,7 +30,7 @@
   </target>
 
   <target name="deploy" depends="init" description="Deploys the portlet to the container">
-    <echo message="Deploying to ${container.name} at ${container.dir}"/>
+    <echo message="Deploying to ${container.displayName} at ${container.dir}"/>
     <mkdir dir="${container.dir}"/>
     <!-- expand WAR -->
     <unzip src="${war.name}" dest="${container.dir}"/>

Modified: trunk/labs/kosmos/build/portlet-exo-deploy.properties
===================================================================
--- trunk/labs/kosmos/build/portlet-exo-deploy.properties	2005-11-10 01:17:01 UTC (rev 1549)
+++ trunk/labs/kosmos/build/portlet-exo-deploy.properties	2005-11-10 17:24:35 UTC (rev 1550)
@@ -1 +1,2 @@
-container.dir=${env.CATALINA_HOME}/webapps/${war.name}
+container.displayName=eXo Platform
+container.dir=${env.CATALINA_HOME}/webapps/${webapp.name}

Modified: trunk/labs/kosmos/build/portlet-gridsphere-deploy.properties
===================================================================
--- trunk/labs/kosmos/build/portlet-gridsphere-deploy.properties	2005-11-10 01:17:01 UTC (rev 1549)
+++ trunk/labs/kosmos/build/portlet-gridsphere-deploy.properties	2005-11-10 17:24:35 UTC (rev 1550)
@@ -1 +1,2 @@
-container.dir=${env.CATALINA_HOME}/webapps/${war.name}
+container.displayName=GridSphere Portal Framework
+container.dir=${env.CATALINA_HOME}/webapps/${webapp.name}

Modified: trunk/labs/kosmos/build/portlet-jboss-portal-deploy.properties
===================================================================
--- trunk/labs/kosmos/build/portlet-jboss-portal-deploy.properties	2005-11-10 01:17:01 UTC (rev 1549)
+++ trunk/labs/kosmos/build/portlet-jboss-portal-deploy.properties	2005-11-10 17:24:35 UTC (rev 1550)
@@ -1,2 +1,3 @@
+container.displayName=JBoss Portal
 container.dir=${env.JBOSS_HOME}/server/default/deploy/${war.name}
 

Modified: trunk/labs/kosmos/build/portlet-liferay-portal-deploy.properties
===================================================================
--- trunk/labs/kosmos/build/portlet-liferay-portal-deploy.properties	2005-11-10 01:17:01 UTC (rev 1549)
+++ trunk/labs/kosmos/build/portlet-liferay-portal-deploy.properties	2005-11-10 17:24:35 UTC (rev 1550)
@@ -1 +1,2 @@
-
+container.displayName=Liferay Portal
+container.dir=${env.CATALINA_HOME}/webapps/${webapp.name}

Modified: trunk/labs/kosmos/build/portlet-pluto-deploy.properties
===================================================================
--- trunk/labs/kosmos/build/portlet-pluto-deploy.properties	2005-11-10 01:17:01 UTC (rev 1549)
+++ trunk/labs/kosmos/build/portlet-pluto-deploy.properties	2005-11-10 17:24:35 UTC (rev 1550)
@@ -1,2 +1,2 @@
-container.dir=${env.CATALINA_HOME}/webapps/${war.name}
-
+container.displayName=Apache Pluto
+container.dir=${env.CATALINA_HOME}/webapps/${webapp.name}

Modified: trunk/labs/kosmos/build/server-jboss-as-deploy.properties
===================================================================
--- trunk/labs/kosmos/build/server-jboss-as-deploy.properties	2005-11-10 01:17:01 UTC (rev 1549)
+++ trunk/labs/kosmos/build/server-jboss-as-deploy.properties	2005-11-10 17:24:35 UTC (rev 1550)
@@ -1,2 +1,3 @@
+container.displayName=JBoss Application Server
 container.dir=${env.JBOSS_HOME}/server/default/deploy/${war.name}
 

Modified: trunk/labs/kosmos/build/server-tomcat-deploy.properties
===================================================================
--- trunk/labs/kosmos/build/server-tomcat-deploy.properties	2005-11-10 01:17:01 UTC (rev 1549)
+++ trunk/labs/kosmos/build/server-tomcat-deploy.properties	2005-11-10 17:24:35 UTC (rev 1550)
@@ -1,2 +1,3 @@
-container.dir=${env.CATALINA_HOME}/webapps/${war.name}
+container.displayName=Apache Tomcat
+container.dir=${env.CATALINA_HOME}/webapps/${webapp.name}