forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r164079 - in /forrest/trunk: main/ main/fresh-site/ main/webapp/ main/webapp/WEB-INF/ main/webapp/resources/schema/ plugins/ plugins/org.apache.forrest.plugin.input.OpenOffice.org/ plugins/org.apache.forrest.plugin.input.PhotoGallery/ plugins/org.apache.forrest.plugin.input.dtdx/ plugins/org.apache.forrest.plugin.input.excel/ plugins/org.apache.forrest.plugin.input.feeder/ plugins/org.apache.forrest.plugin.input.listLocations/ plugins/org.apache.forrest.plugin.internal.IMSManifest/ plugins/org.apache.forrest.plugin.output.POD/ plugins/org.apache.forrest.plugin.output.Text/ plugins/org.apache.forrest.plugin.output.pdf/ plugins/org.apache.forrest.plugin.output.pdf/resources/ plugins/org.apache.forrest.plugin.output.pdf/src/ plugins/org.apache.forrest.plugin.output.pdf/src/documentation/ plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/ plugins/org.apache.forrest.plugin.pdf-output/ plugins/org.apache.forrest.plugin.projectInfo/ plugins/pluginTemplate/ plugins/simplified-docbook/ plugins/wiki/ site-author/ site-author/content/xdocs/docs/ whiteboard/plugins/org.apache.forrest.plugin.Chart/ whiteboard/plugins/org.apache.forrest.plugin.Database/ whiteboard/plugins/org.apache.forrest.plugin.OpenOffice.org-output/ whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/ whiteboard/plugins/org.apache.forrest.plugin.input.logs/ whiteboard/plugins/org.apache.forrest.plugin.internal.view/ whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/ whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/
Date Thu, 21 Apr 2005 16:20:56 GMT
Author: rgardler
Date: Thu Apr 21 09:20:54 2005
New Revision: 164079

URL: http://svn.apache.org/viewcvs?rev=164079&view=rev
Log:
rename pdf-output plugin to comply with new naming conventions for plugins

Added:
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/
      - copied from r162041, forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml
      - copied, changed from r164077, forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/forrest.properties
      - copied unchanged from r164077, forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
      - copied unchanged from r164077, forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/output.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/
      - copied from r164077, forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/resources/
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/
      - copied from r164077, forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/src/
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml
      - copied unchanged from r164077, forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/status.xml
Removed:
    forrest/trunk/main/webapp/WEB-INF/jtidy.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/
Modified:
    forrest/trunk/main/build.xml
    forrest/trunk/main/fresh-site/forrest.properties
    forrest/trunk/main/webapp/default-forrest.properties
    forrest/trunk/main/webapp/resources/schema/catalog.forrest
    forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat
    forrest/trunk/plugins/build.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.internal.IMSManifest/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.output.POD/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/site.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/skinconf.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/forrest.properties
    forrest/trunk/plugins/pluginTemplate/forrest.properties
    forrest/trunk/plugins/plugins.xml
    forrest/trunk/plugins/simplified-docbook/forrest.properties
    forrest/trunk/plugins/wiki/forrest.properties
    forrest/trunk/site-author/content/xdocs/docs/upgrading_07.xml
    forrest/trunk/site-author/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Chart/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.OpenOffice.org-output/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/forrest.properties

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/build.xml?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Thu Apr 21 09:20:54 2005
@@ -277,8 +277,8 @@
     <echo>=============================</echo>
     <echo>Testing using an ouptut plugin</echo>      
     <echo>=============================</echo>
-    <ant antfile="${forrest.home}/plugins/org.apache.forrest.plugin.pdf-output/build.xml" target="test">
-      <property name="basedir" location="${forrest.home}/plugins/org.apache.forrest.plugin.pdf-output"/>
+    <ant antfile="${forrest.home}/plugins/org.apache.forrest.plugin.output.pdf/build.xml" target="test">
+      <property name="basedir" location="${forrest.home}/plugins/org.apache.forrest.plugin.output.pdf"/>
     </ant>
     
     <echo>=============================</echo>

Modified: forrest/trunk/main/fresh-site/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties Thu Apr 21 09:20:54 2005
@@ -115,7 +115,7 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.output.pdf
 
 # Proxy configuration
 # proxy.host=

Modified: forrest/trunk/main/webapp/default-forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/default-forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties (original)
+++ forrest/trunk/main/webapp/default-forrest.properties Thu Apr 21 09:20:54 2005
@@ -147,7 +147,7 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.OpenOffice.org,simplified-docbook,wiki,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.OpenOffice.org,simplified-docbook,wiki,org.apache.forrest.plugin.output.pdf
 
 # Proxy configuration
 # proxy.host=

Modified: forrest/trunk/main/webapp/resources/schema/catalog.forrest
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources/schema/catalog.forrest?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/catalog.forrest (original)
+++ forrest/trunk/main/webapp/resources/schema/catalog.forrest Thu Apr 21 09:20:54 2005
@@ -41,8 +41,6 @@
        "dtd/changes-v13.dtd"
 PUBLIC "-//APACHE//DTD Todo V1.3//EN"
        "dtd/todo-v13.dtd"
-PUBLIC "-//APACHE//DTD How-to V1.3//EN"
-       "dtd/howto-v13.dtd"
 PUBLIC "-//APACHE//DTD Status V1.3//EN"
        "dtd/status-v13.dtd"
 PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
@@ -52,6 +50,20 @@
 PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"
        "dtd/tab-cocoon-v11.dtd"
 
+--- DTD's for the projectInfo Plugin ---
+PUBLIC "-//APACHE//DTD Changes V3.0//EN"
+       "dtd/projectInfo/changelog-v30.dtd"
+PUBLIC "-//APACHE//ENTITIES Changes V3.0//EN"
+       "dtd/projectInfo/changelog-v30.mod"
+PUBLIC "-//APACHE//DTD Status V2.0//EN"
+       "dtd/projectInfo/status-v20.dtd"
+PUBLIC "-//APACHE//ENTITIES Status V2.0//EN"
+       "dtd/projectInfo/status-v20.mod"
+PUBLIC "-//APACHE//DTD Tasks V1.0//EN"
+       "dtd/projectInfo/task-v10.dtd"
+PUBLIC "-//APACHE//ENTITIES Tasks Log V1.0//EN"
+       "dtd/projectInfo/task-v10.mod"
+       
 -- New unfinished DTDs --
 PUBLIC "-//APACHE//DTD Skin Configuration V0.6-3//EN"
         "dtd/skinconfig-v06-3.dtd"

Modified: forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat (original)
+++ forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat Thu Apr 21 09:20:54 2005
@@ -43,6 +43,8 @@
         uri="dtd/todo-v13.dtd"/>
 <public publicId="-//APACHE//DTD How-to V1.3//EN"
         uri="dtd/howto-v13.dtd"/>
+<public publicId="-//APACHE//DTD Status V2.0//EN"
+        uri="dtd/status-v20.dtd"/>
 <public publicId="-//APACHE//DTD Status V1.3//EN"
         uri="dtd/status-v13.dtd"/>
 <public publicId="-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
@@ -52,6 +54,16 @@
 <public publicId="-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"
         uri="dtd/tab-cocoon-v11.dtd"/>
 
+<!-- DTD's for the projectInfo Plugin -->
+<public publicId="-//APACHE//DTD Status V2.0//EN"
+        uri="dtd/projectInfo/status-v20.dtd"/>
+<public publicId="-//APACHE//ENTITIES Status V2.0//EN"
+        uri="dtd/projectInfo/status-v20.mod"/>
+<public publicId="-//APACHE//DTD Developers V1.0//EN"
+        uri="dtd/projectInfo/developers-v10.dtd"/>
+<public publicId="-//APACHE//ENTITIES Developers V1.0//EN"
+        uri="dtd/projectInfo/developers-v10.mod"/>
+        
 <!-- New unfinished DTDs -->
 <public publicId="-//APACHE//DTD Skin Configuration V0.6-3//EN"
         uri="dtd/skinconfig-v06-3.dtd"/>
@@ -67,6 +79,10 @@
         uri="dtd/todo-v20.mod"/>
 <public publicId="-//APACHE//ENTITIES Status V1.3//EN"
         uri="dtd/status-v13.mod"/>
+<public publicId="-//APACHE//ENTITIES Status V2.0//EN"
+        uri="dtd/status-v20.mod"/>
+<public publicId="-//APACHE//ENTITIES Developer V1.0//EN"
+        uri="dtd/developer-v10.mod"/>
 <public publicId="-//APACHE//ENTITIES Documentation V1.3//EN"
         uri="dtd/document-v13.mod"/>
 <public publicId="-//APACHE//ENTITIES Documentation V1.2//EN"

Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Thu Apr 21 09:20:54 2005
@@ -17,30 +17,38 @@
 -->
 <project default="local-deploy" basedir="." name="Forrest_Plugins_build_file">
   <property environment="env"/>
-  <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"/>  
-  <property name="forrest.build.dir"          location="${forrest.home}/build"/>
-  <property name="forrest.plugins.dir"        location="${forrest.home}/plugins"/>
-  
-  <property name="plugins.dir"                location="${ant.file.Forrest_Plugins_build_file}/.."/>
-  <property name="plugins.dist-dir"           location="build/dist"/>
-  <property name="plugins.localDeploy-dir"    location="${forrest.build.dir}/plugins"/>
+  <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"/>  
+  <property name="forrest.build.dir"                  location="${forrest.home}/build"/>
+  <property name="forrest.plugins.dir"                location="${forrest.home}/plugins"/>  
+  <property name="forrest.plugins.build.dir"          location="${forrest.home}/plugins/build"/>
+  <property name="forrest.plugins.dist.dir"           location="${forrest.plugins.build.dir}/dist"/>
+  <property name="forrest.plugins.template.dir"       location="${forrest.plugins.dir}/pluginTemplate"/>	
+  <property name="forrest.plugins.localDeploy.dir"    location="${forrest.build.dir}/plugins"/>
   
+  <!-- the plugin config (i.e. applies to current plugin) -->
   <property name="plugin.src.dir"             value="src"/>
+  <property name="plugin.java.dir"            value="${plugin.src.dir}/java"/>	
+  <property name="plugin.lib.dir"             value="lib"/>
   <property name="plugin.resources.dir"       value="resources"/>
   <property name="plugin.stylesheets.dir"     value="${plugin.resources.dir}/stylesheets"/>
   
-  <property name="plugin.template.dir"        value="pluginTemplate"/>
-  
   <property name="deploy.svn.user"            value=""/>
   <property name="deploy.svn.password"        value=""/>
-  <property name="deploy.svn.url"             value="https://svn.apache.org/repos/asf/forrest/site/plugins"/>
-  <property name="deploy.svn.svn-dir"         location="${forrest.build.dir}/svn-plugins-deploy"/>
-  <property name="deploy.svn.svn-filestoadd"  location="build/svn-deploy.toadd"/>
+  <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.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"/>
+  <property name="deploy.docs.svn-filestoadd"  location="build/svn-docs.deploy.toadd"/>
+  <property name="deploy.plugins.sandbox.dir" location="${deploy.plugins.svn-dir}"/>
+  <property name="deploy.docs.sandbox.dir"    location="${deploy.docs.svn-dir}"/>
   
   <property name="build.dir"                  location="build"/>
   <property name="build.classes"              location="${build.dir}/classes"/>
+  <property name="build.docs"                 location="${build.dir}/site"/>
     
   <taskdef resource="net/sf/antcontrib/antcontrib.properties">
     <classpath>
@@ -94,17 +102,17 @@
     
     <path id="classpath">
       <fileset dir="${forrest.home}/lib" includes="**/*.jar"/>
-      <fileset dir="lib" includes="*.jar"/>
-      <fileset dir="lib" includes="*.zip"/>
+      <fileset dir="${plugin.lib.dir}" includes="*.jar"/>
+      <fileset dir="${plugin.lib.dir}" includes="*.zip"/>
     </path>
   	
-    <available file="${java.dir}" property="java_exists" type="dir"/>
+    <available file="${plugin.java.dir}" property="java_exists" type="dir"/>
     
   </target>
   
   <target name="clean" depends="init">
-    <delete dir="${plugins.localDeploy-dir}/${plugin-name}"/>
-    <delete dir="${plugins.dist-dir}"/>
+    <delete dir="${forrest.plugins.localDeploy.dir}/${plugin-name}"/>
+    <delete dir="${forrest.plugins.dist.dir}"/>
   </target>
   
   
@@ -115,14 +123,19 @@
           
     <echo>Locally deploying ${plugin-name}</echo>
     
-    <copy toDir="${plugins.localDeploy-dir}/${plugin-name}">
-      <fileset dir="${plugins.dir}/${plugin-name}">
+    <copy toDir="${forrest.plugins.localDeploy.dir}/${plugin-name}">
+      <fileset dir="${forrest.plugins.dir}/${plugin-name}">
+        <exclude name="lib/**"/>
         <exclude name="build/**"/>
       </fileset>
     </copy>
-  	<copy toFile="${plugins.localDeploy-dir}/lib/${plugin-name}.jar"
+  	<copy toFile="${forrest.plugins.localDeploy.dir}/lib/${plugin-name}.jar"
   	      file="${build.dir}/${plugin-name}.jar"
   	      failonerror="false"/>
+  	<copy toDir="${forrest.plugins.localDeploy.dir}/lib"
+      failonerror="false">
+  	    <fileset dir="lib"/>
+    </copy>
     <antcall target="build"/>
   </target>
   
@@ -131,64 +144,132 @@
   
   <target name="deploy-plugins.xml"
           description="Deployes the plugins descriptor file (plugins.xml) to the website SVN repository"
-          depends="checkout-deployed">
-    <copy todir="${deploy.svn.svn-dir}" 
+          depends="checkout-deployed-plugins">
+  	
+    <copy todir="${deploy.plugins.svn-dir}" 
           overwrite="true"
           file="${forrest.plugins.dir}/plugins.xml"/>
+  	
     <!-- check in to SVN -->
+  	<!--
+  	=====================================
+  	========== FIXME ====================
+  	=====================================
     <svncommit
-        target="${deploy.svn.svn-dir}"
-        repositoryurl="${deploy.svn.url}"
+        target="${deploy.plugins.svn-dir}"
+        repositoryurl="${deploy.plugins.svn.url}"
         commitmessage="Deployment plugins descriptor file (plugins.xml) (deployed by 'deploy-plugins.xml' target of plugin build script)"
     />
+    -->
+  </target>
+	
+  <target name="deploy-docs"
+		  description="Deploy the plugin documentation"
+		  depends="dist, docs, checkout-deployed-docs, deploy-plugins.xml">
+    <echo>Deploying plugin documentation to the web server</echo>
+
+  	<!-- Copy plugin docs into sandbox -->
+  	<copy todir="${deploy.docs.sandbox.dir}/${plugin-name}" 
+  	      overwrite="true">
+  		<fileset dir="${build.docs}"/>
+  	</copy>
+  	
+    <!-- add new files to SVN -->
+    <!-- svnadd doesn't work (it doesn't change the working directory properly) -->
+    <exec executable="svn" dir="${deploy.docs.svn-dir}" output="${deploy.docs.svn-filestoadd}" failonerror="true">
+      <arg value="status"/>
+    </exec>
+    <!-- the status columns make all lines invalid filenames
+      we remove the status columns for the new files so the only valid
+      filenames in the list are new files
+    -->
+    <replace file="${deploy.docs.svn-filestoadd}" token="?      " value=""/>
+    <replace file="${deploy.docs.svn-filestoadd}" token="M      " value=""/>
+    <!-- don't fail on error here because
+      1) the targets file might have 'bad' filenames but we should continue
+      2) we would've already failed if the svn executable wasn't found
+    -->
+    <exec executable="svn" dir="${deploy.plugins.svn-dir}">
+      <arg value="add"/>
+      <arg value="--targets"/>
+      <arg value="${deploy.plugins.svn-filestoadd}"/>
+    </exec>
+    <!-- check in to SVN -->
+  	<!--
+  	=====================================
+  	========== FIXME ====================
+  	=====================================
+    <svncommit
+        target="${deploy.plugins.svn-dir}"
+        repositoryurl="${deploy.plugins.svn.url}"
+        commitmessage="Deployment of ${plugin-name} plugin (deployed by 'deploy' target of plugin build script)"
+    />
+    -->
   </target>
           
   <target name="deploy"
           description="Deploy the plugin to SVN"
-          depends="dist, checkout-deployed, deploy-plugins.xml">
+          depends="clean, deploy-plugins.xml, deploy-docs, dist, checkout-deployed-plugins">
     <echo>Deploying ${plugin-name} to the web server</echo>
-  	    
-    <!-- copy new files into sandbox -->
-    <copy todir="${deploy.svn.svn-dir}" 
+	
+    <!-- copy new plugin files into sandbox -->
+    <copy todir="${deploy.plugins.svn-dir}" 
           overwrite="true" 
-          file="${plugins.dist-dir}/${plugin-name}.zip"/>
+          file="${forrest.plugins.dist.dir}/${plugin-name}.zip"/>
      
     <!-- add new files to SVN -->
     <!-- svnadd doesn't work (it doesn't change the working directory properly) -->
-    <exec executable="svn" dir="${deploy.svn.svn-dir}" output="${deploy.svn.svn-filestoadd}" failonerror="true">
+    <exec executable="svn" dir="${deploy.plugins.svn-dir}" output="${deploy.plugins.svn-filestoadd}" failonerror="true">
       <arg value="status"/>
     </exec>
     <!-- the status columns make all lines invalid filenames
       we remove the status columns for the new files so the only valid
       filenames in the list are new files
     -->
-    <replace file="${deploy.svn.svn-filestoadd}" token="?      " value=""/>
-    <replace file="${deploy.svn.svn-filestoadd}" token="M      " value=""/>
+    <replace file="${deploy.plugins.svn-filestoadd}" token="?      " value=""/>
+    <replace file="${deploy.plugins.svn-filestoadd}" token="M      " value=""/>
     <!-- don't fail on error here because
       1) the targets file might have 'bad' filenames but we should continue
       2) we would've already failed if the svn executable wasn't found
     -->
-    <exec executable="svn" dir="${deploy.svn.svn-dir}">
+    <exec executable="svn" dir="${deploy.plugins.svn-dir}">
       <arg value="add"/>
       <arg value="--targets"/>
-      <arg value="${deploy.svn.svn-filestoadd}"/>
+      <arg value="${deploy.plugins.svn-filestoadd}"/>
     </exec>
     <!-- check in to SVN -->
+  	<!--
+  	=====================================
+  	========== FIXME ====================
+  	=====================================
     <svncommit
-        target="${deploy.svn.svn-dir}"
-        repositoryurl="${deploy.svn.url}"
+        target="${deploy.plugins.svn-dir}"
+        repositoryurl="${deploy.plugins.svn.url}"
         commitmessage="Deployment of ${plugin-name} plugin (deployed by 'deploy' target of plugin build script)"
     />
+    -->
+  </target>
+	   
+  <target name="checkout-deployed-docs" 
+	      description="Retrieve the currently deployed plugin files">    
+	<!-- get current plugins directory from SVN -->
+    <svncheckout
+        repositoryurl="${deploy.plugin.docs.svn.url}"
+        username="${deploy.svn.user}"
+        password="${deploy.svn.password}"
+        destination="${deploy.docs.svn-dir}"
+        failonerror="true"
+    />
   </target>
    
-  <target name="checkout-deployed" 
+  <target name="checkout-deployed-plugins" 
 	      description="Retrieve the currently deployed plugin files">    
 	<!-- get current plugins directory from SVN -->
     <svncheckout
-        repositoryurl="${deploy.svn.url}"
+        repositoryurl="${deploy.plugins.svn.url}"
         username="${deploy.svn.user}"
         password="${deploy.svn.password}"
-        destination="${deploy.svn.svn-dir}"
+        destination="${deploy.plugins.svn-dir}"
         failonerror="true"
     />
   </target>
@@ -200,13 +281,13 @@
     </ant>    
   </target>
   
-  <!-- FIXME: needs to append FOrrest version number to filename -->
+  <!-- FIXME: needs to append plugin version number to filename -->
   <target name="dist"
           description="Build the distribution archive for all the plugins"
-          depends="init, test, docs">
-    <mkdir dir="${plugins.dist-dir}"/>  
-    <zip destfile="${plugins.dist-dir}/${plugin-name}.zip"
-       basedir="${plugins.dir}/${plugin-name}"
+          depends="init">
+    <mkdir dir="${forrest.plugins.dist.dir}"/>  
+    <zip destfile="${forrest.plugins.dist.dir}/${plugin-name}.zip"
+       basedir="${forrest.plugins.dir}/${plugin-name}"
        includes="**"
        excludes="**/build/**"/>
   </target>
@@ -220,7 +301,7 @@
     <mkdir dir="${plugin-name}/${plugin.stylesheets.dir}"/>
     <copy todir="${plugin-name}"
           filtering="true">
-      <fileset dir="${plugin.template.dir}"/>
+      <fileset dir="${forrest.plugins.template.dir}"/>
       <filterset>
         <filter token="plugin-name" value="${plugin-name}"/>
       </filterset>
@@ -238,7 +319,7 @@
   <!-- =================================================================== -->
   <target name="compile" depends="init" if="java_exists">
     <mkdir dir="${build.classes}"/>
-    <javac srcdir=   "${java.dir}"
+    <javac srcdir=   "${plugin.java.dir}"
       destdir=       "${build.classes}"
       debug=         "${build.compiler.debug}"
       optimize=      "${build.compiler.optimize}"
@@ -248,7 +329,7 @@
     </javac>
   	
   	<copy todir="${build.classes}">
-  		<fileset dir="${java.dir}">
+  		<fileset dir="${plugin.java.dir}">
   			<exclude name="**/*.java"/>
 		</fileset>
   	</copy>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.OpenOffice.org,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.OpenOffice.org,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.PhotoGallery,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.PhotoGallery,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.input.dtdx,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.input.dtdx,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/forrest.properties Thu Apr 21 09:20:54 2005
@@ -105,4 +105,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.excel,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.excel,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/forrest.properties Thu Apr 21 09:20:54 2005
@@ -105,4 +105,4 @@
 #project.i18n=true
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.feeder,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.feeder,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.input.listLocations,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.input.listLocations,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.internal.IMSManifest/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.internal.IMSManifest/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.internal.IMSManifest/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.internal.IMSManifest/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.internal.IMSManifest,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.internal.IMSManifest,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.POD/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.output.POD/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.POD/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.POD/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.POD,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.POD,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.Text,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.Text,org.apache.forrest.plugin.output.pdf

Copied: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml (from r164077, forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml)
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml?p2=forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml&p1=forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml&r1=164077&r2=164079&rev=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.pdf-output/build.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml Thu Apr 21 09:20:54 2005
@@ -17,7 +17,7 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
 
-  <property name="plugin-name" value="org.apache.forrest.plugin.pdf-output"/>
+  <property name="plugin-name" value="org.apache.forrest.plugin.output.pdf"/>
 
   <import file="../build.xml"/>
   

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml?rev=164079&r1=164077&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml Thu Apr 21 09:20:54 2005
@@ -18,11 +18,11 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>Welcome to the org.apache.forrest.plugin.pdf-output Plugin</title> 
+    <title>Welcome to the org.apache.forrest.plugin.output.pdf Plugin</title> 
   </header> 
   <body> 
     <section>
-      <title>Apache Forrest - org.apache.forrest.plugin.pdf-output Plugin</title>
+      <title>Apache Forrest - org.apache.forrest.plugin.output.pdf Plugin</title>
       <p>This plugin enables any Forrest page to be output as a PDF document.</p>
       <p>To use it simply request a page with the <code>pdf</code> extension</p>
       <note>By default this plugin is included in a new Forrest project.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/site.xml?rev=164079&r1=164077&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/site.xml Thu Apr 21 09:20:54 2005
@@ -30,10 +30,10 @@
 See http://forrest.apache.org/docs/linking.html for more info
 -->
 
-<site label="org.apache.forrest.plugin.pdf-output" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
+<site label="org.apache.forrest.plugin.output.pdf" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
 
   <about label="About">
-    <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.pdf-output"/>
+    <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.output.pdf"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/skinconf.xml?rev=164079&r1=164077&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/skinconf.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/skinconf.xml Thu Apr 21 09:20:54 2005
@@ -30,7 +30,7 @@
     no search box. @domain will enable sitesearch for the specific domain with google.
     In other words google will search the @domain for the query string.
   -->
-  <search name="org.apache.forrest.plugin.pdf-output Plugin" domain="mydomain" provider="google"/>
+  <search name="org.apache.forrest.plugin.output.pdf Plugin" domain="mydomain" provider="google"/>
 
   <!-- Disable the print link? If enabled, invalid HTML 4.0.1 -->
   <disable-print-link>true</disable-print-link>  
@@ -67,8 +67,8 @@
   <!-- mandatory project logo
        default skin: renders it at the top -->
   <project-name>Plugin: PDF output</project-name>
-  <project-description>org.apache.forrest.plugin.pdf-output plugin for Apache Forrest</project-description>
-  <project-url>http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.pdf-output/</project-url>
+  <project-description>org.apache.forrest.plugin.output.pdf plugin for Apache Forrest</project-description>
+  <project-url>http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.pdf/</project-url>
   <project-logo>images/project.png</project-logo>
   <!-- Alternative static image:
   <project-logo>images/project-logo.gif</project-logo> -->
@@ -113,7 +113,7 @@
   <trail>
     <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
     <link2 name="Plugins" href="http://forrest.apache.org/docs/plugins/"/>
-    <link3 name="org.apache.forrest.plugin.pdf-output" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.pdf-output/"/>
+    <link3 name="org.apache.forrest.plugin.output.pdf" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.pdf/"/>
   </trail>
 
   <!-- Configure the TOC, i.e. the Table of Contents.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/pluginTemplate/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/pluginTemplate/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/pluginTemplate/forrest.properties (original)
+++ forrest/trunk/plugins/pluginTemplate/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=@plugin-name@,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=@plugin-name@,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/plugins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/plugins.xml?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/plugins.xml (original)
+++ forrest/trunk/plugins/plugins.xml Thu Apr 21 09:20:54 2005
@@ -200,10 +200,10 @@
     <forrestVersion>0.7</forrestVersion>
   </plugin>
 
-  <plugin name="org.apache.forrest.plugin.pdf-output"
+  <plugin name="org.apache.forrest.plugin.output.pdf"
         type="output"
         author="Apache Forrest Project"
-        website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.pdf-output"
+        website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.pdf"
         url="http://forrest.apache.org/plugins/"
         version="0.1">
     <description>

Modified: forrest/trunk/plugins/simplified-docbook/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/simplified-docbook/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/simplified-docbook/forrest.properties (original)
+++ forrest/trunk/plugins/simplified-docbook/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
-project.required.plugins=org.apache.forrest.plugin.projectInfo,simplified-docbook,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,simplified-docbook,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/plugins/wiki/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/wiki/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/plugins/wiki/forrest.properties (original)
+++ forrest/trunk/plugins/wiki/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.projectInfo,wiki,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,wiki,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/site-author/content/xdocs/docs/upgrading_07.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs/upgrading_07.xml?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs/upgrading_07.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs/upgrading_07.xml Thu Apr 21 09:20:54 2005
@@ -116,7 +116,7 @@
        and PDF output, then declare the following in forrest.properties
       </p>
       <source>
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf
       </source>
     </section>
 

Modified: forrest/trunk/site-author/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/site-author/forrest.properties (original)
+++ forrest/trunk/site-author/forrest.properties Thu Apr 21 09:20:54 2005
@@ -32,5 +32,5 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.pdf-output
-project.required.plugins=org.apache.forrest.plugin.dtdx-input,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output,org.apache.forrest.plugin.pod-output
+project.required.plugins=org.apache.forrest.plugin.output.pdf
+project.required.plugins=org.apache.forrest.plugin.dtdx-input,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.pod-output

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Chart/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Chart/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Chart/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Chart/forrest.properties Thu Apr 21 09:20:54 2005
@@ -105,4 +105,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.Chart,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.Chart,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/forrest.properties Thu Apr 21 09:20:54 2005
@@ -105,4 +105,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.Database,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.Database,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.OpenOffice.org-output/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.OpenOffice.org-output/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.OpenOffice.org-output/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.OpenOffice.org-output/forrest.properties Thu Apr 21 09:20:54 2005
@@ -105,4 +105,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.OpenOffice.org-output,org.apache.forrest.plugin.pdf-output,org.apache.forrest.plugin.XHTML-output
+project.required.plugins=org.apache.forrest.plugin.OpenOffice.org-output,org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.XHTML-output

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.input.Daisy,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.input.Daisy,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.logs,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.input.logs,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/forrest.properties Thu Apr 21 09:20:54 2005
@@ -107,4 +107,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.internal.view,org.apache.forrest.plugin.internal.viewHelper,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.internal.view,org.apache.forrest.plugin.internal.viewHelper,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.htmlArea,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.htmlArea,org.apache.forrest.plugin.output.pdf

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/forrest.properties?rev=164079&r1=164078&r2=164079&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/forrest.properties Thu Apr 21 09:20:54 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.output.viewHelper,org.apache.forrest.plugin.view,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugin.output.viewHelper,org.apache.forrest.plugin.view,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.output.pdf



Mime
View raw message