You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by Ross Gardler <rg...@apache.org> on 2005/08/10 12:28:15 UTC

Re: svn commit: r231209 - in /forrest/trunk: main/targets/plugins.xml main/targets/seed.xml site-author/content/xdocs/docs_0_80/your-project.xml site-author/status.xml

rgardler@apache.org wrote:
> Author: rgardler
> Date: Wed Aug 10 03:24:42 2005
> New Revision: 231209
> 
> URL: http://svn.apache.org/viewcvs?rev=231209&view=rev
> Log:
> use the standard naming for the seed-business site (was seedBusiness)
> 
> Modified:
>     forrest/trunk/main/targets/plugins.xml

Ooops, that should not be committed yet, I should read my diffs more 
carefully before committing. I'll revert now.

Ross


> 
> Modified: forrest/trunk/main/targets/plugins.xml
> URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?rev=231209&r1=231208&r2=231209&view=diff
> ==============================================================================
> --- forrest/trunk/main/targets/plugins.xml (original)
> +++ forrest/trunk/main/targets/plugins.xml Wed Aug 10 03:24:42 2005
> @@ -263,6 +263,7 @@
>      </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>
> @@ -377,20 +378,33 @@
>    </target>
>    
>    <target name="configure-cocoon" unless="plugin.unavailable">
> -    <!--  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>
> -	
> +    <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>
>    </target>
>    
>  </project>