weaver 2005/03/11 12:53:46
Modified: maven-plugin plugin.jelly plugin.properties
Log:
Added optional property to stop plugin from copying the jetspeed.xml
Revision Changes Path
1.29 +21 -42 jakarta-jetspeed-2/maven-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.jelly,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plugin.jelly 21 Jan 2005 19:23:44 -0000 1.28
+++ plugin.jelly 11 Mar 2005 20:53:45 -0000 1.29
@@ -280,15 +280,32 @@
</fileset>
</copy>
</j:if>
-
- <attainGoal name='jetspeed2:copy.context'/>
+ <j:if test="${org.apache.jetspeed.copy.context}">
+ <attainGoal name='jetspeed2:copy.context'/>
+ </j:if>
<delete
dir="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
<j:if test="${org.apache.jetspeed.explode.war}">
<unwar
src="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}"
dest="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
</j:if>
- <j:set var="catalina_version_major"
value="${org.apache.jetspeed.catalina.version.major}"/>
+
+
+
+ </goal>
+
+ <!--
+ <goal name="jetspeed2:unregister.core.pa">
+ <j:set var="pam.action" value="unregister"/>
+ <j:set var="pam.app.name" value="jetspeed"/>
+ <j:set var="pam.app.war"
value="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}"/>
+ <attainGoal name="pam.template.register"/>
+ </goal>
+-->
+
+<goal name="jetspeed2:copy.context">
+
+ <j:set var="catalina_version_major"
value="${org.apache.jetspeed.catalina.version.major}"/>
<echo>Build jetspeed.xml for Tomcat version
${catalina_version_major}</echo>
<j:choose>
<j:when test="${catalina_version_major == '5'}" >
@@ -309,45 +326,7 @@
<filter token="URL"
value="${org.apache.jetspeed.production.database.url}"/>
<filter token="USE_CONTEXTCLASSLOADER"
value="${use_contextclassloader}"/>
</filterset>
- </copy>
-
-
- </goal>
-
- <!--
- <goal name="jetspeed2:unregister.core.pa">
- <j:set var="pam.action" value="unregister"/>
- <j:set var="pam.app.name" value="jetspeed"/>
- <j:set var="pam.app.war"
value="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}"/>
- <attainGoal name="pam.template.register"/>
- </goal>
--->
-
-<goal name="jetspeed2:copy.context">
-
- <!-- version -->
- <j:choose>
- <j:when test="${catVer == '5'}" >
- <j:set var="catDir"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
- </j:when>
- <j:otherwise>
- <j:set var="catDir"
value="${org.apache.jetspeed.deploy.war.dir}"/>
- </j:otherwise>
- </j:choose>
-
-
- <!-- context file destination -->
- <j:set var="destinationFile"
value="${catDir}/${org.apache.jetspeed.context.file.name}"/>
-
- <echo>Copy ${org.apache.jetspeed.context.file.source} to
${destinationFile}</echo>
- <copy file="${org.apache.jetspeed.context.file.source}"
tofile="${destinationFile}" overwrite="true">
- <filterset begintoken="@" endtoken="@">
- <filter token="USERNAME"
value="${org.apache.jetspeed.database.user}"/>
- <filter token="PASSWORD"
value="${org.apache.jetspeed.database.password}"/>
- <filter token="DRIVER"
value="${org.apache.jetspeed.database.driver}"/>
- <filter token="URL" value="${org.apache.jetspeed.database.url}"/>
- </filterset>
- </copy>
+ </copy>
</goal>
1.10 +3 -0 jakarta-jetspeed-2/maven-plugin/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.properties 4 Jan 2005 16:03:05 -0000 1.9
+++ plugin.properties 11 Mar 2005 20:53:45 -0000 1.10
@@ -70,4 +70,7 @@
jetspeed.version=2.0-M2-dev
+org.apache.jetspeed.copy.context=true
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
