portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r587717 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3: app-servers/tomcat-build.xml installer/maven.xml maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
Date Wed, 24 Oct 2007 00:28:10 GMT
Author: ate
Date: Tue Oct 23 17:28:09 2007
New Revision: 587717

URL: http://svn.apache.org/viewvc?rev=587717&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
- adapting other (non maven-1 jetspeed plugin driven) Tomcat context deployment filtering
actions to provide the new (Tomcat 5.0.x only) CONTEXTPATH filter token  

Modified:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/app-servers/tomcat-build.xml
    portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml
    portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/app-servers/tomcat-build.xml?rev=587717&r1=587716&r2=587717&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/app-servers/tomcat-build.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/app-servers/tomcat-build.xml Tue Oct 23 17:28:09
2007
@@ -125,6 +125,7 @@
             </fileset>
             <filterset begintoken="@" endtoken="@">
                 <filter token="CONTEXT" value="jetspeed"/>
+                <filter token="CONTEXTPATH" value="jetspeed"/>
                 <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}"/>

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml?rev=587717&r1=587716&r2=587717&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml Tue Oct 23 17:28:09 2007
@@ -117,7 +117,8 @@
     </copy>
     
     <filter token="CONTEXT" value="jetspeed" />
-    <copy file="${basedir}/../etc/conf/tomcat/jetspeed-tomcat-5.5.xml" tofile="${maven.build.dir}/database/jetspeed.xml"
+    <filter token="CONTEXTPATH" value="jetspeed" />
+     <copy file="${basedir}/../etc/conf/tomcat/jetspeed-tomcat-5.5.xml" tofile="${maven.build.dir}/database/jetspeed.xml"
       filtering="true" />
 
     <attainGoal name="j2:copy.shared.deps" />

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml?rev=587717&r1=587716&r2=587717&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
(original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
Tue Oct 23 17:28:09 2007
@@ -121,6 +121,7 @@
             </fileset>
             <filterset begintoken="@" endtoken="@">
                 <filter token="CONTEXT" value="${artifactId}"/>
+                <filter token="CONTEXTPATH" value="${artifactId}"/>
                 <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}"/>



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