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 2004/10/22 00:07:57 UTC
svn commit: rev 55273 - in forrest/trunk: . src/core src/core/context src/core/context/WEB-INF src/core/fresh-site src/core/targets src/core/var src/documentation/content/xdocs src/documentation/content/xdocs/docs
Author: rgardler
Date: Thu Oct 21 15:07:57 2004
New Revision: 55273
Added:
forrest/trunk/src/core/targets/plugins.xml (props changed)
- copied unchanged from rev 55257, forrest/branches/sitemap-plugins/src/core/targets/plugins.xml
forrest/trunk/src/core/var/initial_plugins_sitemap.xmap (props changed)
- copied unchanged from rev 55257, forrest/branches/sitemap-plugins/src/core/var/initial_plugins_sitemap.xmap
forrest/trunk/src/core/var/pluginMountSnippet.xsl (props changed)
- copied unchanged from rev 55257, forrest/branches/sitemap-plugins/src/core/var/pluginMountSnippet.xsl
forrest/trunk/src/core/var/pluginlist2echo.xsl (props changed)
- copied unchanged from rev 55257, forrest/branches/sitemap-plugins/src/core/var/pluginlist2echo.xsl
forrest/trunk/src/core/var/pluginlist2fetch.xsl (props changed)
- copied unchanged from rev 55257, forrest/branches/sitemap-plugins/src/core/var/pluginlist2fetch.xsl
forrest/trunk/src/documentation/content/xdocs/docs/plugins.xml (props changed)
- copied unchanged from rev 55257, forrest/branches/sitemap-plugins/src/documentation/content/xdocs/docs/plugins.xml
Modified:
forrest/trunk/build.xml
forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
forrest/trunk/src/core/context/default-forrest.properties
forrest/trunk/src/core/context/sitemap.xmap
forrest/trunk/src/core/forrest.build.xml
forrest/trunk/src/core/fresh-site/forrest.properties
forrest/trunk/src/documentation/content/xdocs/site.xml
Log:
Merged sitemap-plugins branch changes r47409:55271
Modified: forrest/trunk/build.xml
==============================================================================
--- forrest/trunk/build.xml (original)
+++ forrest/trunk/build.xml Thu Oct 21 15:07:57 2004
@@ -35,6 +35,7 @@
<property name="forrest.version" value="0.7-dev"/>
<property name="java.dir" location="src/java"/>
+ <property name="plugins.dir" location="plugins"/>
<property name="build.dir" location="build"/>
<property name="build.docs" location="${build.dir}/docs"/>
<property name="build.classes" location="${build.dir}/classes"/>
@@ -68,7 +69,11 @@
</echo>
<mkdir dir="${build.dir}"/>
-
+
+ <mkdir dir="${plugins.dir}"/>
+ <copy file="src/core/var/initial_plugins_sitemap.xmap"
+ tofile="${plugins.dir}/sitemap.xmap"/>
+
<path id="classpath">
<fileset dir="lib" includes="**/*.jar"/>
<fileset dir="${tools.dir}/jetty" includes="servlet*.jar"/>
@@ -79,6 +84,7 @@
<target name="clean" depends="init" description="Delete all generated files">
<delete dir="${build.dir}"/>
+ <delete dir="${plugins.dir}"/>
<delete dir="${forrestbot.dir}/logs"/>
<delete dir="${forrestbot.dir}/work"/>
<delete dir="${forrestbot.dir}/build"/>
Modified: forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
==============================================================================
--- forrest/trunk/src/core/context/WEB-INF/cocoon.xconf (original)
+++ forrest/trunk/src/core/context/WEB-INF/cocoon.xconf Thu Oct 21 15:07:57 2004
@@ -113,6 +113,7 @@
<context>@context.home@</context>
<skins-dir>@context.home@/skins/</skins-dir>
<stylesheets>@context.home@/resources/stylesheets</stylesheets>
+ <plugins>@forrest.home@/../../plugins</plugins>
</values>
</component-instance>
@@ -120,6 +121,7 @@
<values>
<skin>@project.skin@</skin>
<sitemap>@project.home@/@project.sitemap@</sitemap>
+ <pluginmap>@project.home@/@project.pluginmap@</pluginmap>
<status>@project.home@/@project.status@</status>
<skinconf>@project.home@/@project.skinconf@</skinconf>
<doc>@project.home@/@project.content-dir@/</doc>
Modified: forrest/trunk/src/core/context/default-forrest.properties
==============================================================================
--- forrest/trunk/src/core/context/default-forrest.properties (original)
+++ forrest/trunk/src/core/context/default-forrest.properties Thu Oct 21 15:07:57 2004
@@ -28,6 +28,7 @@
# comma separated list, file:// is supported
forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml
+forrest.plugins.descriptors=http://www.apache.org/~rgardler/testingGround/forrestPlugins/plugins.xml
##############
# behavioural properties
@@ -136,3 +137,6 @@
# The issues list as rss
#project.issues-rss-url=
project.i18n=false
+# The names of plugins that are required to build the project
+# comma separated list (no spaces)
+project.required.plugins=
Modified: forrest/trunk/src/core/context/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap (original)
+++ forrest/trunk/src/core/context/sitemap.xmap Thu Oct 21 15:07:57 2004
@@ -345,7 +345,14 @@
</map:when>
</map:select>
</map:pipeline>
-
+
+ <map:pipeline internal-only="false">
+ <map:mount uri-prefix=""
+ src="{forrest:plugins}/sitemap.xmap"
+ check-reload="yes"
+ pass-through="true"/>
+ </map:pipeline>
+
<map:pipeline internal-only="false">
<map:match pattern="skinconf.xml">
<map:generate src="{project:skinconf}" />
Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml (original)
+++ forrest/trunk/src/core/forrest.build.xml Thu Oct 21 15:07:57 2004
@@ -44,6 +44,7 @@
<import file="targets/webapp.xml"/>
<import file="targets/site.xml"/>
<import file="targets/skins.xml"/>
+ <import file="targets/plugins.xml"/>
<import file="targets/context.xml"/>
<description>
@@ -97,7 +98,8 @@
<!-- people should use forrest.properties to override following defaults -->
<property name="forrest.home" location="." />
- <property name="forrest.skins-dir" location="${forrest.home}/context/skins"/>
+ <property name="forrest.skins-dir" location="${forrest.home}/context/skins"/>
+ <property name="forrest.plugins-dir" location="${forrest.home}/../../plugins"/>
<property name="project.site-dir" location="${project.build-dir}/site" />
<property name="project.war" location="${project.build-dir}/${project.name}.war" />
<property name="project.webapp" location="${project.build-dir}/webapp" />
@@ -295,7 +297,7 @@
</target>
<!-- Sets up properties and filters -->
- <target name="init" depends="init-props, init-skins">
+ <target name="init" depends="init-props, init-skins, install-required-plugins">
<available property="xml-forrest.jar.exists" file="${forrest.build.lib-dir}/xml-forrest.jar"/>
<fail unless="xml-forrest.jar.exists">You must build forrest before you can run it. In ${forrest.root-dir} run './build.sh' (linux) or 'build' (windows)</fail>
</target>
Modified: forrest/trunk/src/core/fresh-site/forrest.properties
==============================================================================
--- forrest/trunk/src/core/fresh-site/forrest.properties (original)
+++ forrest/trunk/src/core/fresh-site/forrest.properties Thu Oct 21 15:07:57 2004
@@ -102,3 +102,6 @@
#project.issues-rss-url=
#I18n Property only works for the "forrest run" target.
#project.i18n=true
+# The names of plugins that are required to build the project
+# comma separated list (no spaces)
+# project.required.plugins=
Modified: forrest/trunk/src/documentation/content/xdocs/site.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/src/documentation/content/xdocs/site.xml Thu Oct 21 15:07:57 2004
@@ -50,6 +50,7 @@
<searching label="Searching" href="searching.html"/>
<skins label="Default Skins" href="skins.html"/>
<skin-package label="Skin Packages" href="skin-package.html"/>
+ <plugins label="Plugins" href="plugins.html"/>
<!--
<quick-xml label="XML Guide" href="quick-xml.html"/>
-->