forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r231210 - /forrest/trunk/main/targets/plugins.xml
Date Wed, 10 Aug 2005 10:31:29 GMT
Author: rgardler
Date: Wed Aug 10 03:31:21 2005
New Revision: 231210

URL: http://svn.apache.org/viewcvs?rev=231210&view=rev
Log:
reverting previous commit that slipped through as part of an unrelated commit - this is still
a work in progress

Modified:
    forrest/trunk/main/targets/plugins.xml

Modified: forrest/trunk/main/targets/plugins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?rev=231210&r1=231209&r2=231210&view=diff
==============================================================================
--- forrest/trunk/main/targets/plugins.xml (original)
+++ forrest/trunk/main/targets/plugins.xml Wed Aug 10 03:31:21 2005
@@ -263,7 +263,6 @@
     </delete>
   
     <var name="plugin-counter" value="1"/>
-    <echo>Using Plugins Descriptors: ${forrest.plugins.descriptors}</echo>
     <for list="${forrest.plugins.descriptors}" param="url">
       <sequential>
         <echo>Fetching plugins descriptor: @{url}</echo>
@@ -378,33 +377,20 @@
   </target>
   
   <target name="configure-cocoon" unless="plugin.unavailable">
-    <if>
-      <available file="${forrest.plugins-dir}/${plugin.name}/conf" type="dir"/>
-      <then>
-        <!--  set up the xconf files -->
-        <copy todir="${project.build-dir}/conf"
-          failonerror="false">
-          <fileset dir="${forrest.plugins-dir}/${plugin.name}/conf"/>
-        </copy>
-        
-        <for param="xconf-name">
-         <fileset dir="${project.build-dir}/conf">
-           <filename name="*.xconf"/>
-         </fileset>
-         <sequential>
-           <echo>Adding @{xconf-name} to plugins.xconf</echo>
-           <xslt in="${project.build-dir}/plugins.xconf"
-             out="${project.build-dir}/plugins.xconf.new"
-             style="${forrest.core}/var/pluginXConfSnippet.xsl"
-             force="true"> 
-                 <param name="xconf-name" expression="@{xconf-name}"/>  
-           </xslt>
-           <move file="${project.build-dir}/plugins.xconf.new" 
-             tofile="${project.build-dir}/plugins.xconf"/>
-         </sequential>
-        </for>
-      </then>
-    </if>
+    <!--  set up the xconf files -->
+    <copy todir="${project.build-dir}"
+		  failonerror="false">
+      <fileset dir="${forrest.plugins-dir}/${plugin.name}/conf">
+        <exclude name="*.xconf"/>
+      </fileset>
+    </copy>
+
+    <xpatch file="${project.build-dir}/plugins.xconf" 
+      srcdir="${forrest.plugins-dir}/${plugin.name}"
+      addcomments="true">
+      <include name="conf/*.xconf"/>
+    </xpatch>
+	
   </target>
   
 </project>



Mime
View raw message