You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/08/19 09:28:20 UTC

svn commit: r233446 - /portals/jetspeed-2/trunk/maven-plugin/plugin.jelly

Author: ate
Date: Fri Aug 19 00:28:11 2005
New Revision: 233446

URL: http://svn.apache.org/viewcvs?rev=233446&view=rev
Log:
See: http://issues.apache.org/jira/browse/JS2-338
Similar fix preventing overwriting project-info.xml

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

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=233446&r1=233445&r2=233446&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Fri Aug 19 00:28:11 2005
@@ -101,10 +101,18 @@
     </filterset>
 
     <!-- Note: keep already existing project-info.xml allowing custom modifications -->
-    <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/project-info.xml"
-          tofile="${portal.home.dir}/project-info.xml"
-          overwrite="false"
-          failonerror="true"/>
+	<j:set var="copy.project-info.xml" value="true" />
+	<util:available file="${portal.home.dir}/project-info.xml"> 
+		 <j:set var="copy.project-info.xml" value="false" />
+	</util:available>
+	
+	<echo>${portal.home.dir}/project-info.xml does not exist?  ${copy.project-info.xml} </echo>
+	<j:if test="${copy.project.xml}">
+      <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/project-info.xml"
+            tofile="${portal.home.dir}/project-info.xml"
+            overwrite="false"
+            failonerror="true"/>
+    </j:if>
     
     <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/core-build.xml"
           tofile="${portal.home.dir}/core-build.xml"
@@ -135,17 +143,17 @@
 	
 	<echo>${portal.home.dir}/project.xml does not exist?  ${copy.project.xml} </echo>
 	<j:if test="${copy.project.xml}">
-    <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/project.xml"
-          tofile="${portal.home.dir}/project.xml"
-          overwrite="false"
-          failonerror="true">
-      <filterset begintoken="@" endtoken="@">
-        <filter token="PORTAL_GROUPID" value="${org.apache.jetspeed.portal.groupId}"/>
-        <filter token="PORTAL_ARTIFACTID" value="${org.apache.jetspeed.portal.artifactId}"/>
-        <filter token="PORTAL_NAME" value="${org.apache.jetspeed.portal.name}"/>
-        <filter token="PORTAL_CURRENT_VERSION" value="${org.apache.jetspeed.portal.currentVersion}"/>
-      </filterset>
-    </copy>
+      <copy file="${org.apache.jetspeed.plugin.root}/plugin-resources/project.xml"
+            tofile="${portal.home.dir}/project.xml"
+            overwrite="false"
+            failonerror="true">
+        <filterset begintoken="@" endtoken="@">
+          <filter token="PORTAL_GROUPID" value="${org.apache.jetspeed.portal.groupId}"/>
+          <filter token="PORTAL_ARTIFACTID" value="${org.apache.jetspeed.portal.artifactId}"/>
+          <filter token="PORTAL_NAME" value="${org.apache.jetspeed.portal.name}"/>
+          <filter token="PORTAL_CURRENT_VERSION" value="${org.apache.jetspeed.portal.currentVersion}"/>
+        </filterset>
+      </copy>
 	</j:if>
   </goal>
  



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