dims 01/09/10 03:59:58
Modified: . Tag: cocoon_20_branch database.properties
src/org/apache/cocoon Tag: cocoon_20_branch Cocoon.java
cocoon.roles
webapp Tag: cocoon_20_branch cocoon.xconf
Added: lib Tag: cocoon_20_branch hsqldb-1.61.jar
src/org/apache/cocoon/components/hsqldb Tag:
cocoon_20_branch Server.java ServerImpl.java
Removed: lib Tag: cocoon_20_branch hsqldb.jar
Log:
Add HSQLDB Server Component to C2.0 - Sync with C2.1
Revision Changes Path
No revision
No revision
1.1.1.1.2.1 +1 -1 xml-cocoon2/database.properties
Index: database.properties
===================================================================
RCS file: /home/cvs/xml-cocoon2/database.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- database.properties 2001/05/09 20:49:26 1.1.1.1
+++ database.properties 2001/09/10 10:59:57 1.1.1.1.2.1
@@ -2,7 +2,7 @@
database-driver=org.hsqldb.jdbcDriver
# Specify the URL for the Database
-database-url=jdbc:hsqldb:${install.war}/cocoon/WEB-INF/db/cocoondb
+database-url=jdbc:hsqldb:hsql://localhost:9002
# Specify the user id
database-user=sa
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/lib/hsqldb-1.61.jar
<<Binary file>>
No revision
No revision
1.9.2.18 +14 -2 xml-cocoon2/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.9.2.17
retrieving revision 1.9.2.18
diff -u -r1.9.2.17 -r1.9.2.18
--- Cocoon.java 2001/09/08 11:46:00 1.9.2.17
+++ Cocoon.java 2001/09/10 10:59:58 1.9.2.18
@@ -24,6 +24,7 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.hsqldb.Server;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import org.apache.cocoon.components.parser.Parser;
@@ -57,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache
Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Revision: 1.9.2.17 $ $Date: 2001/09/08 11:46:00 $
+ * @version CVS $Revision: 1.9.2.18 $ $Date: 2001/09/10 10:59:58 $
*/
public class Cocoon
extends AbstractLoggable
@@ -219,7 +220,18 @@
getLogger().debug("Sitemap location = " + this.sitemapFileName);
getLogger().debug("Checking sitemap reload = " + this.checkSitemapReload);
getLogger().debug("Reloading sitemap asynchron = " +
this.reloadSitemapAsynchron);
- }
+
+ // Start the database server
+ Server server = null;
+ try {
+ getLogger().debug("Starting database server");
+ server = (Server) this.componentManager.lookup(Server.ROLE);
+ } catch (Exception e){
+ getLogger().error("Error starting database server",e);
+ } finally {
+ this.componentManager.release(server);
+ }
+ }
/** Dump System Properties */
private void dumpSystemProperties() {
1.6.2.15 +4 -0 xml-cocoon2/src/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.6.2.14
retrieving revision 1.6.2.15
diff -u -r1.6.2.14 -r1.6.2.15
--- cocoon.roles 2001/09/05 22:18:10 1.6.2.14
+++ cocoon.roles 2001/09/10 10:59:58 1.6.2.15
@@ -96,4 +96,8 @@
shorthand="store-janitor"
default-class="org.apache.cocoon.components.store.StoreJanitorImpl"/>
+ <role name="org.apache.cocoon.components.hsqldb.Server"
+ shorthand="hsqldb-server"
+ default-class="org.apache.cocoon.components.hsqldb.ServerImpl"/>
+
</role-list>
No revision
No revision
1.1.2.1 +1 -1 xml-cocoon2/src/org/apache/cocoon/components/hsqldb/Server.java
Index: Server.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/hsqldb/Server.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Server.java 2001/09/08 16:20:38 1.1
+++ Server.java 2001/09/10 10:59:58 1.1.2.1
@@ -12,7 +12,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/09/08 16:20:38 $
+ * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/09/10 10:59:58 $
*/
public interface Server extends Component {
String ROLE = "org.apache.cocoon.components.hsqldb.Server";
1.2.2.1 +0 -0
xml-cocoon2/src/org/apache/cocoon/components/hsqldb/ServerImpl.java
Index: ServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/hsqldb/ServerImpl.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
No revision
No revision
1.7.2.22 +12 -0 xml-cocoon2/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
retrieving revision 1.7.2.21
retrieving revision 1.7.2.22
diff -u -r1.7.2.21 -r1.7.2.22
--- cocoon.xconf 2001/09/05 22:18:16 1.7.2.21
+++ cocoon.xconf 2001/09/10 10:59:58 1.7.2.22
@@ -18,6 +18,18 @@
<parser class="org.apache.cocoon.components.parser.XercesParser"/>
-->
+ <!-- HSQLDB Server for samples. Comment this section out if you don't care about
the samples.
+ port : number port where the server is listening
+ silent : true/false display all queries
+ trace : true/false display JDBC trace messages
+ -->
+ <hsqldb-server class="org.apache.cocoon.components.hsqldb.ServerImpl"
+ pool-max="1" pool-min="1">
+ <parameter name="port" value="9002"/>
+ <parameter name="silent" value="true"/>
+ <parameter name="trace" value="false"/>
+ </hsqldb-server>
+
<!-- Storing:
maxobjects: Indicates how many objects will be hold in the cache.
When the number of maxobjects has been reached. The
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
