You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by pi...@apache.org on 2004/11/08 05:01:45 UTC
svn commit: rev 56904 - in cocoon/whiteboard/kernel: . sources/blocks/datasource-hsqldb sources/webapp/WEB-INF
Author: pier
Date: Sun Nov 7 20:01:45 2004
New Revision: 56904
Added:
cocoon/whiteboard/kernel/sources/blocks/datasource-hsqldb/
cocoon/whiteboard/kernel/sources/blocks/datasource-hsqldb/cocoon.xml
cocoon/whiteboard/kernel/sources/blocks/datasource-hsqldb/hsqldb-1.7.2.7.zip (contents, props changed)
Modified:
cocoon/whiteboard/kernel/build.xml
cocoon/whiteboard/kernel/sources/webapp/WEB-INF/configuration.xml
Log:
Some more examples (blocks extending blocks)
Modified: cocoon/whiteboard/kernel/build.xml
==============================================================================
--- cocoon/whiteboard/kernel/build.xml (original)
+++ cocoon/whiteboard/kernel/build.xml Sun Nov 7 20:01:45 2004
@@ -201,6 +201,7 @@
<antcall target="kernel.component"><param name="name" value="modules/commons-collections"/></antcall>
<antcall target="kernel.component"><param name="name" value="modules/commons-pool"/></antcall>
<antcall target="kernel.component"><param name="name" value="blocks/datasource-commons-dbcp"/></antcall>
+ <antcall target="kernel.component"><param name="name" value="blocks/datasource-hsqldb"/></antcall>
<antcall target="kernel.component"><param name="name" value="blocks/jaxp-saxon"/></antcall>
<antcall target="kernel.component"><param name="name" value="blocks/servlet-jasper"/></antcall>
<antcall target="kernel.component"><param name="name" value="blocks/repository-file"/></antcall>
Added: cocoon/whiteboard/kernel/sources/blocks/datasource-hsqldb/cocoon.xml
==============================================================================
--- (empty file)
+++ cocoon/whiteboard/kernel/sources/blocks/datasource-hsqldb/cocoon.xml Sun Nov 7 20:01:45 2004
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<block xmlns="http://apache.org/cocoon/kernel/descriptor/1.0"
+ id="http://cocoon.apache.org/kernel/blocks/hsqldb/1.7.2">
+
+ <extensions>
+ <extends block="http://cocoon.apache.org/kernel/blocks/commons-dbcp/1.2.1"/>
+ </extensions>
+
+ <libraries>
+ <library href="hsqldb-1.7.2.7.zip"/>
+ </libraries>
+
+ <provides component="org.apache.commons.dbcp.BasicDataSource">
+ <set property="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <set property="username" value="sa"/>
+ <set property="password" value=""/>
+ <set property="maxActive" value="10"/>
+ </provides>
+
+</block>
Added: cocoon/whiteboard/kernel/sources/blocks/datasource-hsqldb/hsqldb-1.7.2.7.zip
==============================================================================
Binary file. No diff available.
Modified: cocoon/whiteboard/kernel/sources/webapp/WEB-INF/configuration.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/webapp/WEB-INF/configuration.xml (original)
+++ cocoon/whiteboard/kernel/sources/webapp/WEB-INF/configuration.xml Sun Nov 7 20:01:45 2004
@@ -23,6 +23,7 @@
<!-- The block descriptors available to this kernel -->
<descriptor href="kernel/blocks/datasource-commons-dbcp/cocoon.xml"/>
+ <descriptor href="kernel/blocks/datasource-hsqldb/cocoon.xml"/>
<descriptor href="kernel/blocks/jaxp-saxon/cocoon.xml"/>
<descriptor href="kernel/blocks/repository-file/cocoon.xml"/>
<descriptor href="kernel/blocks/servlet-jasper/cocoon.xml"/>
@@ -35,12 +36,8 @@
<set property="className" value="net.sf.saxon.TransformerFactoryImpl"/>
</instance>
- <instance name="test" block="http://cocoon.apache.org/kernel/blocks/commons-dbcp/1.2.1">
- <set property="driverClassName" value="oracle.jdbc.OracleDriver"/>
- <set property="url" value="jdbc:oracle:thin:@qbe.local:1521:vnlive"/>
- <set property="username" value="****"/>
- <set property="password" value="****"/>
- <set property="maxActive" value="5"/>
+ <instance name="test" block="http://cocoon.apache.org/kernel/blocks/hsqldb/1.7.2">
+ <set property="url" value="jdbc:hsqldb:mem:test"/>
</instance>
<instance name="jasper" block="http://cocoon.apache.org/kernel/blocks/jasper/4.1.30">