Return-Path: 
 <cvs-return-24976-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 79277 invoked from network); 26 Oct 2005 09:50:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 26 Oct 2005 09:50:00 -0000
Received: (qmail 57205 invoked by uid 500); 26 Oct 2005 09:50:00 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 57063 invoked by uid 500); 26 Oct 2005 09:49:59 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 57051 invoked by uid 99); 26 Oct 2005 09:49:59 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 26 Oct 2005 02:49:59 -0700
Received: (qmail 79115 invoked by uid 65534); 26 Oct 2005 09:49:39 -0000
Message-ID: <20051026094939.79114.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r328613 - in /cocoon/blocks:
 databases/trunk/WEB-INF/xconf/cocoon-databases.xconf
 hsqldb/trunk/WEB-INF/properties/cocoon-hsqldb.properties
 hsqldb/trunk/WEB-INF/xconf/cocoon-hsqldb.xconf
Date: Wed, 26 Oct 2005 09:49:38 -0000
To: cvs@cocoon.apache.org
From: sylvain@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: sylvain
Date: Wed Oct 26 02:49:32 2005
New Revision: 328613

URL: http://svn.apache.org/viewcvs?rev=328613&view=rev
Log:
Read hsqldb server port from properties

Modified:
    cocoon/blocks/databases/trunk/WEB-INF/xconf/cocoon-databases.xconf
    cocoon/blocks/hsqldb/trunk/WEB-INF/properties/cocoon-hsqldb.properties
    cocoon/blocks/hsqldb/trunk/WEB-INF/xconf/cocoon-hsqldb.xconf

Modified: cocoon/blocks/databases/trunk/WEB-INF/xconf/cocoon-databases.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/databases/trunk/WEB-INF/xconf/cocoon-databases.xconf?rev=328613&r1=328612&r2=328613&view=diff
==============================================================================
--- cocoon/blocks/databases/trunk/WEB-INF/xconf/cocoon-databases.xconf (original)
+++ cocoon/blocks/databases/trunk/WEB-INF/xconf/cocoon-databases.xconf Wed Oct 26 02:49:32 2005
@@ -27,10 +27,13 @@
     <!-- 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>
     <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.
@@ -39,22 +42,23 @@
 
       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: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"/>
   </input-modules>

Modified: cocoon/blocks/hsqldb/trunk/WEB-INF/properties/cocoon-hsqldb.properties
URL: http://svn.apache.org/viewcvs/cocoon/blocks/hsqldb/trunk/WEB-INF/properties/cocoon-hsqldb.properties?rev=328613&r1=328612&r2=328613&view=diff
==============================================================================
--- cocoon/blocks/hsqldb/trunk/WEB-INF/properties/cocoon-hsqldb.properties (original)
+++ cocoon/blocks/hsqldb/trunk/WEB-INF/properties/cocoon-hsqldb.properties Wed Oct 26 02:49:32 2005
@@ -12,3 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 org.apache.cocoon.classloader.load.classes=org.hsqldb.jdbcDriver
+org.apache.cocoon.hsqldb.server-port=9002

Modified: cocoon/blocks/hsqldb/trunk/WEB-INF/xconf/cocoon-hsqldb.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/hsqldb/trunk/WEB-INF/xconf/cocoon-hsqldb.xconf?rev=328613&r1=328612&r2=328613&view=diff
==============================================================================
--- cocoon/blocks/hsqldb/trunk/WEB-INF/xconf/cocoon-hsqldb.xconf (original)
+++ cocoon/blocks/hsqldb/trunk/WEB-INF/xconf/cocoon-hsqldb.xconf Wed Oct 26 02:49:32 2005
@@ -21,6 +21,7 @@
     +-->
 <components>
   <!-- Include roles -->
+  <include src="resource://org/apache/cocoon/components/database/database.roles"/>
   <include src="resource://org/apache/cocoon/components/hsqldb/hsqldb.roles"/>
 
   <!--+
@@ -34,7 +35,7 @@
       +-->
   <hsqldb-server class="org.apache.cocoon.components.hsqldb.ServerImpl"
                  logger="core.hsqldb-server">
-     <parameter name="port" value="9002"/>
+     <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"/>
@@ -42,4 +43,30 @@
      <parameter name="path" value="context://WEB-INF/db"/>
   </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>