gianugo 02/02/23 08:47:40
Modified: src/documentation/xdocs/userdocs/concepts sitemap.xml
src/documentation/xdocs/userdocs/generators
xmldb-generator.xml xmldbcollection-generator.xml
src/java/org/apache/cocoon/generation XMLDBGenerator.java
XMLDBCollectionGenerator.java xmldb.sitemap
xmldb.xconf
src/webapp sitemap.xmap
Log:
Started to clean up the XML:DB stuff. The XML:DB generators have been deprecated,
and a note has been written in the docs suggesting to switch to the XML:DB
pseudo-protocol. Configurations have been switched from dbXML to Xindice.
Revision Changes Path
1.3 +3 -0
xml-cocoon2/src/documentation/xdocs/userdocs/concepts/sitemap.xml
Index: sitemap.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/sitemap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xml 5 Feb 2002 01:46:44 -0000 1.2
+++ sitemap.xml 23 Feb 2002 16:47:39 -0000 1.3
@@ -623,6 +623,9 @@
Use <code>file://foo/bar</code> to merge in xml content from the filesystem.
</li>
<li>
+ Use <code>xmldb:<your driver here>://your.xmldb.host/db/foo/bar</code>
to merge in xml content from a XML:DB compliant database.
+ </li>
+ <li>
Depending on your setup you may use
<code>nfs:</code>, <code>jndi:</code> protocols, too.
</li>
1.3 +6 -0
xml-cocoon2/src/documentation/xdocs/userdocs/generators/xmldb-generator.xml
Index: xmldb-generator.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/generators/xmldb-generator.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldb-generator.xml 5 Feb 2002 01:46:44 -0000 1.2
+++ xmldb-generator.xml 23 Feb 2002 16:47:39 -0000 1.3
@@ -12,6 +12,12 @@
<abstract>This document describes the XML:DB generator of
Cocoon.</abstract>
</header>
<body>
+ <s1 title="Warning!">
+ <p>
+ The XML:DB generators are currently unmaintained and going to be
+ deprecated soon. Please use the XML:DB pseudo-protocol instead.
+ </p>
+ </s1>
<s1 title="XML:DB Generator">
<p>
Generates XML documents out of an XML:DB compliant database. XML:DB
1.3 +6 -0
xml-cocoon2/src/documentation/xdocs/userdocs/generators/xmldbcollection-generator.xml
Index: xmldbcollection-generator.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/generators/xmldbcollection-generator.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldbcollection-generator.xml 5 Feb 2002 01:46:44 -0000 1.2
+++ xmldbcollection-generator.xml 23 Feb 2002 16:47:39 -0000 1.3
@@ -13,6 +13,12 @@
Collection generator of Cocoon.</abstract>
</header>
<body>
+ <s1 title="Warning!">
+ <p>
+ The XML:DB generators are currently unmaintained and going to be
+ deprecated soon. Please use the XML:DB pseudo-protocol instead.
+ </p>
+ </s1>
<s1 title="XML:DB Collection Generator">
<p>
As for the filesystem there are two generators provided (a file
1.6 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBGenerator.java
Index: XMLDBGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLDBGenerator.java 22 Feb 2002 07:03:51 -0000 1.5
+++ XMLDBGenerator.java 23 Feb 2002 16:47:39 -0000 1.6
@@ -95,7 +95,8 @@
* slash in the base tag is important!
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Gianugo Rabellino</a>
- * @version CVS $Id: XMLDBGenerator.java,v 1.5 2002/02/22 07:03:51 cziegeler Exp $
+ * @version CVS $Id: XMLDBGenerator.java,v 1.6 2002/02/23 16:47:39 gianugo Exp $
+ * @deprecated Use the XML:DB pseudo protocol instead.
*/
public class XMLDBGenerator extends ComposerGenerator
1.6 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
Index: XMLDBCollectionGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLDBCollectionGenerator.java 22 Feb 2002 07:03:51 -0000 1.5
+++ XMLDBCollectionGenerator.java 23 Feb 2002 16:47:39 -0000 1.6
@@ -96,7 +96,8 @@
* slash in the base tag is important!
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Gianugo Rabellino</a>
- * @version CVS $Id: XMLDBCollectionGenerator.java,v 1.5 2002/02/22 07:03:51
cziegeler Exp $
+ * @version CVS $Id: XMLDBCollectionGenerator.java,v 1.6 2002/02/23 16:47:39
gianugo Exp $
+ * @deprecated Use the XML:DB pseudo protocol instead.
*/
public class XMLDBCollectionGenerator extends ComposerGenerator
1.2 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/generation/xmldb.sitemap
Index: xmldb.sitemap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/xmldb.sitemap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmldb.sitemap 3 Jan 2002 12:31:16 -0000 1.1
+++ xmldb.sitemap 23 Feb 2002 16:47:39 -0000 1.2
@@ -1,2 +1,2 @@
-category:generators|componentName:xmldb|componentClass:org.apache.cocoon.generation.XMLDBGenerator|configuration:<driver>org.dbxml.client.xmldb.DatabaseImpl</driver><base>xmldb:dbxml:///db/</base>
-category:generators|componentName:xmldbcollection|componentClass:org.apache.cocoon.generation.XMLDBCollectionGenerator|configuration:<driver>org.dbxml.client.xmldb.DatabaseImpl</driver><base>xmldb:dbxml:///db/</base>
+category:generators|componentName:xmldb|componentClass:org.apache.cocoon.generation.XMLDBGenerator|configuration:<driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver><base>xmldb:xindice:///db/</base>
+category:generators|componentName:xmldbcollection|componentClass:org.apache.cocoon.generation.XMLDBCollectionGenerator|configuration:<driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver><base>xmldb:xindice:///db/</base>
1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/generation/xmldb.xconf
Index: xmldb.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/xmldb.xconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldb.xconf 22 Feb 2002 23:25:19 -0000 1.2
+++ xmldb.xconf 23 Feb 2002 16:47:39 -0000 1.3
@@ -9,8 +9,8 @@
<!-- xmldb pseudo protocol -->
<protocol name="xmldb"
class="org.apache.cocoon.components.source.XMLDBSourceFactory">
- <!-- dbXML driver -->
- <driver type="dbxml" class="org.dbxml.client.xmldb.DatabaseImpl"/>
+ <!-- Xindice driver -->
+ <driver type="xindice" class="org.apache.xindice.client.xmldb.DatabaseImpl"/>
<!-- Add here other XML:DB compliant databases drivers -->
</protocol>
</source-handler>
1.31 +6 -2 xml-cocoon2/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sitemap.xmap 22 Feb 2002 11:27:51 -0000 1.30
+++ sitemap.xmap 23 Feb 2002 16:47:40 -0000 1.31
@@ -1131,13 +1131,17 @@
<!-- ========================= XML:DB ================================ -->
<map:match pattern="xmldb/**">
<map:match type="request-parameter" pattern="xpath">
- <map:generate src="xmldb:dbxml://localhost:4080/{../1}#{1}"/>
+ <map:generate src="xmldb:xindice://localhost:4080/db/{../1}#{1}"/>
<map:serialize type="xml"/>
</map:match>
- <map:generate src="xmldb:dbxml://localhost:4080/{1}"/>
+ <map:generate src="xmldb:xindice://localhost:4080/db/{1}"/>
<map:serialize type="xml"/>
</map:match>
+
+ <!-- BEWARE: the following examples use the unmaintained XML:DB -->
+ <!-- generators, going to be deprecated soon. -->
+ <!-- You might want to use the XML:DB pseudo protocol instead. -->
<map:match pattern="xmldb-generator/db/**/">
<map:generate type="xmldbcollection" src="/{1}"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
