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 2004/08/23 05:29:27 UTC
svn commit: rev 36746 - in forrest/trunk/src: core/context core/context/resources/schema core/context/resources/schema/dtd core/context/resources/schema/dtd/v20 core/fresh-site/src/documentation/content/xdocs core/fresh-site/src/documentation/content/xdocs/samples core/fresh-site/src/documentation/content/xdocs/samples/subdir documentation/content/xdocs
Author: crossley
Date: Sun Aug 22 20:29:26 2004
New Revision: 36746
Added:
forrest/trunk/src/core/context/resources/schema/dtd/changes-v20.dtd
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/changes-v20.dtd
forrest/trunk/src/core/context/resources/schema/dtd/changes-v20.mod
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/changes-v20.mod
forrest/trunk/src/core/context/resources/schema/dtd/document-v20.dtd
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/document-v20.dtd
forrest/trunk/src/core/context/resources/schema/dtd/document-v20.mod
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/document-v20.mod
forrest/trunk/src/core/context/resources/schema/dtd/faq-v20.dtd
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/faq-v20.dtd
forrest/trunk/src/core/context/resources/schema/dtd/faq-v20.mod
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/faq-v20.mod
forrest/trunk/src/core/context/resources/schema/dtd/howto-v20.dtd
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/howto-v20.dtd
forrest/trunk/src/core/context/resources/schema/dtd/todo-v20.dtd
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/todo-v20.dtd
forrest/trunk/src/core/context/resources/schema/dtd/todo-v20.mod
- copied unchanged from rev 36693, forrest/trunk/src/core/context/resources/schema/dtd/v20/todo-v20.mod
Removed:
forrest/trunk/src/core/context/resources/schema/dtd/v20/
Modified:
forrest/trunk/src/core/context/dtd.xmap
forrest/trunk/src/core/context/resources/schema/catalog
forrest/trunk/src/core/context/resources/schema/catalog.xcat
forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/index.xml
forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml
forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/faq.xml
forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/index.xml
forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/linking.xml
forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml
forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/static.xml
forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/subdir/index.xml
forrest/trunk/src/documentation/content/xdocs/who.xml
Log:
Move the v20 DTDs out of the sub-directory.
Modified: forrest/trunk/src/core/context/dtd.xmap
==============================================================================
--- forrest/trunk/src/core/context/dtd.xmap (original)
+++ forrest/trunk/src/core/context/dtd.xmap Sun Aug 22 20:29:26 2004
@@ -39,15 +39,6 @@
<map:pipelines>
<map:pipeline>
- <map:match pattern="**docs/*-v20.dtdx.xml">
- <map:generate type="nekodtd" src="{forrest:context}/resources/schema/dtd/v20/{2}-v20.dtd">
- <map:parameter name="config-class" value="org.cyberneko.dtd.DTDConfiguration" />
- </map:generate>
- <map:transform src="{forrest:stylesheets}/dtdx2flat.xsl" />
- <map:transform src="{forrest:stylesheets}/flat2document.xsl" />
- <map:serialize type="xml-document"/>
- </map:match>
-
<map:match pattern="**docs/*.dtdx.xml">
<map:generate type="nekodtd" src="{forrest:context}/resources/schema/dtd/{2}.dtd">
<map:parameter name="config-class" value="org.cyberneko.dtd.DTDConfiguration" />
Modified: forrest/trunk/src/core/context/resources/schema/catalog
==============================================================================
--- forrest/trunk/src/core/context/resources/schema/catalog (original)
+++ forrest/trunk/src/core/context/resources/schema/catalog Sun Aug 22 20:29:26 2004
@@ -23,15 +23,15 @@
-- Document Type Definitions --
PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
- "dtd/v20/document-v20.dtd"
+ "dtd/document-v20.dtd"
PUBLIC "-//APACHE//DTD FAQ V2.0//EN"
- "dtd/v20/faq-v20.dtd"
+ "dtd/faq-v20.dtd"
PUBLIC "-//APACHE//DTD Changes V2.0//EN"
- "dtd/v20/changes-v20.dtd"
+ "dtd/changes-v20.dtd"
PUBLIC "-//APACHE//DTD Todo V2.0//EN"
- "dtd/v20/todo-v20.dtd"
+ "dtd/todo-v20.dtd"
PUBLIC "-//APACHE//DTD How-to V2.0//EN"
- "dtd/v20/howto-v20.dtd"
+ "dtd/howto-v20.dtd"
PUBLIC "-//APACHE//DTD Documentation V1.3//EN"
"dtd/document-v13.dtd"
PUBLIC "-//APACHE//DTD FAQ V1.3//EN"
@@ -107,13 +107,13 @@
-- Reusable modules --
PUBLIC "-//APACHE//ENTITIES Documentation V2.0//EN"
- "dtd/v20/document-v20.mod"
+ "dtd/document-v20.mod"
PUBLIC "-//APACHE//ENTITIES Changes V2.0//EN"
- "dtd/v20/changes-v20.mod"
+ "dtd/changes-v20.mod"
PUBLIC "-//APACHE//ENTITIES FAQ V2.0//EN"
- "dtd/v20/faq-v20.mod"
+ "dtd/faq-v20.mod"
PUBLIC "-//APACHE//ENTITIES Todo V2.0//EN"
- "dtd/v20/todo-v20.mod"
+ "dtd/todo-v20.mod"
PUBLIC "-//APACHE//ENTITIES Documentation V1.3//EN"
"dtd/document-v13.mod"
PUBLIC "-//APACHE//ENTITIES Documentation V1.2//EN"
Modified: forrest/trunk/src/core/context/resources/schema/catalog.xcat
==============================================================================
--- forrest/trunk/src/core/context/resources/schema/catalog.xcat (original)
+++ forrest/trunk/src/core/context/resources/schema/catalog.xcat Sun Aug 22 20:29:26 2004
@@ -22,15 +22,15 @@
<!-- Document Type Definitions (current) -->
<public publicId="-//APACHE//DTD Documentation V2.0//EN"
- uri="dtd/v20/document-v20.dtd"/>
+ uri="dtd/document-v20.dtd"/>
<public publicId="-//APACHE//DTD FAQ V2.0//EN"
- uri="dtd/v20/faq-v20.dtd"/>
+ uri="dtd/faq-v20.dtd"/>
<public publicId="-//APACHE//DTD Changes V2.0//EN"
- uri="dtd/v20/changes-v20.dtd"/>
+ uri="dtd/changes-v20.dtd"/>
<public publicId="-//APACHE//DTD Todo V2.0//EN"
- uri="dtd/v20/todo-v20.dtd"/>
+ uri="dtd/todo-v20.dtd"/>
<public publicId="-//APACHE//DTD How-to V2.0//EN"
- uri="dtd/v20/howto-v20.dtd"/>
+ uri="dtd/howto-v20.dtd"/>
<public publicId="-//APACHE//DTD Documentation V1.3//EN"
uri="dtd/document-v13.dtd"/>
<public publicId="-//APACHE//DTD FAQ V1.3//EN"
@@ -106,13 +106,13 @@
<!-- Reusable modules -->
<public publicId="-//APACHE//ENTITIES Documentation V2.0//EN"
- uri="dtd/v20/document-v20.mod"/>
+ uri="dtd/document-v20.mod"/>
<public publicId="-//APACHE//ENTITIES Changes V2.0//EN"
- uri="dtd/v20/changes-v20.mod"/>
+ uri="dtd/changes-v20.mod"/>
<public publicId="-//APACHE//ENTITIES FAQ V2.0//EN"
- uri="dtd/v20/faq-v20.mod"/>
+ uri="dtd/faq-v20.mod"/>
<public publicId="-//APACHE//ENTITIES Todo V2.0//EN"
- uri="dtd/v20/todo-v20.mod"/>
+ uri="dtd/todo-v20.mod"/>
<public publicId="-//APACHE//ENTITIES Documentation V1.3//EN"
uri="dtd/document-v13.mod"/>
<public publicId="-//APACHE//ENTITIES Documentation V1.2//EN"
@@ -124,7 +124,7 @@
<public publicId="-//APACHE//ENTITIES FAQ V1.2//EN"
uri="dtd/faq-v12.mod"/>
<public publicId="-//APACHE//ENTITIES FAQ V2.0//EN"
- uri="dtd/v20/faq-v20.mod"/>
+ uri="dtd/faq-v20.mod"/>
<public publicId="-//APACHE//ENTITIES Todo V1.1//EN"
uri="dtd/todo-v11.mod"/>
<public publicId="-//APACHE//ENTITIES Common Elements V1.0//EN"
Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/index.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/index.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/v20/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
<title>Welcome to MyProj</title>
Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml (original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/v20/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
<title>Ascii Art sample</title>
Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/faq.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/faq.xml (original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/faq.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V2.0//EN" "http://forrest.apache.org/dtd/v20/faq-v20.dtd">
+<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V2.0//EN" "http://forrest.apache.org/dtd/faq-v20.dtd">
<faqs>
<title>Frequently Asked Questions</title>
Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/index.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/index.xml (original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/index.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/v20/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
<title>Samples</title>
Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/linking.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/linking.xml (original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/linking.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://apache.org/forrest/dtd/v20/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://apache.org/forrest/dtd/document-v20.dtd">
<document>
<header>
<title>Demonstration of linking</title>
Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml (original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/v20/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
<title>The Apache Forrest xdocs document-v2.0 DTD</title>
Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/static.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/static.xml (original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/static.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/v20/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
<title>Static content - including raw un-processed files and documents</title>
Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/subdir/index.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/subdir/index.xml (original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/subdir/index.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/v20/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
<title>Page generated from a sub-directory</title>
Modified: forrest/trunk/src/documentation/content/xdocs/who.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/who.xml (original)
+++ forrest/trunk/src/documentation/content/xdocs/who.xml Sun Aug 22 20:29:26 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/v20/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
<title>Who we are</title>