forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r529802 - in /forrest/branches/forrest_08_branch: ./ admin/ etc/ main/fresh-site/src/documentation/content/xdocs/ main/java/org/apache/forrest/conf/ main/webapp/resources/stylesheets/ plugins/ site-author/ site-author/content/xdocs/docs_0_8...
Date Tue, 17 Apr 2007 23:32:59 GMT
Author: crossley
Date: Tue Apr 17 16:32:54 2007
New Revision: 529802

URL: http://svn.apache.org/viewvc?view=rev&rev=529802
Log:
Merge changes until RC2 from trunk to release branch using 527171:528912

Added:
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/xdocs/images/favicon.ico
      - copied unchanged from r528912, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/xdocs/images/favicon.ico
Modified:
    forrest/branches/forrest_08_branch/admin/announcement-0.8.txt
    forrest/branches/forrest_08_branch/etc/RELEASE-NOTES-0.8.txt
    forrest/branches/forrest_08_branch/index.html
    forrest/branches/forrest_08_branch/main/fresh-site/src/documentation/content/xdocs/tabs.xml
    forrest/branches/forrest_08_branch/main/java/org/apache/forrest/conf/ForrestConfModule.java
    forrest/branches/forrest_08_branch/main/webapp/resources/stylesheets/plugins-to-xdoc.xsl
    forrest/branches/forrest_08_branch/plugins/build.xml
    forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/build.xml
    forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/upgrading_08.xml
    forrest/branches/forrest_08_branch/site-author/status.xml
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.citations/src/documentation/skinconf.xml
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/forrest.properties
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/doap-to-document.xsl
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/xdocs/index.xml
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/resources/themes/pelt.fv
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/skinconf.xml
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/skinconf.xml
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv
    forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/skinconf.xml

Modified: forrest/branches/forrest_08_branch/admin/announcement-0.8.txt
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/admin/announcement-0.8.txt?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/admin/announcement-0.8.txt (original)
+++ forrest/branches/forrest_08_branch/admin/announcement-0.8.txt Tue Apr 17 16:32:54 2007
@@ -2,11 +2,8 @@
     announce@apache.org, announcements@xml.apache.org
 Subject: [Announce] Apache Forrest 0.8
 
-Note: This development version may differ from the final announcement.
-
-------------------------------------------------------------------------
-Apache Forrest is pleased to release the new version: apache-forrest-0.8
-http://forrest.apache.org/mirrors.cgi
+Apache Forrest is pleased to release the new version:
+apache-forrest-0.8 http://forrest.apache.org/mirrors.cgi
 
 Apache Forrest is a publishing framework that transforms
 input from various sources into a unified presentation
@@ -30,7 +27,24 @@
 possible to move source documents without breaking any existing
 user links.
 
+* Existing core plugins and sitemaps have been refactored to
+take advantage of locationmaps. Some core functionality has
+moved to plugins.
+
+* Prototype of new xml-based properties system. Projects and
+plugins can use a forrest.properties.xml file. At this stage,
+it supplements the existing forrest.properties file.
+
+* Some new documents to explain certain core aspects.
+Documentation menu navigation changed to provide clearer
+structure for Forrest project versioned product documentation
+grouped into howto and background sections. Better layout of
+the Developers tab into Getting Involved, Resources (mail lists,
+SVN, Issue Tracker) and Best Practices sections. See also the
+"linkmap" for an automated Table of Contents ability.
+ 
 Full list of changes: http://forrest.apache.org/docs/changes.html
+See also lists of changes in each plugin's documentation.
 
 Upgrade guide: http://forrest.apache.org/docs/upgrading_08.html
 

Modified: forrest/branches/forrest_08_branch/etc/RELEASE-NOTES-0.8.txt
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/etc/RELEASE-NOTES-0.8.txt?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/etc/RELEASE-NOTES-0.8.txt (original)
+++ forrest/branches/forrest_08_branch/etc/RELEASE-NOTES-0.8.txt Tue Apr 17 16:32:54 2007
@@ -119,6 +119,10 @@
       who were involved with addressing this issue. See the commit logs 
       associated with FOR-200. Committed by RDG. Thanks to Community. See 
       Issue FOR-200 [Link: http://issues.apache.org/jira/browse/FOR-200].
+    * [Icon: add] Prototype of new xml-based properties system. Projects and
+      plugins can use a forrest.properties.xml file. At this stage, it
+      supplements the existing forrest.properties file. See the projectInfo
+      plugin for an example of its use.
     * [Icon: add] Add notes about naming convention for locationmap 
       references. Gathered from a ForrestFriday IRC session (thanks to Tim 
       Williams for writing them up). See locationmap docs [Link: 

Modified: forrest/branches/forrest_08_branch/index.html
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/index.html?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/index.html (original)
+++ forrest/branches/forrest_08_branch/index.html Tue Apr 17 16:32:54 2007
@@ -98,8 +98,16 @@
       Refer to the online or SVN version for the up-to-date documentation.
     </p>
     <p>
+      Release notes are available at
+      <a href="etc/RELEASE-NOTES-0.8.txt">etc/RELEASE-NOTES-0.8.txt</a>
+    </p>
+    <p>
+      People upgrading from previous versions should see the
+      <a href="http://forrest.apache.org/docs/upgrading_08.html">Upgrading notes</a>.
+    </p>
+    <p>
       For further information please read the
-      <a href="http://localhost:8888/docs/your-project.html">Using Forrest</a>
+      <a href="http://forrest.apache.org/docs/your-project.html">Using Forrest</a>
       guide. If you have any questions or suggestions, please subscribe to the
       <a href="http://forrest.apache.org/mail-lists.html">Forrest mailing
       lists</a>.

Modified: forrest/branches/forrest_08_branch/main/fresh-site/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/main/fresh-site/src/documentation/content/xdocs/tabs.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/main/fresh-site/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/branches/forrest_08_branch/main/fresh-site/src/documentation/content/xdocs/tabs.xml Tue Apr 17 16:32:54 2007
@@ -39,7 +39,7 @@
     <tab label="Forrest" href="http://forrest.apache.org"/>
     <tab label="Xerces" href="http://xml.apache.org/xerces"/>
   </tab>
-  <tab id="plugins" label="Plugins" dir="pluginDocs/plugins_0_70" indexfile="index.html"/>
+  <tab id="plugins" label="Plugins" dir="pluginDocs/plugins_0_80" indexfile="index.html"/>
 <!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>

Modified: forrest/branches/forrest_08_branch/main/java/org/apache/forrest/conf/ForrestConfModule.java
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/main/java/org/apache/forrest/conf/ForrestConfModule.java?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/main/java/org/apache/forrest/conf/ForrestConfModule.java (original)
+++ forrest/branches/forrest_08_branch/main/java/org/apache/forrest/conf/ForrestConfModule.java Tue Apr 17 16:32:54 2007
@@ -143,6 +143,12 @@
         String forrestPropertiesStringURI;
 
         try {
+            // get forrest.properties and load the values
+            forrestPropertiesStringURI = projectHome
+                    + SystemUtils.FILE_SEPARATOR + "forrest.properties";
+            filteringProperties = loadAntPropertiesFromURI(filteringProperties,
+                    forrestPropertiesStringURI);
+            
             // get the values from local.forrest.properties.xml
             forrestPropertiesStringURI = projectHome
                     + SystemUtils.FILE_SEPARATOR
@@ -196,11 +202,6 @@
                             filteringProperties, forrestPropertiesStringURI);
                 }
             }
-            // get forrest.properties and load the values
-            forrestPropertiesStringURI = projectHome
-                    + SystemUtils.FILE_SEPARATOR + "forrest.properties";
-            filteringProperties = loadAntPropertiesFromURI(filteringProperties,
-                    forrestPropertiesStringURI);
 
             // get default-forrest.properties and load the values
             String defaultForrestPropertiesStringURI = contextHome

Modified: forrest/branches/forrest_08_branch/main/webapp/resources/stylesheets/plugins-to-xdoc.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/main/webapp/resources/stylesheets/plugins-to-xdoc.xsl?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/main/webapp/resources/stylesheets/plugins-to-xdoc.xsl (original)
+++ forrest/branches/forrest_08_branch/main/webapp/resources/stylesheets/plugins-to-xdoc.xsl Tue Apr 17 16:32:54 2007
@@ -56,7 +56,7 @@
             The second section lists plugins in the whiteboard, that is plugins
             that may change considerably in how they work before their first
             official release. These plugins may not be fully functional, in most
-            cases they are usable, but use them with caution as they are not
+            cases they are usable, but developers should use them with caution as they are not
             considered stable. You would need to keep up-to-date with the dev@
             mailing list.
           </p>
@@ -80,11 +80,11 @@
           <section>
             <title>Whiteboard Plugins</title>
             <warning>
-              See <a href="#introduction">introduction</a> for notes about
+              See <a href="#introduction">introduction</a> for warnings about
               plugins in development.
             </warning>
-            <div class="frame warning">
-              <div class="label">Warning</div>
+            <div class="frame note">
+              <div class="label">Note</div>
               <div class="content">Plugins in this section may not automatically
               deploy when you run Forrest as they are still in development.
               You may need to perform some manual installation steps to use 
@@ -215,6 +215,17 @@
             <xsl:value-of select="forrestVersion" />
           </td>
         </tr>
+        <xsl:if test="../@type='whiteboard'">
+          <tr>
+            <th width="25%">
+              Warning
+            </th>
+            <td>
+              This plugin is in the whiteboard development area.
+              See notes in the <a href="#introduction">introduction</a> above.
+            </td>
+          </tr>
+        </xsl:if>
       </table>
     </section>
   </xsl:template>

Modified: forrest/branches/forrest_08_branch/plugins/build.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/plugins/build.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/plugins/build.xml (original)
+++ forrest/branches/forrest_08_branch/plugins/build.xml Tue Apr 17 16:32:54 2007
@@ -17,24 +17,23 @@
 -->
 <project default="local-deploy" basedir="." name="Forrest_Plugins_build_file">
   <property environment="env"/>
-  <!-- The minimum version of Forrest a plugin is known to work -->
-  <!-- This should be overridden in the plugin build file when necessary
+<!-- 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.version" value="0.9"/>
-  <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.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.home}/plugins/pluginTemplate"/>	
+  <property name="forrest.plugins.template.dir"       location="${forrest.home}/plugins/pluginTemplate"/>
   <property name="forrest.plugins.localDeploy.dir"    location="${forrest.build.dir}/plugins"/>
   <property name="forrest.plugins.descriptor.file"    location="${forrest.plugins.dir}/plugins.xml"/>
-  
-  <!-- the plugin config (i.e. applies to current plugin) -->
+<!-- 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.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"/>
@@ -42,7 +41,6 @@
   <property name="plugin.docPath"             value="pluginDocs"/>
   <property name="plugin.downloadServer"      value="http://forrest.apache.org/plugins"/>
   <property name="plugin.downloadPath"        value="plugins"/>
-  
   <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"/>
@@ -53,57 +51,44 @@
   <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>
       <fileset dir="${forrest.ant.lib.dir}" includes="ant-contrib-*.jar" />
     </classpath>
   </taskdef>
-
   <taskdef resource="taskdef.properties">
     <classpath>
       <fileset dir="${forrest.ant.lib.dir}" includes="jsvn-0.9-dev.jar"/>
     </classpath>
   </taskdef>
-  
   <target name="init" depends="init-build-compiler, echo-init"/>
-
   <target name="init-build-compiler">
-
     <fail unless="plugin-name" message="You must run plugin build targets from within the plugin directory."/>
-
     <tstamp>
       <format property="YEAR" pattern="yyyy" locale="en"/>
     </tstamp>
-    
     <property name="build.compiler.emacs"       value="on"/>
     <property name="build.compiler.warnings"    value="true"/>
     <property name="build.compiler.pedantic"    value="false"/>
     <property name="build.compiler.depend"      value="true"/>
     <property name="build.compiler.fulldepend"  value="true"/>
-    <property name="build.compiler.debug"       value="on"/>    
+    <property name="build.compiler.debug"       value="on"/>
     <property name="build.compiler.optimize"    value="off"/>
     <property name="build.compiler.deprecation" value="on"/>
-    <property name="build.compiler.nowarn"      value="on"/>    
+    <property name="build.compiler.nowarn"      value="on"/>
     <property name="build.compiler.type"        value="classic"/>
     <property name="build.compiler.vm"          value="1.2"/>
-    
     <mkdir dir="${build.dir}"/>
-    
     <path id="classpath">
       <fileset dir="${forrest.home}/lib" includes="**/*.jar"/>
       <fileset dir="${plugin.lib.dir}" includes="*.jar"/>
       <fileset dir="${plugin.lib.dir}" includes="*.zip"/>
     </path>
-  	
     <available file="${plugin.java.dir}" property="java_exists" type="dir"/>
-    
   </target>
-  
   <target name="echo-init" depends="init-build-compiler" unless="no.echo.init">
     <buildnumber file="${build.dir}/build.number"/>
     <echo>
@@ -121,18 +106,14 @@
       --------------------------------------------------------------
     </echo>
   </target>
-  
   <target name="clean" depends="init">
     <delete dir="${forrest.plugins.localDeploy.dir}/${plugin-name}"/>
     <delete dir="${forrest.plugins.dist.dir}"/>
   </target>
-  
   <target name="local-deploy"
           description="Deploy a plugin locally"
           depends="init, jar">
-          
     <echo>Locally deploying ${plugin-name}</echo>
-    
     <copy toDir="${forrest.plugins.localDeploy.dir}/${plugin-name}">
       <fileset dir="${forrest.plugins.dir}/${plugin-name}">
         <exclude name="lib/**"/>
@@ -145,64 +126,55 @@
         <copy toFile="${forrest.plugins.localDeploy.dir}/lib/${plugin-name}.jar"
             file="${build.dir}/${plugin-name}.jar"
             failonerror="false"/>
-       </then>
-     </if>
-
-     <!-- add to the entity catalog -->
-     <copy file="${forrest.core}/var/initial_catalog.xcat"
+      </then>
+    </if>
+<!-- add to the entity catalog -->
+    <copy file="${forrest.core}/var/initial_catalog.xcat"
         tofile="${forrest.plugins.localDeploy.dir}/catalog.xcat"
         overwrite="false"/>
-     <if>
-       <available file="${forrest.plugins.localDeploy.dir}/${plugin-name}/resources/schema/catalog.xcat"/>
-       <then>
-         <xslt in="${forrest.plugins.localDeploy.dir}/catalog.xcat"
+    <if>
+      <available file="${forrest.plugins.localDeploy.dir}/${plugin-name}/resources/schema/catalog.xcat"/>
+      <then>
+        <xslt in="${forrest.plugins.localDeploy.dir}/catalog.xcat"
              out="${forrest.plugins.localDeploy.dir}/catalog.xcat.new"
              style="${forrest.core}/var/catalogMountSnippet.xsl"
              force="true">
-           <param name="plugin-catalog-path"
+          <param name="plugin-catalog-path"
              expression="${plugin-name}/resources/schema/catalog.xcat"/>
-         </xslt>
-         <move file="${forrest.plugins.localDeploy.dir}/catalog.xcat.new"
+        </xslt>
+        <move file="${forrest.plugins.localDeploy.dir}/catalog.xcat.new"
            tofile="${forrest.plugins.localDeploy.dir}/catalog.xcat"/>
-       </then>
-     </if>
-
+      </then>
+    </if>
     <if>
       <available file="lib"/>
       <then>
         <copy toDir="${forrest.plugins.localDeploy.dir}/lib" failonerror="false">
           <fileset dir="lib"/>
         </copy>
-       </then>
-     </if>
-
+      </then>
+    </if>
     <antcall target="build"/>
   </target>
-  
   <target name="build"
           description="Any local actions that need to be carried out by the plugin are done here"/>
-  
   <target name="deploy-plugins.xml"
           description="Deployes the plugins descriptor file (plugins.xml) to the website SVN repository"
           depends="checkout-deployed-plugins">
-  	
     <copy todir="${deploy.plugins.svn-dir}" 
           overwrite="true"
           file="${forrest.plugins.descriptor.file}"/>
-          
-    <!-- check in to SVN -->
+<!-- check in to SVN -->
     <svncommit
         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="clean, dist, docs, checkout-deployed-docs, deploy-plugins.xml">
     <echo>Deploying plugin documentation to the web server</echo>
-    
     <if>
       <contains string="${forrest.version}" substring="0.7"/>
       <then>
@@ -215,39 +187,37 @@
             <property name="docsVersion" value="0_80"/>
           </then>
           <else>
-            <!-- FIXME: the docs version number should be derived programmatically from the forrest.version in use 
+<!-- FIXME: the docs version number should be derived programmatically from the forrest.version in use 
                  (see http://issues.apache.org/jira/browse/FOR-535) -->
             <fail message="Trying to deploy plugin docs to an unknown version of Forrest. Please update the plugin's build file."/>
           </else>
         </if>
       </else>
-     </if>
-
-  	<!-- Copy plugin docs into sandbox -->
-  	<copy todir="${deploy.docs.sandbox.dir}/plugins_${docsVersion}/${plugin-name}" 
+    </if>
+<!-- Copy plugin docs into sandbox -->
+    <copy todir="${deploy.docs.sandbox.dir}/plugins_${docsVersion}/${plugin-name}" 
   	      overwrite="true">
-  		<fileset dir="${build.docs}"/>
-  	</copy>
-    <!-- Fix inconsitent line endings -->
+      <fileset dir="${build.docs}"/>
+    </copy>
+<!-- Fix inconsitent line endings -->
     <fixcrlf srcdir="${deploy.docs.sandbox.dir}/plugins_${docsVersion}/${plugin-name}" eol="unix">
       <include name="**/*.html"/>
       <include name="**/*.xml"/>
       <include name="**/*.css"/>
       <include name="**/*.js"/>
     </fixcrlf>
-  	
-    <!-- add new files to SVN -->
-    <!-- svnadd doesn't work (it doesn't change the working directory properly) -->
+<!-- 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
+<!-- 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
+<!-- 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
     -->
@@ -256,48 +226,43 @@
       <arg value="--targets"/>
       <arg value="${deploy.docs.svn-filestoadd}"/>
     </exec>
-    <!-- check in to SVN -->
-  	<svncommit
+<!-- check in to SVN -->
+    <svncommit
         target="${deploy.docs.svn-dir}/plugins_${docsVersion}"
         repositoryurl="${deploy.plugins.svn.url}"
         commitmessage="Deployment of docs for ${plugin-name} plugin (deployed by 'deploy-docs' target of plugin build script)"
     />
   </target>
-          
   <target name="release"
           description="Release the versioned plugin to the website SVN to make it available for download"
           depends="clean, deploy-plugins.xml, deploy-docs, dist, checkout-deployed-plugins">
     <echo>Releasing versioned plugin ${plugin-name} to the download server</echo>
-	
-    <!-- Put versioned plugin in the ${forrest.version} directory -->
+<!-- Put versioned plugin in the ${forrest.version} directory -->
     <copy todir="${deploy.plugins.svn-dir}/${forrest.version}" 
           overwrite="true" 
           file="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"/>
-    
     <antcall target="updateSVN"/>
-    
-<echo>
+    <echo>
 You have just released a plugin. There are other tasks to complete. For example:
 - release emails
 - SVN tagging
 <!-- FIXME: these tasks can be automated in this build file -->
-</echo>
+    </echo>
   </target>
-    
   <target name="updateSVN"
-          description="Update SVN with the files in the sandbox"> 
-    <!-- add new files to SVN -->
-    <!-- svnadd doesn't work (it doesn't change the working directory properly) -->
+          description="Update SVN with the files in the sandbox">
+<!-- add new files to SVN -->
+<!-- svnadd doesn't work (it doesn't change the working directory properly) -->
     <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
+<!-- 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.plugins.svn-filestoadd}" token="?      " value=""/>
     <replace file="${deploy.plugins.svn-filestoadd}" token="M      " value=""/>
-    <!-- don't fail on error here because
+<!-- 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
     -->
@@ -306,30 +271,30 @@
       <arg value="--targets"/>
       <arg value="${deploy.plugins.svn-filestoadd}"/>
     </exec>
-    <!-- check in to SVN -->
+<!-- check in to SVN -->
     <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 unversioned plugin to the website SVN to make it available for download"
           depends="clean, deploy-plugins.xml, deploy-docs, dist, checkout-deployed-plugins">
     <echo>Deploying unversioned plugin ${plugin-name} to the download server</echo>
-
-    <!-- Put unversioned plugin in the top-level directory -->
+<!-- Put unversioned plugin in the ${forrest.version} directory -->
+    <copy tofile="${deploy.plugins.svn-dir}/${forrest.version}/${plugin-name}.zip" 
+            overwrite="true" 
+            file="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"/>
+<!-- Put unversioned plugin in the top-level directory -->
     <copy tofile="${deploy.plugins.svn-dir}/${plugin-name}.zip" 
           overwrite="true" 
           file="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"/>
-
     <antcall target="updateSVN"/>
   </target>
-	   
   <target name="checkout-deployed-docs" 
-	      description="Retrieve the currently deployed plugin files">  
-	  <!-- get current plugins directory from SVN -->
+	      description="Retrieve the currently deployed plugin files">
+<!-- get current plugins directory from SVN -->
     <svncheckout
         repositoryurl="${deploy.plugin.docs.svn.url}"
         username="${deploy.svn.user}"
@@ -338,10 +303,9 @@
         failonerror="false"
     />
   </target>
-   
   <target name="checkout-deployed-plugins" 
-	      description="Retrieve the currently deployed plugin files">    
-	<!-- get current plugins directory from SVN -->
+	      description="Retrieve the currently deployed plugin files">
+<!-- get current plugins directory from SVN -->
     <svncheckout
         repositoryurl="${deploy.plugins.svn.url}"
         username="${deploy.svn.user}"
@@ -350,31 +314,31 @@
         failonerror="true"
     />
   </target>
-	
   <target name="docs" depends="local-deploy">
     <echo>Building Docs for ${plugin-name}</echo>
     <ant antfile="${forrest.core}/forrest.build.xml" target="site">
       <property name="project.home" value="${basedir}"/>
-    </ant>    
+    </ant>
   </target>
-  
   <target name="dist"
-          description="Build the distribution archive for all the plugins"
-          depends="init">
-    <mkdir dir="${forrest.plugins.dist.dir}/${forrest.version}"/>  
-    <zip destfile="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"
-       basedir="${forrest.plugins.dir}/${plugin-name}"
-       includes="**"
-       excludes="**/build/**"/>
+          description="Build the distribution archive for a plugin"
+          depends="jar">
+    <mkdir dir="${forrest.plugins.dist.dir}/${forrest.version}"/>
+    <zip destfile="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip">
+      <zipfileset dir="${forrest.plugins.dir}/${plugin-name}">
+        <include name="**"/>
+        <exclude name="**/build/**"/>
+      </zipfileset>
+      <zipfileset dir="${build.dir}" prefix="lib">
+        <include name="${plugin-name}.jar"/>
+      </zipfileset>
+    </zip>
   </target>
-  
   <target name="seedPlugin"
     description="Create a new plugin directory in the current working directory and seed it with initial set of files">
-    
     <input message="What is the name of the plugin you wish to create?"
            addproperty="plugin-name"/>
     <antcall target="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? "
@@ -398,15 +362,12 @@
         <filter token="plugin-downloadPath" value="${plugin.downloadPath}"/>
       </filterset>
     </copy>
-    
     <move file="${plugin-name}/sitemap.xmap"
           tofile="${plugin-name}/${plugin-type}.xmap"/>
-          
   </target>
-  
-  <!-- =================================================================== -->
-  <!-- Compile java classes                                         -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Compile java classes                                         -->
+<!-- =================================================================== -->
   <target name="compile" depends="init" if="java_exists">
     <mkdir dir="${build.classes}"/>
     <javac srcdir=   "${plugin.java.dir}"
@@ -415,19 +376,16 @@
       optimize=      "${build.compiler.optimize}"
       deprecation=   "${build.compiler.deprecation}"
       nowarn=        "${build.compiler.nowarn}"
-      classpathref=  "classpath">
-    </javac>
-  	
-  	<copy todir="${build.classes}">
-  		<fileset dir="${plugin.java.dir}">
-  			<exclude name="**/*.java"/>
-		</fileset>
-  	</copy>
+      classpathref=  "classpath"></javac>
+    <copy todir="${build.classes}">
+      <fileset dir="${plugin.java.dir}">
+        <exclude name="**/*.java"/>
+      </fileset>
+    </copy>
   </target>
-
-  <!-- =================================================================== -->
-  <!-- Jar Cocoon classes                                                  -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Jar Cocoon classes                                                  -->
+<!-- =================================================================== -->
   <target name="jar" depends="init, compile" if="java_exists">
     <jar destfile="${build.dir}/${plugin-name}.jar"
 	     basedir="${build.classes}">
@@ -435,15 +393,12 @@
         <section name="org/apache/forrest/">
           <attribute name="Comment" value="Support classes for Apache Forrest"/>
           <attribute name="Implementation-Title" value="org.apache.forrest"/>
-          <attribute name="Implementation-Version" value="${forrest.version} ${TODAY}"/> 
+          <attribute name="Implementation-Version" value="${forrest.version} ${TODAY}"/>
           <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
           <attribute name="Implementation-URL" value="http://forrest.apache.org/"/>
         </section>
       </manifest>
     </jar>
   </target>
-	
   <target name="test" depends="init, clean, docs"/>
 </project>
-  
-  

Modified: forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/build.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/build.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/build.xml (original)
+++ forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/build.xml Tue Apr 17 16:32:54 2007
@@ -24,7 +24,7 @@
     <section id="getting_from_source">
       <title>Getting the Forrest source</title>
       <section>
-        <title>Step-by-step Subversion (SVN) instructions</title>
+        <title>Step-by-step Subversion (SVN) instructions for developers</title>
         <note>
           If you are behind a proxy, see
           <link href="http://subversion.tigris.org/project_faq.html#proxy">this
@@ -54,6 +54,15 @@
           SVN is really powerful. See
           <link href="http://svnbook.red-bean.com/">Version Control with
           Subversion</link> - the opensource SVN book.
+        </p>
+      </section>
+      <section id="release">
+        <title>Sources are also available in the release</title>
+        <p>
+          Each release of forrest contains a copy of all sources as at the time
+          of the release. So the building instructions below do apply to that.
+          Of course the svn method described above will provide the most up-to-date
+          version for developers.
         </p>
       </section>
     </section>

Modified: forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/upgrading_08.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/upgrading_08.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/upgrading_08.xml (original)
+++ forrest/branches/forrest_08_branch/site-author/content/xdocs/docs_0_80/upgrading_08.xml Tue Apr 17 16:32:54 2007
@@ -74,9 +74,19 @@
         locationmap debugging in
         [FORREST_HOME]/main/webapp/WEB-INF/logkit.xconf, restart Forrest,
         request the broken pages and visit
-        [SITE_HOM]/build/webapp/logs/locationmap.xml). This issue will be fixed
+        [SITE_HOME]/build/webapp/logs/locationmap.xml). This issue will be fixed
         in the next version of Forrest.
       </warning>
+    </section>
+    <section id="config">
+      <title>Prototype xml-based properties system</title>
+      <p>
+        Prototype of new xml-based properties system.
+        Projects and plugins can use a forrest.properties.xml file.
+        At this stage, it supplements the existing forrest.properties file.
+        See the projectInfo plugin for an example of its use. Search the dev
+        mailing list for more information.
+      </p>
     </section>
     <section id="modules">
       <title>Forrest configuration simplification</title>

Modified: forrest/branches/forrest_08_branch/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/site-author/status.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/site-author/status.xml (original)
+++ forrest/branches/forrest_08_branch/site-author/status.xml Tue Apr 17 16:32:54 2007
@@ -618,6 +618,11 @@
         Thanks to the many people who were involved with addressing this issue.
         See the commit logs associated with FOR-200.
       </action>
+      <action context="code" type="add" dev="RDG" importance="high" fixes-bug="FOR-588">
+        Prototype of new xml-based properties system. Projects and plugins can use a
+        forrest.properties.xml file. At this stage, it supplements the existing
+        forrest.properties file. See the projectInfo plugin for an example of its use.
+      </action>
       <action context="code" type="add" dev="RDG" importance="high" fixes-bug="FOR-200" due-to="Community">
         Add notes about naming convention for locationmap references.
         Gathered from a ForrestFriday IRC session (thanks to Tim Williams for writing them up).

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.citations/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.citations/src/documentation/skinconf.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.citations/src/documentation/skinconf.xml (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.citations/src/documentation/skinconf.xml Tue Apr 17 16:32:54 2007
@@ -22,6 +22,6 @@
 <skinconfig>
   &skinconf-common;
 
-  <project-name>Plugin: org.apache.forrest.plugin.input.citations</project-name>
+  <project-name>Plugin: citations input</project-name>
   <project-description>org.apache.forrest.plugin.input.citations plugin for Apache Forrest</project-description>
 </skinconfig>

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/forrest.properties?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/forrest.properties (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/forrest.properties Tue Apr 17 16:32:54 2007
@@ -22,4 +22,4 @@
 
 # FIXME: FOR-785
 forrest.validate.skinconf=false
-project.required.plugins=org.apache.forrest.plugin.input.doap,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule
+project.required.plugins=org.apache.forrest.plugin.input.doap,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule,org.apache.forrest.plugin.output.pdf

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/doap-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/doap-to-document.xsl?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/doap-to-document.xsl (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/doap-to-document.xsl Tue Apr 17 16:32:54 2007
@@ -77,8 +77,7 @@
     <xsl:value-of select="."/></a>
   </xsl:template>
   <xsl:template match="doap:programming-language"><a>
-    <xsl:attribute name="href">
-      <xsl:value-of select="."/>_lang.html</xsl:attribute>
+    <xsl:attribute name="href">index/byLang/<xsl:value-of select="."/>.html</xsl:attribute>
     <xsl:value-of select="."/></a>
     <xsl:if test="not(position() = last())">
 <xsl:text>, </xsl:text>

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/xdocs/index.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/xdocs/index.xml (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/xdocs/index.xml Tue Apr 17 16:32:54 2007
@@ -67,7 +67,7 @@
         <p>
           You can use the projectInfo plugin to pull together project
           information for multiple projects. For example, take a look at the
-          project details for <a href="projectDetails.forrest.html">Apache
+          project details for <a href="projectDetails/forrest.html">Apache
           Forrest</a>.
         </p>
         <p>
@@ -77,7 +77,7 @@
         </p>
         <p>
           To retrieve the project details of another project make a request for
-          <code>projectDetails/projectDetails.[PROJECT_NAME].html</code>. For
+          <code>projectDetails/[PROJECT_NAME].html</code>. For
           this to work your project locationmap must have an entry like this:
         </p>
         <source>
@@ -128,7 +128,7 @@
       <section>
         <title>Dispatcher</title>
         <p>
-          The DOAP plugin provides dispatcher templates for oring with DOAP
+          The DOAP plugin provides dispatcher templates for working with DOAP
           files. For usage instructions see the docs for the
           <a href="/ls.contracts.org.apache.forrest.plugin.input.doap.html">doap
           templates</a>.
@@ -142,14 +142,15 @@
         The plugin is intended to be self documenting through these samples. If
         you require further help please ask on the user mailing list.
       </p>
+      
       <ul>
-        <li><fixme author="rdg">
-            Add a link to a sample here...
-          </fixme></li>
-        <li><fixme author="rdg">
-            Add another sample link here...
-          </fixme></li>
+        <li><a href="projectDetails/projectDetails.html">Descriptor page for this plugin</a></li>
+        <li><a href="projectDetails/forrest.html">Descriptor page for Forrest</a></li>
+        <li><a href="projectDetails/index/byLang.html">Index by language</a></li>
+        <li><a href="projectDetails/index/byLang/Java.html">Index by specific language (Java)</a></li>
+        <li><a href="projectDetails/index/byCategory.html">Index by category</a></li>
       </ul>
+      
       <note>
         The more samples included here the easier it is for users to understand
         this plugin. If you can provide additional samples please do so.

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/resources/themes/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/resources/themes/pelt.fv?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/resources/themes/pelt.fv (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/resources/themes/pelt.fv Tue Apr 17 16:32:54 2007
@@ -22,11 +22,11 @@
   <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
   <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
   <forrest:view type="fo" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.tiles.common-fo"/>
+    <jx:import uri="cocoon://prepare.panels.common-fo"/>
   </forrest:view>
 <!-- CSS View of the request e.g. index.dispatcher.css -->
   <forrest:view type="css" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.tiles.pelt-css"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-css"/>
   </forrest:view>
   <forrest:view type="html" hooksXpath="/html/body">
     <forrest:contract name="doap-embedded">
@@ -34,6 +34,6 @@
         <doap url="/projectDetails/source.xml"/>
       </forrest:property>
     </forrest:contract>
-    <jx:import uri="cocoon://prepare.tiles.pelt-html"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-html"/>
   </forrest:view>
 </forrest:views>

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/skinconf.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/skinconf.xml (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/skinconf.xml Tue Apr 17 16:32:54 2007
@@ -22,6 +22,6 @@
 <skinconfig>
   &skinconf-common;
 
-  <project-name>Plugin: org.apache.forrest.plugin.input.doap</project-name>
+  <project-name>Plugin: doap input</project-name>
   <project-description>org.apache.forrest.plugin.input.doap plugin for Apache Forrest</project-description>
 </skinconfig>

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/skinconf.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/skinconf.xml (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/skinconf.xml Tue Apr 17 16:32:54 2007
@@ -22,6 +22,6 @@
 <skinconfig>
   &skinconf-common;
 
-  <project-name>Plugin: org.apache.forrest.plugin.input.odt</project-name>
+  <project-name>Plugin: odt input</project-name>
   <project-description>org.apache.forrest.plugin.input.odt plugin for Apache Forrest</project-description>
 </skinconfig>

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml Tue Apr 17 16:32:54 2007
@@ -37,7 +37,7 @@
   <changes>
 <!-- Add new releases here -->
     <release version="0.1" date="unreleased">
-      <action context="code" dev="TS" fixes-bug="FOR-975" importance="high">
+      <action context="code" type="fix" dev="TS" fixes-bug="FOR-975" importance="high">
         FOR-975 Renaming tiles to panel.
       </action>
       <action context="code" type="add" dev="TS" fixes-bug="FOR-937" due-to="Sjur Moshagen">

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv Tue Apr 17 16:32:54 2007
@@ -23,15 +23,15 @@
     value="#{$cocoon/parameters/getRequestExtension}"/>
   <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
   <forrest:view type="fo" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.tiles.common-fo"/>
+    <jx:import uri="cocoon://prepare.panels.common-fo"/>
   </forrest:view>
 <!-- CSS View of the request e.g. index.dispatcher.css -->
   <forrest:view type="css" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.tiles.pelt-css"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-css"/>
   </forrest:view>
 <!-- HTML View of the request (e.g. index.html)-->
   <forrest:view type="html" hooksXpath="/html/body">
-    <jx:import uri="cocoon://prepare.tiles.solrbar"/>
-    <jx:import uri="cocoon://prepare.tiles.pelt-html"/>
+    <jx:import uri="cocoon://prepare.panels.solrbar"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-html"/>
   </forrest:view>
 </forrest:views>

Modified: forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/skinconf.xml?view=diff&rev=529802&r1=529801&r2=529802
==============================================================================
--- forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/skinconf.xml (original)
+++ forrest/branches/forrest_08_branch/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/skinconf.xml Tue Apr 17 16:32:54 2007
@@ -22,6 +22,6 @@
 <skinconfig>
   &skinconf-common;
 
-  <project-name>Plugin: org.apache.forrest.plugin.output.solr</project-name>
+  <project-name>Plugin: solr output</project-name>
   <project-description>org.apache.forrest.plugin.output.solr plugin for Apache Forrest</project-description>
 </skinconfig>



Mime
View raw message