You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2005/04/24 13:06:20 UTC
svn commit: r164464 - in /forrest/trunk: main/targets/plugins.xml
main/targets/validate.xml main/webapp/resources/schema/catalog.xcat
plugins/build.xml
Author: crossley
Date: Sun Apr 24 04:06:19 2005
New Revision: 164464
URL: http://svn.apache.org/viewcvs?rev=164464&view=rev
Log:
Added ability to have DTDs in plugins.
Issue: FOR-486
Modified:
forrest/trunk/main/targets/plugins.xml
forrest/trunk/main/targets/validate.xml
forrest/trunk/main/webapp/resources/schema/catalog.xcat
forrest/trunk/plugins/build.xml
Modified: forrest/trunk/main/targets/plugins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?rev=164464&r1=164463&r2=164464&view=diff
==============================================================================
--- forrest/trunk/main/targets/plugins.xml (original)
+++ forrest/trunk/main/targets/plugins.xml Sun Apr 24 04:06:19 2005
@@ -68,6 +68,25 @@
<include name="${plugin.name}.zip"/>
</fileset>
</delete>
+
+ <!-- add to the entity catalog -->
+ <copy file="${forrest.core}/var/initial_catalog.xcat"
+ tofile="${forrest.plugins-dir}/catalog.xcat"
+ overwrite="false"/>
+ <if>
+ <available file="${forrest.plugins-dir}/${plugin.name}/resources/schema/catalog.xcat"/>
+ <then>
+ <xslt in="${forrest.plugins-dir}/catalog.xcat"
+ out="${forrest.plugins-dir}/catalog.xcat.new"
+ style="${forrest.core}/var/catalogMountSnippet.xsl"
+ force="true">
+ <param name="plugin-catalog-path"
+ expression="${forrest.plugins-dir}/${plugin.name}/resources/schema/catalog.xcat"/>
+ </xslt>
+ <move file="${forrest.plugins-dir}/catalog.xcat.new"
+ tofile="${forrest.plugins-dir}/catalog.xcat"/>
+ </then>
+ </if>
</then>
<else>
<echo>
@@ -242,7 +261,7 @@
<copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
tofile="${project.temp-dir}/internal.xmap"
overwrite="true"/>
-
+
<for list="${project.required.plugins}" param="name">
<sequential>
<echo>Installing plugin: @{name}</echo>
Modified: forrest/trunk/main/targets/validate.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/validate.xml?rev=164464&r1=164463&r2=164464&view=diff
==============================================================================
--- forrest/trunk/main/targets/validate.xml (original)
+++ forrest/trunk/main/targets/validate.xml Sun Apr 24 04:06:19 2005
@@ -129,6 +129,8 @@
<catalogpath>
<pathelement
location="${forrest.core.webapp}/resources/schema/catalog.xcat"/>
+ <pathelement
+ location="${forrest.plugins-dir}/catalog.xcat"/>
<pathelement location="${catalog}"/>
</catalogpath>
</xmlcatalog>
Modified: forrest/trunk/main/webapp/resources/schema/catalog.xcat
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources/schema/catalog.xcat?rev=164464&r1=164463&r2=164464&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/catalog.xcat (original)
+++ forrest/trunk/main/webapp/resources/schema/catalog.xcat Sun Apr 24 04:06:19 2005
@@ -23,6 +23,7 @@
prefer="public">
<nextCatalog catalog="catalog.forrest.xcat"/>
+<nextCatalog catalog="../../../../build/plugins/catalog.xcat"/>
<nextCatalog catalog="w3c-dtd/catalog.xcat"/>
<nextCatalog catalog="docbook/catalog.xcat"/>
<nextCatalog catalog="sdocbook/catalog.xcat"/>
Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?rev=164464&r1=164463&r2=164464&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Sun Apr 24 04:06:19 2005
@@ -120,9 +120,29 @@
<exclude name="build/**"/>
</fileset>
</copy>
- <copy toFile="${plugins.localDeploy-dir}/lib/${plugin-name}.jar"
- file="${build.dir}/${plugin-name}.jar"
- failonerror="false"/>
+ <copy toFile="${plugins.localDeploy-dir}/lib/${plugin-name}.jar"
+ file="${build.dir}/${plugin-name}.jar"
+ failonerror="false"/>
+
+ <!-- add to the entity catalog -->
+ <copy file="${forrest.core}/var/initial_catalog.xcat"
+ tofile="${plugins.localDeploy-dir}/catalog.xcat"
+ overwrite="false"/>
+ <if>
+ <available file="${plugins.localDeploy-dir}/${plugin-name}/resources/schema/catalog.xcat"/>
+ <then>
+ <xslt in="${plugins.localDeploy-dir}/catalog.xcat"
+ out="${plugins.localDeploy-dir}/catalog.xcat.new"
+ style="${forrest.core}/var/catalogMountSnippet.xsl"
+ force="true">
+ <param name="plugin-catalog-path"
+ expression="${plugin-name}/resources/schema/catalog.xcat"/>
+ </xslt>
+ <move file="${plugins.localDeploy-dir}/catalog.xcat.new"
+ tofile="${plugins.localDeploy-dir}/catalog.xcat"/>
+ </then>
+ </if>
+
<antcall target="build"/>
</target>
Re: svn commit: r164464 - in /forrest/trunk: main/targets/plugins.xml
main/targets/validate.xml main/webapp/resources/schema/catalog.xcat plugins/build.xml
Posted by Ross Gardler <rg...@apache.org>.
crossley@apache.org wrote:
> Author: crossley
> Date: Sun Apr 24 04:06:19 2005
> New Revision: 164464
>
> URL: http://svn.apache.org/viewcvs?rev=164464&view=rev
> Log:
> Added ability to have DTDs in plugins.
> Issue: FOR-486
Cool, thanks David.
Ross