cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r424752 - in /cocoon/trunk/blocks: cocoon-databases/ cocoon-databases/cocoon-databases-hsqldb-client/ cocoon-databases/cocoon-databases-hsqldb-client/src/ cocoon-databases/cocoon-databases-hsqldb-client/src/main/ cocoon-databases/cocoon-dat...
Date Sun, 23 Jul 2006 15:24:47 GMT
Author: cziegeler
Date: Sun Jul 23 08:24:46 2006
New Revision: 424752

URL: http://svn.apache.org/viewvc?rev=424752&view=rev
Log:
Split up hsqldb into server and client, clean up dependencies a little bit

Added:
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml   (with props)
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/properties/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/properties/cocoon-databases-hsqldb-client.properties
  (with props)
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/xconf/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/xconf/cocoon-databases-sample.xconf
  (with props)
Modified:
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/legacy/xconf/cocoon-databases.xconf
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
    cocoon/trunk/blocks/cocoon-databases/pom.xml
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/legacy/xconf/cocoon-hsqldb.xconf
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/properties/hsqldb.properties

Added: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml?rev=424752&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml (added)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml Sun Jul 23
08:24:46 2006
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-databases</artifactId>
+    <version>1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.cocoon</groupId>
+  <artifactId>cocoon-databases-hsqldb-client</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>hsqldb client Implementation</name>
+  <description/>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/properties/cocoon-databases-hsqldb-client.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/properties/cocoon-databases-hsqldb-client.properties?rev=424752&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/properties/cocoon-databases-hsqldb-client.properties
(added)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/properties/cocoon-databases-hsqldb-client.properties
Sun Jul 23 08:24:46 2006
@@ -0,0 +1 @@
+org.apache.cocoon.classloader.load.classes.hsqldb=org.hsqldb.jdbcDriver
\ No newline at end of file

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/properties/cocoon-databases-hsqldb-client.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/src/main/resources/META-INF/properties/cocoon-databases-hsqldb-client.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/legacy/xconf/cocoon-databases.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/legacy/xconf/cocoon-databases.xconf?rev=424752&r1=424751&r2=424752&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/legacy/xconf/cocoon-databases.xconf
(original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/legacy/xconf/cocoon-databases.xconf
Sun Jul 23 08:24:46 2006
@@ -17,7 +17,7 @@
 
 <!--+
     |
-    | SVN $Id$
+    | @version $Id$
     +-->
 <components>
   <!-- Include roles -->
@@ -27,41 +27,6 @@
     <!-- blob pseudo protocol -->
     <component-instance name="blob" class="org.apache.cocoon.components.source.impl.BlobSourceFactory"/>
   </source-factories>
-
-  <!-- JDBC datasources. No actual source is declared here. The one below is declared
-       in the hdslqb block used for Cocoon sample
-       
-  <datasources>
-    <!- -
-      - See Excalibur documentation for details
-      - http://excalibur.apache.org/apidocs/org/apache/avalon/excalibur/datasource/ResourceLimitingJdbcDataSource.html
-      - ->
-    <jdbc logger="core.datasources.personnel" name="personnel">
-      <!- -
-        - If you have an Oracle database, and are using the the
-        - pool-controller below, you should add the attribute
-        - "oradb" and set it to true.
-        -
-        - <pool-controller min="5" max="10" oradb="true"/>
-        -
-        - That way the test to see if the server has disconnected
-        - the JdbcConnection will function properly.
-        - ->
-      <pool-controller max="10" min="5" timeout="30000"/>
-      <!- -
-        - If you need to ensure an autocommit is set to true or
-        - false, then create the "auto-commit" element below.
-        -
-        - <auto-commit>false</auto-commit>
-        -
-        - The default is true.
-        - ->
-      <dburl>jdbc:hsqldb:hsql://localhost:9002</dburl>
-      <user>sa</user>
-      <password></password>
-    </jdbc>
-  </datasources>
-  -->
 
   <input-modules>
     <component-instance logger="core.modules.input" name="collection" 	class="org.apache.cocoon.components.modules.input.CollectionMetaModule"/>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml?rev=424752&r1=424751&r2=424752&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml Sun Jul 23 08:24:46
2006
@@ -35,5 +35,15 @@
       <artifactId>cocoon-databases-impl</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-hsqldb-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-databases-hsqldb-client</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>

Added: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/xconf/cocoon-databases-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/xconf/cocoon-databases-sample.xconf?rev=424752&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/xconf/cocoon-databases-sample.xconf
(added)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/xconf/cocoon-databases-sample.xconf
Sun Jul 23 08:24:46 2006
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2005 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--+
+    |
+    | @version $Id$
+    +-->
+<components>
+  <include src="resource://org/apache/cocoon/components/database/database.roles"/>
+
+  <!-- Datasource for the database samples. -->
+  <datasources>
+    <!- -
+      - See Excalibur documentation for details
+      - http://excalibur.apache.org/apidocs/org/apache/avalon/excalibur/datasource/ResourceLimitingJdbcDataSource.html
+      - ->
+    <jdbc logger="core.datasources.personnel" name="personnel">
+      <!--
+          If you have an Oracle database, and are using the the
+      pool-controller below, you should add the attribute
+      "oradb" and set it to true.
+
+      <pool-controller min="5" max="10" oradb="true"/>
+
+      That way the test to see if the server has disconnected
+      the JdbcConnection will function properly.
+      -->
+      <pool-controller max="10" min="5"/>
+      <!--
+          If you need to ensure an autocommit is set to true or
+      false, then create the "auto-commit" element below.
+
+      <auto-commit>false</auto-commit>
+
+      The default is true.
+      -->
+      <dburl>jdbc:hsqldb:hsql://localhost:${org.apache.cocoon.hsqldb.server.port}</dburl>
+      <user>sa</user>
+      <password></password>
+    </jdbc>
+  </datasources>
+</components>

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/xconf/cocoon-databases-sample.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/legacy/xconf/cocoon-databases-sample.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-databases/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/pom.xml?rev=424752&r1=424751&r2=424752&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/pom.xml Sun Jul 23 08:24:46 2006
@@ -34,5 +34,6 @@
     <module>cocoon-databases-impl</module>
     <module>cocoon-databases-mocks</module>
     <module>cocoon-databases-sample</module>
+    <module>cocoon-databases-hsqldb-client</module>
   </modules>
 </project>

Modified: cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/legacy/xconf/cocoon-hsqldb.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/legacy/xconf/cocoon-hsqldb.xconf?rev=424752&r1=424751&r2=424752&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/legacy/xconf/cocoon-hsqldb.xconf
(original)
+++ cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/legacy/xconf/cocoon-hsqldb.xconf
Sun Jul 23 08:24:46 2006
@@ -17,11 +17,10 @@
 
 <!--+
     |
-    | SVN $Id$
+    | @version $Id$
     +-->
 <components>
   <!-- Include roles -->
-  <include src="resource://org/apache/cocoon/components/database/database.roles"/>
   <include src="resource://org/apache/cocoon/components/hsqldb/hsqldb.roles"/>
 
   <!--+
@@ -33,40 +32,12 @@
       |  name   : string      name of the HSQL-DB
       |  path   : string      path to the database - context-protocol is resolved
       +-->
-  <hsqldb-server class="org.apache.cocoon.components.hsqldb.ServerImpl"
-                 logger="core.hsqldb-server">
-     <parameter name="port" value="${org.apache.cocoon.hsqldb.server-port}"/>
+  <hsqldb-server logger="core.hsqldb-server">
+     <parameter name="port" value="${org.apache.cocoon.hsqldb.server.port}"/>
      <parameter name="silent" value="true"/>
      <parameter name="trace" value="false"/>
      <parameter name="thread-pool-name" value="daemon"/>
      <parameter name="name" value="cocoondb"/>
-     <parameter name="path" value="context://WEB-INF/db"/>
+     <parameter name="path" value="${org.apache.cocoon.hsqldb.server.db.path}"/>
   </hsqldb-server>
-
-  <datasources>
-    <jdbc logger="core.datasources.personnel" name="personnel">
-      <!--
-          If you have an Oracle database, and are using the the
-      pool-controller below, you should add the attribute
-      "oradb" and set it to true.
-
-      <pool-controller min="5" max="10" oradb="true"/>
-
-      That way the test to see if the server has disconnected
-      the JdbcConnection will function properly.
-      -->
-      <pool-controller max="10" min="5"/>
-      <!--
-          If you need to ensure an autocommit is set to true or
-      false, then create the "auto-commit" element below.
-
-      <auto-commit>false</auto-commit>
-
-      The default is true.
-      -->
-      <dburl>jdbc:hsqldb:hsql://localhost:${org.apache.cocoon.hsqldb.server-port}</dburl>
-      <user>sa</user>
-      <password></password>
-    </jdbc>
-  </datasources>
 </components>

Modified: cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/properties/hsqldb.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/properties/hsqldb.properties?rev=424752&r1=424751&r2=424752&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/properties/hsqldb.properties
(original)
+++ cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/properties/hsqldb.properties
Sun Jul 23 08:24:46 2006
@@ -1,2 +1 @@
-org.apache.cocoon.hsqldb.server-port=9002
 org.apache.cocoon.classloader.load.classes.hsqldb=org.hsqldb.jdbcDriver



Mime
View raw message