cziegeler 2002/12/04 03:40:51
Modified: src/blocks/databases/conf datasources.xconf
src/webapp/WEB-INF cocoon.xconf
Log:
We don't want a datasources section if we don't have the datasources block/module
Revision Changes Path
1.2 +3 -1 xml-cocoon2/src/blocks/databases/conf/datasources.xconf
Index: datasources.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/databases/conf/datasources.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- datasources.xconf 18 Oct 2002 14:04:27 -0000 1.1
+++ datasources.xconf 4 Dec 2002 11:40:50 -0000 1.2
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
-<xconf xpath="/cocoon/datasources" unless="jdbc[@name='personnel']">
+<xconf xpath="/cocoon" unless="datasources">
+ <datasources>
<jdbc logger="core.datasources.personnel" name="personnel">
<!--
If you have an Oracle database, and are using the the
@@ -25,4 +26,5 @@
<user>@db_user@</user>
<password>@db_password@</password>
</jdbc>
+ </datasources>
</xconf>
1.49 +0 -4 xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cocoon.xconf 4 Dec 2002 11:37:54 -0000 1.48
+++ cocoon.xconf 4 Dec 2002 11:40:50 -0000 1.49
@@ -375,10 +375,6 @@
</markup-languages>
- <!-- Datasources: -->
- <datasources>
- </datasources>
-
<!-- Compiling xml to byte streams.
The xml-serializer "compiles" xml sax events into a byte stream
and the xml-deserializer does the same vice versa.
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
