velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r497562 - in /velocity/docbook/trunk: build-docbook.xml docbook.properties src/resolver/ src/resolver/CatalogManager.properties src/resolver/xml-catalog.xml
Date Thu, 18 Jan 2007 20:37:04 GMT
Author: henning
Date: Thu Jan 18 12:37:03 2007
New Revision: 497562

URL: http://svn.apache.org/viewvc?view=rev&rev=497562
Log:
Move resolver into src directory, fix final references.


Added:
    velocity/docbook/trunk/src/resolver/
    velocity/docbook/trunk/src/resolver/CatalogManager.properties   (with props)
    velocity/docbook/trunk/src/resolver/xml-catalog.xml   (with props)
Modified:
    velocity/docbook/trunk/build-docbook.xml
    velocity/docbook/trunk/docbook.properties

Modified: velocity/docbook/trunk/build-docbook.xml
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/build-docbook.xml?view=diff&rev=497562&r1=497561&r2=497562
==============================================================================
--- velocity/docbook/trunk/build-docbook.xml (original)
+++ velocity/docbook/trunk/build-docbook.xml Thu Jan 18 12:37:03 2007
@@ -33,7 +33,7 @@
     <fileset dir="${dbf.xsl.dir}/extensions">
       <include name="${xslt-db.jar}"/>
     </fileset>
-    <pathelement location="${dbf.basedir}"/>
+    <pathelement location="${tmp.dir}"/>
   </path>
 
   <!-- ======================================================================== -->
@@ -45,10 +45,12 @@
   <path id="dbf.xsl.path" location="${dbf.xsl.dir}"/>
   <path id="src.dir.path" location="${src.dir}"/>
   <path id="tmp.dir.path" location="${tmp.dir}"/>
+  <path id="target.dir.path" location="${target.dir}"/>
   <pathconvert dirsep="/" property="dbf.xml.path" refid="dbf.xml.path"/>
   <pathconvert dirsep="/" property="dbf.xsl.path" refid="dbf.xsl.path"/>
   <pathconvert dirsep="/" property="src.dir.path" refid="src.dir.path"/>
   <pathconvert dirsep="/" property="tmp.dir.path" refid="tmp.dir.path"/>
+  <pathconvert dirsep="/" property="target.dir.path" refid="target.dir.path"/>
 
   <condition  property="file.prefix" value="file:///">
     <os family="windows"/>
@@ -66,6 +68,7 @@
     <filter token="dbf.xsl" value="${dbf.xsl.path}" />
     <filter token="src.dir" value="${src.dir.path}" />
     <filter token="tmp.dir" value="${tmp.dir.path}" />
+    <filter token="target.dir" value="${target.dir.path}" />
   </filterset>
 
   <!-- ======================================================================== -->
@@ -198,6 +201,12 @@
 
     <mkdir dir="${dbf.xsl.dir}" />
     <unzip src="${dbf.zip.src.dir}/docbook-xsl-${dbf.xsl.version}.zip" dest="${target.dir}"
/>
+
+    <copy todir="${tmp.dir}" filtering="on" overwrite="true">
+      <fileset dir="${dbf.resolver.src.dir}"/>
+      <filterset refid="filterset.dbf.location"/>
+    </copy>
+
   </target>
 
   <!-- ======================================================================== -->

Modified: velocity/docbook/trunk/docbook.properties
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/docbook.properties?view=diff&rev=497562&r1=497561&r2=497562
==============================================================================
--- velocity/docbook/trunk/docbook.properties (original)
+++ velocity/docbook/trunk/docbook.properties Thu Jan 18 12:37:03 2007
@@ -26,6 +26,9 @@
 # Location of the generic style xsl files.
 dbf.style.src.dir = ${dbf.src.dir}/styles
 
+# Location of the generic style xsl files.
+dbf.resolver.src.dir = ${dbf.src.dir}/resolver
+
 ########################################################################
 #
 # The following parameter usually get overwritten by the caller. We

Added: velocity/docbook/trunk/src/resolver/CatalogManager.properties
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/src/resolver/CatalogManager.properties?view=auto&rev=497562
==============================================================================
--- velocity/docbook/trunk/src/resolver/CatalogManager.properties (added)
+++ velocity/docbook/trunk/src/resolver/CatalogManager.properties Thu Jan 18 12:37:03 2007
@@ -0,0 +1,20 @@
+# Copyright 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+catalogs = @tmp.dir@/xml-catalog.xml
+relative-catalogs = yes
+verbosity = 0
+prefer = system
+static-catalog = yes
+allow-oasis-xml-catalog-pi = yes

Propchange: velocity/docbook/trunk/src/resolver/CatalogManager.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/docbook/trunk/src/resolver/CatalogManager.properties
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Revision

Added: velocity/docbook/trunk/src/resolver/xml-catalog.xml
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/src/resolver/xml-catalog.xml?view=auto&rev=497562
==============================================================================
--- velocity/docbook/trunk/src/resolver/xml-catalog.xml (added)
+++ velocity/docbook/trunk/src/resolver/xml-catalog.xml Thu Jan 18 12:37:03 2007
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License")
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- Translate DocBook XML 4.4 system ids to local file names -->
+  <rewriteSystem
+    systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4/"
+    rewritePrefix="@target.dir@/docbook-xml-4.4/"/>
+
+  <!-- Translate DocBook XML 4.4 public ids to local file names -->
+  <nextCatalog
+    catalog="@target.dir@/docbook-xml-4.4/catalog.xml"/>
+
+  <rewriteURI
+    uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+    rewritePrefix="@target.dir@/docbook-xsl-1.70.0/"/>
+
+</catalog>

Propchange: velocity/docbook/trunk/src/resolver/xml-catalog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/docbook/trunk/src/resolver/xml-catalog.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Revision



Mime
View raw message