forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject 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
Date Wed, 10 Aug 2005 10:24:56 GMT
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
    forrest/trunk/main/targets/seed.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml
    forrest/trunk/site-author/status.xml

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>

Modified: forrest/trunk/main/targets/seed.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/seed.xml?rev=231209&r1=231208&r2=231209&view=diff
==============================================================================
--- forrest/trunk/main/targets/seed.xml (original)
+++ forrest/trunk/main/targets/seed.xml Wed Aug 10 03:24:42 2005
@@ -77,7 +77,7 @@
     <antcall target="-copyTemplate"/>
   </target>
   
-  <target name="seedBusiness"  depends="ensure-nocontent, getProperties"
+  <target name="seed-business"  depends="ensure-nocontent, getProperties"
     description="A typical business site">
     <antcall target="-copyTemplate"/>
   </target>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml?rev=231209&r1=231208&r2=231209&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml Wed Aug 10 03:24:42
2005
@@ -154,13 +154,13 @@
         To try this out, create a completely new directory (outside the
         Forrest distribution), then change directory
         to it, and do 'forrest seed'. This will give you a new site with lots 
-        of demonstration documents. You can also do "forrest seedBusiness", this
+        of demonstration documents. You can also do "forrest seed-business", this
         will ask you a number of questions about the site and will create a 
         smaller site without all the demonstration pages of the standard seed site.
       </p>
       
       <note><code>forrest seed</code> is useful to see what is possible
within Forrest,
-      but if you are creating a real site <code>forrest seedBusiness</code> has
less
+      but if you are creating a real site <code>forrest seed-business</code>
has less
       content initially, and is therefore easier to edit (even if it is not a business
       site). We hope to include more seed sites in the future.</note>
       

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=231209&r1=231208&r2=231209&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Wed Aug 10 03:24:42 2005
@@ -57,7 +57,7 @@
     <release version="0.8-dev" date="not yet released">
       <notes>
         <section>
-        <title>Apache Forrest is pleased to release the new version: apache-forrest-0.7</title>
+        <title>Apache Forrest is pleased to release the new version: apache-forrest-0.8-dev</title>
         
         <p>It can be downloaded from one of the <link href="http://forrest.apache.org/mirrors.cgi">Apache
         Software Foundation mirror sites</link>.</p>
@@ -155,7 +155,7 @@
       </action>      
       <action context="code" type="add" dev="RDG">
         New site seeding mechanism. You can now run "forrest seed" as before, or you can
run
-        "forrest seedBusiness". The later will ask a number of questions about the site
+        "forrest seed-business". The later will ask a number of questions about the site
         being seeded (business name, description etc.) and will create a very simple site
         designed for business. To quickly see the results, i.e. avoid
         answering the questions, do "forrest seedTestBusiness". More seed sites will be added



Mime
View raw message