Author: rgardler
Date: Wed Dec 7 00:15:23 2005
New Revision: 354749
URL: http://svn.apache.org/viewcvs?rev=354749&view=rev
Log:
remove xconf support for plugins. Cocoon has moved away from this technique and
we should follow the work on Blocks. This was never in a release and none of
our official blocks use it so we can safely remove now. However, I do have a
couple of private plugins that use this so a solution is needed
Removed:
forrest/trunk/main/webapp/locationmap-themer.xml
forrest/trunk/tools/anttasks/XConfToolTask.class
Modified:
forrest/trunk/main/targets/plugins.xml
forrest/trunk/main/webapp/WEB-INF/cocoon.xconf
forrest/trunk/main/webapp/sitemap.xmap
forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
Modified: forrest/trunk/main/targets/plugins.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?rev=354749&r1=354748&r2=354749&view=diff
==============================================================================
--- forrest/trunk/main/targets/plugins.xml (original)
+++ forrest/trunk/main/targets/plugins.xml Wed Dec 7 00:15:23 2005
@@ -144,7 +144,6 @@
</target>
<target name="configure-plugin"
- depends="configure-cocoon"
unless="plugin.unavailable">
<if>
<available file="${forrest.plugins-dir}/${versioned.name}"/>
@@ -348,10 +347,7 @@
<mkdir dir="${forrest.plugins-dir}"/>
<mkdir dir="${project.temp-dir}"/>
<mkdir dir="${project.webapp}/conf"/>
-
- <copy file="${forrest.core}/var/plugins.xconf"
- tofile="${project.build-dir}/plugins.xconf"
- overwrite="true"/>
+
<copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
tofile="${project.temp-dir}/input.xmap"
overwrite="true"/>
@@ -397,23 +393,6 @@
</antcall>
</sequential>
</for>
- </target>
-
- <target name="configure-cocoon" unless="plugin.unavailable">
- <!-- set up the xconf files -->
- <copy todir="${project.build-dir}"
- failonerror="false">
- <fileset dir="${forrest.plugins-dir}/${plugin.name}/conf">
- <exclude name="*.xconf"/>
- </fileset>
- </copy>
-
- <xpatch file="${project.build-dir}/plugins.xconf"
- srcdir="${forrest.plugins-dir}/${plugin.name}"
- addcomments="true">
- <include name="conf/*.xconf"/>
- </xpatch>
-
</target>
</project>
Modified: forrest/trunk/main/webapp/WEB-INF/cocoon.xconf
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/cocoon.xconf?rev=354749&r1=354748&r2=354749&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/cocoon.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/cocoon.xconf Wed Dec 7 00:15:23 2005
@@ -28,6 +28,5 @@
+-->
<include src="context://WEB-INF/xconf/forrest-core.xconf"/>
- <include src="resource://plugins.xconf"/>
</cocoon>
Modified: forrest/trunk/main/webapp/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=354749&r1=354748&r2=354749&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Wed Dec 7 00:15:23 2005
@@ -568,6 +568,7 @@
<map:parameter name="type" value="transform.book.menu"/>
<map:parameter name="path" value="{1}{2}.html"/>
</map:call>
+ <map:serialize type="xml"/>
</map:match>
<map:match pattern="**tab-*.html">
Modified:
forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml?rev=354749&r1=354748&r2=354749&view=diff
==============================================================================
---
forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
(original)
+++
forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
Wed Dec 7 00:15:23 2005
@@ -179,15 +179,6 @@
site for you. All you have to do is add the content.</p>
</section>
- <section id="componentConfig">
- <title>Component Configuration</title>
- <p>If your plugin needs to provide additional Cocoon configuration
- in the form of an <code>xconf</code>, or if some of the components
- you are using need a configuration file (such as a JTidy config)
- you should place them in a <code>conf</code> directory in the root
- of your plugin.</p>
- </section>
-
<section id="hosted">
<title>Style notes for plugins hosted at forrest.apache.org</title>
<p>
