You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/06/16 15:37:45 UTC
svn commit: r190910 - in /forrest/trunk/plugins: build.xml plugins.xml
Author: rgardler
Date: Thu Jun 16 06:37:43 2005
New Revision: 190910
URL: http://svn.apache.org/viewcvs?rev=190910&view=rev
Log:
deploy docs to versioned space. Rename simplified-docbook to simplifiedDocbook
Modified:
forrest/trunk/plugins/build.xml
forrest/trunk/plugins/plugins.xml
Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?rev=190910&r1=190909&r2=190910&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Thu Jun 16 06:37:43 2005
@@ -42,7 +42,7 @@
<property name="deploy.svn.user" value=""/>
<property name="deploy.svn.password" value=""/>
<property name="deploy.plugins.svn.url" value="https://svn.apache.org/repos/asf/forrest/site/plugins"/>
- <property name="deploy.plugin.docs.svn.url" value="https://svn.apache.org/repos/asf/forrest/site/${forrest.version}/docs/plugins"/>
+ <property name="deploy.plugin.docs.svn.url" value="https://svn.apache.org/repos/asf/forrest/site/pluginDocs"/>
<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"/>
@@ -195,14 +195,34 @@
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>
+ <property name="docsVersion" value="0_70"/>
+ </then>
+ <else>
+ <if>
+ <contains string="${forrest.version}" substring="0.8"/>
+ <then>
+ <property name="docsVersion" value="0_80"/>
+ </then>
+ <else>
+ <!-- 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 unkown version of Forrest. Please update the plugins build file."/>
+ </else>
+ </if>
+ </else>
+ </if>
<!-- Copy plugin docs into sandbox -->
- <copy todir="${deploy.docs.sandbox.dir}/${plugin-name}"
+ <copy todir="${deploy.docs.sandbox.dir}/plugins_${docsVersion}/${plugin-name}"
overwrite="true">
<fileset dir="${build.docs}"/>
</copy>
<!-- Fix inconsitent line endings -->
- <fixcrlf srcdir="${deploy.docs.sandbox.dir}/${plugin-name}" eol="unix">
+ <fixcrlf srcdir="${deploy.docs.sandbox.dir}/plugins_${docsVersion}/${plugin-name}" eol="unix">
<include name="**/*.html"/>
<include name="**/*.xml"/>
<include name="**/*.css"/>
@@ -230,7 +250,7 @@
</exec>
<!-- check in to SVN -->
<svncommit
- target="${deploy.docs.svn-dir}"
+ 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)"
/>
@@ -281,14 +301,14 @@
</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}"
password="${deploy.svn.password}"
destination="${deploy.docs.svn-dir}"
- failonerror="true"
+ failonerror="false"
/>
</target>
Modified: forrest/trunk/plugins/plugins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/plugins.xml?rev=190910&r1=190909&r2=190910&view=diff
==============================================================================
--- forrest/trunk/plugins/plugins.xml (original)
+++ forrest/trunk/plugins/plugins.xml Thu Jun 16 06:37:43 2005
@@ -40,7 +40,7 @@
<plugin name="org.apache.forrest.plugin.input.dtdx"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.dtdx"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.dtdx"
url="http://forrest.apache.org/plugins/"
version="0.1">
<description>
@@ -53,7 +53,7 @@
<plugin name="org.apache.forrest.plugin.input.excel"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.excel/"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.excel/"
url="http://forrest.apache.org/plugins"
version="0.3-dev">
<description>
@@ -65,7 +65,7 @@
<plugin name="org.apache.forrest.plugin.input.feeder"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.feeder"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.feeder"
url="http://forrest.apache.org/plugins"
version="0.1">
<description>
@@ -77,7 +77,7 @@
<plugin name="org.apache.forrest.plugin.input.listLocations"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.listLocations"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.listLocations"
url="http://forrest.apache.org/plugins/"
version="0.1">
<description>
@@ -90,7 +90,7 @@
<plugin name="org.apache.forrest.plugin.input.OpenOffice.org"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.OpenOffice.org"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.OpenOffice.org"
url="http://forrest.apache.org/plugins"
version="0.1-dev">
<description>
@@ -102,7 +102,7 @@
<plugin name="org.apache.forrest.plugin.input.PhotoGallery"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.PhotoGallery"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.PhotoGallery"
url="http://forrest.apache.org/plugins"
version="0.1-dev">
<description>
@@ -115,7 +115,7 @@
type="input"
author="Ronald Blaschke"
website="http://www.rblasch.org/projects/pod-input/"
- url="http://www.rblasch.org/projects/pod-input/org.rblasch.forrest.plugin.input.pod.zip"
+ url="http://www.rblasch.org/projects/pod-input"
version="0.1">
<description>
Embed Pod (Plain Old Documentation) documents in a Forrest site.
@@ -126,7 +126,7 @@
<plugin name="org.apache.forrest.plugin.input.projectInfo"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.projectInfo"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.projectInfo"
url="http://forrest.apache.org/plugins/"
version="0.1">
<description>
@@ -135,10 +135,10 @@
<forrestVersion>0.7</forrestVersion>
</plugin>
- <plugin name="org.apache.forrest.plugin.input.simplified-docbook"
+ <plugin name="org.apache.forrest.plugin.input.simplifiedDocbook"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.simplified-docbook"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.simplifiedDocbook"
url="http://forrest.apache.org/plugins/"
version="0.1">
<description>
@@ -150,7 +150,7 @@
<plugin name="org.apache.forrest.plugin.input.wiki"
type="input"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.wiki"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.input.wiki"
url="http://forrest.apache.org/plugins/"
version="0.1">
<description>
@@ -166,7 +166,7 @@
<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.output.pdf"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.output.pdf"
url="http://forrest.apache.org/plugins/"
version="0.1">
<description>
@@ -178,7 +178,7 @@
<plugin name="org.apache.forrest.plugin.output.POD"
type="output"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.POD"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.output.POD"
url="http://forrest.apache.org/plugins/"
version="0.1">
<description>
@@ -191,7 +191,7 @@
<plugin name="org.apache.forrest.plugin.output.Text"
type="output"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.text-output"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.text-output"
url="http://forrest.apache.org/plugins/"
version="0.1">
<description>
@@ -220,7 +220,7 @@
<plugin name="org.apache.forrest.plugin.internal.IMSManifest"
type="internal"
author="Apache Forrest Project"
- website="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.internal.IMSManifest"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_70/org.apache.forrest.plugin.internal.IMSManifest"
url="http://forrest.apache.org/plugins/"
version="0.1">