geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r264653 - in /geronimo/trunk/plugins/maven-geronimo-plugin: plugin.jelly plugin.properties
Date Mon, 29 Aug 2005 23:13:15 GMT
Author: djencks
Date: Mon Aug 29 16:13:10 2005
New Revision: 264653

URL: http://svn.apache.org/viewcvs?rev=264653&view=rev
Log:
GERONIMO-942.  Fix plugin so it doesn't require src/var to be present, and copy over src/var
rather than just src/config

Modified:
    geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly
    geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties

Modified: geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly?rev=264653&r1=264652&r2=264653&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/maven-geronimo-plugin/plugin.jelly Mon Aug 29 16:13:10 2005
@@ -72,12 +72,15 @@
                     <ant:copy tofile="${depDir}/${dependency.getArtifact()}" file="${artifact.path}"/>
                 </j:if>
             </j:forEach>
-            <copy todir="${targetDir}/var/config" overwrite="true">
-                <fileset dir="${basedir}/${geronimo.var.config.source}">
-                    <include name="config.xml"/>
-                    <include name="config.list"/>
-                </fileset>
-            </copy>
+            <ant:available property="geronimo.deploy.var.available"
+                 file="${geronimo.deploy.var.source}"
+                 type="dir"/>
+            <j:if test="${geronimo.deploy.var.available}">
+                <copy todir="${targetDir}/var" overwrite="true">
+                    <fileset dir="${basedir}/${geronimo.deploy.var.source}">
+                    </fileset>
+                </copy>
+            </j:if>
 
 
         </define:tag>

Modified: geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties?rev=264653&r1=264652&r2=264653&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties (original)
+++ geronimo/trunk/plugins/maven-geronimo-plugin/plugin.properties Mon Aug 29 16:13:10 2005
@@ -20,4 +20,4 @@
 ##
 
 
-geronimo.var.config.source=src/config
+geronimo.deploy.var.source=src/var



Mime
View raw message