You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/06/08 22:23:05 UTC

svn commit: r189630 - in /forrest/trunk/plugins: build.xml pluginTemplate/build.xml plugins.xml

Author: rgardler
Date: Wed Jun  8 13:23:04 2005
New Revision: 189630

URL: http://svn.apache.org/viewcvs?rev=189630&view=rev
Log:
add a little more interactivity to the seeding of a new plugin, add some additional properties to the plugin build file, revert last change of property name in main build file

Modified:
    forrest/trunk/plugins/build.xml
    forrest/trunk/plugins/pluginTemplate/build.xml
    forrest/trunk/plugins/plugins.xml

Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?rev=189630&r1=189629&r2=189630&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Wed Jun  8 13:23:04 2005
@@ -17,10 +17,10 @@
 -->
 <project default="local-deploy" basedir="." name="Forrest_Plugins_build_file">
   <property environment="env"/>
-  <!-- The version of Forrest under which docs should be published -->
+  <!-- The minimum version of Forrest a plugin is known to work -->
   <!-- This should be overridden in the plugin build file when necessary
        i.e. when the plugin is being developed for a different Forrest version -->
-  <property name="forrest.docs.version"					      value="0.7"/>
+  <property name="forrest.version"					          value="0.7"/>
   <property name="forrest.home"                       location="${env.FORREST_HOME}"/>   
   <property name="forrest.core"                       location="${env.FORREST_HOME}/main" />  
   <property name="forrest.ant.lib.dir"                location="${forrest.home}/tools/ant/lib"/>  
@@ -42,7 +42,7 @@
   <property name="deploy.svn.user"            value=""/>
   <property name="deploy.svn.password"        value=""/>
   <property name="deploy.plugins.svn.url"     value="https://svn.apache.org/repos/asf/forrest/site/plugins"/>
-  <property name="deploy.plugin.docs.svn.url" value="https://svn.apache.org/repos/asf/forrest/site/${forrest.docs.version}/docs/plugins"/>
+  <property name="deploy.plugin.docs.svn.url" value="https://svn.apache.org/repos/asf/forrest/site/${forrest.version}/docs/plugins"/>
   <property name="deploy.plugins.svn-dir"     location="${forrest.build.dir}/svn-plugins-deploy"/>
   <property name="deploy.docs.svn-dir"        location="${forrest.build.dir}/svn-plugin-docs-deploy"/>
   <property name="deploy.plugins.svn-filestoadd"  location="build/svn-plugin.deploy.toadd"/>
@@ -238,7 +238,7 @@
   </target>
           
   <target name="deploy"
-          description="Deploy the plugin to SVN"
+          description="Deploy the plugin to the website SVN"
           depends="clean, deploy-plugins.xml, deploy-docs, dist, checkout-deployed-plugins">
     <echo>Deploying ${plugin-name} to the web server</echo>
 	
@@ -320,6 +320,12 @@
   <target name="seedPlugin"
     description="Create a new plugin directory in the current working directory and seed it with initial set of files"
     depends="init">
+    
+    <input message="Provide a brief description of what the plugin does"
+           addproperty="plugin-desc"/>
+    <input message="What type of plugin do you wish to create? "
+           validargs="input,output,internal"
+           addproperty="plugin-type"/>
     <mkdir dir="${plugin-name}"/>
     <mkdir dir="${plugin-name}/${plugin.src.dir}"/>
     <mkdir dir="${plugin-name}/${plugin.resources.dir}"/>
@@ -328,15 +334,16 @@
           filtering="true">
       <fileset dir="${forrest.plugins.template.dir}"/>
       <filterset>
+        <filter token="forrest-version" value="${forrest.version}"/>
         <filter token="plugin-name" value="${plugin-name}"/>
+        <filter token="plugin-type" value="${plugin-type}"/>
+        <filter token="plugin-desc" value="${plugin-desc}"/>
       </filterset>
     </copy>
     
-    <input message="What type of plugin do you wish to create? "
-           validargs="input,output,internal"
-           addproperty="plugin-type"/>
     <move file="${plugin-name}/sitemap.xmap"
           tofile="${plugin-name}/${plugin-type}.xmap"/>
+          
   </target>
   
   <!-- =================================================================== -->

Modified: forrest/trunk/plugins/pluginTemplate/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/pluginTemplate/build.xml?rev=189630&r1=189629&r2=189630&view=diff
==============================================================================
--- forrest/trunk/plugins/pluginTemplate/build.xml (original)
+++ forrest/trunk/plugins/pluginTemplate/build.xml Wed Jun  8 13:23:04 2005
@@ -16,9 +16,15 @@
   limitations under the License.
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
-
+  <property name="forrest.version" value="@forrest-version@"/>
+  <property name="type" value="@plugin-type@"/>
   <property name="plugin-name" value="@plugin-name@"/>
-
+  <property name="descritpion" value="@plugin-desc@"/>
+  <property name="author" value="Apache Forrest Project"/>
+  <property name="websiteURL" value="http://forrest.apache.org/docs/plugins/@plugin-name@"/>
+  <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
+  <property name="version" value="0.1-dev"/>
+  
   <import file="../build.xml"/>
 
   <!-- Add any additional installation work here in the build target, for example:

Modified: forrest/trunk/plugins/plugins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/plugins.xml?rev=189630&r1=189629&r2=189630&view=diff
==============================================================================
--- forrest/trunk/plugins/plugins.xml (original)
+++ forrest/trunk/plugins/plugins.xml Wed Jun  8 13:23:04 2005
@@ -138,7 +138,7 @@
   <plugin name="org.apache.forrest.plugin.input.simplified-docbook"
         type="input"
         author="Apache Forrest Project"
-        website="http://forrest.apache.org/docs/plugins/simplified-docbook"
+        website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.simplified-docbook"
         url="http://forrest.apache.org/plugins/"
         version="0.1">
     <description>