portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r587695 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin: plugin.jelly plugin.properties
Date Tue, 23 Oct 2007 23:39:57 GMT
Author: ate
Date: Tue Oct 23 16:39:57 2007
New Revision: 587695

URL: http://svn.apache.org/viewvc?rev=587695&view=rev
Log:
JS2-793: Support deployment of jetspeed under a custom context name (e.g. ROOT) with the maven
1 jetspeed plugin
See: http://issues.apache.org/jira/browse/JS2-793

Modified:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.jelly
    portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.properties

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.jelly?rev=587695&r1=587694&r2=587695&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.jelly Tue Oct 23 16:39:57
2007
@@ -281,7 +281,7 @@
     <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/conf/tomcat/${context_file_source}"
           tofile="${portal.conf.dir}/tomcat/context.xml" overwrite="true">
       <filterset begintoken="@" endtoken="@">
-        <filter token="CONTEXT" value="${org.apache.jetspeed.portal.artifactId}"/>
+        <filter token="CONTEXT" value="${org.apache.jetspeed.portal.contextName}"/>
         <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
         <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
         <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
@@ -585,22 +585,21 @@
     
   <goal name="j2:portal.deploy">
     <attainGoal name="j2:remove.wars"/>
-    <echo message="Deploying ${org.apache.jetspeed.portal.artifactId}"/>
-    <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}"/>
+    <echo message="Deploying ${org.apache.jetspeed.portal.artifactId} under context ${org.apache.jetspeed.portal.contextName}"/>
+    <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.contextName}"/>
     <copy file="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/wars/${org.apache.jetspeed.portal.artifactId}-${org.apache.jetspeed.portal.currentVersion}.war"
-          tofile="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}.war"
+          tofile="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.contextName}.war"
           verbose="true" />
-    <unwar src="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}.war"
-           dest="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}"/>
+    <unwar src="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.contextName}.war"
+           dest="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.contextName}"/>
 
     <j:set var="portal.conf.dir" value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.conf.dir}"/>
     
 
     <copy file="${portal.conf.dir}/tomcat/context.xml"
-          tofile="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/${org.apache.jetspeed.portal.artifactId}.xml"
+          tofile="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/${org.apache.jetspeed.portal.contextName}.xml"
           overwrite="true"/>
 
-    <attainGoal name="j2:catalina.base.shared"/>
-    <attainGoal name="j2:catalina.shared"/>
+    <attainGoal name="j2:copy.shared.deps"/>
   </goal>
     
   <goal name="j2:baseDeploy">
@@ -643,8 +642,8 @@
     
   <goal name="j2:remove.wars">
       <echo>Remove war files, make sure to shutdown server first...</echo>
-      <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}"/>
-      <delete file="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}.war"/>
+      <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.contextName}"/>
+      <delete file="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.contextName}.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/demo"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/demo.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/j2-admin"/>
@@ -656,7 +655,7 @@
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/jpetstore"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/jpetstore.war"/>
       <j:set var="context_dir" value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
-      <delete file="${context_dir}/${org.apache.jetspeed.portal.artifactId}.xml"/>
+      <delete file="${context_dir}/${org.apache.jetspeed.portal.contextName}.xml"/>
       <delete file="${context_dir}/j2-admin.xml"/>
       <delete file="${context_dir}/jpetstore.xml"/>
   </goal>
@@ -673,11 +672,6 @@
     <j:if test="${recreateDB}">
       <attainGoal name="j2:db.recreate"/>
     </j:if>
-
-    <attainGoal name="j2:remove.wars"/>
-      
-    <!-- Dependency copying -->
-    <attainGoal name="j2:copy.shared.deps"/>
 
     <attainGoal name="${deployType}"/>
   </goal>

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.properties?rev=587695&r1=587694&r2=587695&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.properties (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-plugin/plugin.properties Tue Oct 23 16:39:57
2007
@@ -85,8 +85,11 @@
 # ---------------------------------------------------------------------------
 # Deployment Properties
 # ---------------------------------------------------------------------------
+# The default portal contextName is the current project artifactId
+# (for ROOT context deployed, e.g. in Tomcat, you can override this in your build.properties
to value ROOT (note: must be in full capitals)
+org.apache.jetspeed.portal.contextName=${org.apache.jetspeed.portal.artifactId}
 # The portal directory in its deployed target.
-org.apache.jetspeed.portal.dir=${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}
+org.apache.jetspeed.portal.dir=${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.contextName}
 
 # Default server name and port for autodeployment.  
 # You can override these via ${user.home}/build.properties.



---------------------------------------------------------------------
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