portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r468237 - /portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
Date Fri, 27 Oct 2006 02:16:07 GMT
Author: taylor
Date: Thu Oct 26 19:16:07 2006
New Revision: 468237

URL: http://svn.apache.org/viewvc?view=rev&rev=468237
Log:
special case for deploying local portlet apps such as layouts

Modified:
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?view=diff&rev=468237&r1=468236&r2=468237
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Thu Oct 26 19:16:07 2006
@@ -350,6 +350,14 @@
   <goal name="j2:deploy">
       <j:set var="j2.war.groupId" value="${plugin.groupId}"/>
       <j:set var="j2.war.version" value="${jetspeed.version}"/>
+      <j:set var="isLocalWarDeploy" value="false"/>            
+      <attainGoal name="j2:warDeploy"/>
+  </goal>
+
+  <goal name="j2:localdeploy">
+      <j:set var="j2.war.groupId" value="${plugin.groupId}"/>
+      <j:set var="j2.war.version" value="${jetspeed.version}"/>
+      <j:set var="isLocalWarDeploy" value="true"/>
       <attainGoal name="j2:warDeploy"/>
   </goal>
   
@@ -378,8 +386,12 @@
     <j:if test="${online}">
       <attainGoal name="j2:_check.dep"/>
     </j:if>
+    <j:set var="warDeployDest" value="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}.war"/>
+    <j:if test='${isLocalWarDeploy == "true"}'>
+      <j:set var="warDeployDest" value="${org.apache.jetspeed.portal.dir}/WEB-INF/deploy/${maven.war.final.name}.war"/>
+    </j:if>    
     <copy file="${maven.repo.local}/${depGroup}/${depType}/${depName}"
-          tofile="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}.war" 
+          tofile="${warDeployDest}" 
           overwrite="true"
           failonerror="true"/>
   </goal>
@@ -387,7 +399,7 @@
 
   <goal name="j2:pam.layoutdeploy">
     <j:set var="maven.war.final.name" value="jetspeed-layouts"/>
-    <attainGoal name="j2:deploy"/>
+    <attainGoal name="j2:localdeploy"/>
   </goal>
 
   <goal name="j2:pam.demodeploy">



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message