Index: src/webapp/WEB-INF/assembly/boot/datasource.xml
===================================================================
--- src/webapp/WEB-INF/assembly/boot/datasource.xml	(revision 233258)
+++ src/webapp/WEB-INF/assembly/boot/datasource.xml	(working copy)
@@ -2,36 +2,43 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>		
   <!-- 
-	  Creates a JNDI-based datasource bean name JetspeedDS.
-	  The  jdbc-connection-descriptor jcd-alias property must
-	  be set to match this.  The jdbc-connection-descriptor can
-	  be located under /etc/db-ojb/repository_database.xml in the
-	  source tree.  The LocalOjbConfigurer defined below is responsible 
-	  for matching Spring-managed datasources with there proper 
-	  bean definition.
-	  
-	  Another requirement for this to work is to have the 
-	  ConnectionFactoryClass=org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory 
-      This property is located in /etc/db-ojb/OJB.properties in the source tree.	 
-	  
-	  FYI: The two OJB configuration files mentioned above are currently already setup this way 
-	  in the default Jetspeed implementation.  
-	  
-	  However, if you need to locate/modify these files in a running instance of jetspeed,
-	  they will be located under /WEB-INF/classes.
-	 -->
-  <bean id="JetspeedDS" class="org.springframework.jndi.JndiObjectFactoryBean">
+      Creates a JNDI-based datasource bean name "JetspeedDS". The information
+      provided here is merged with the basic configuration for the 
+      jdbc-connection-descriptor with the matching jcd-alias property
+      ("JetspeedDS") located under /etc/db-ojb/repository_database.xml in the
+      source tree.
+
+      Another requirement for this to work is to have the 
+      ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
+      or to have
+      ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl.
+      (either will do, both are recommended, see comments in configuration file).
+      These properties are located in /etc/db-ojb/OJB.properties in the source tree.
+          
+      FYI: The two OJB configuration files mentioned above are currently already setup this way 
+      in the default Jetspeed implementation.  
+          
+      However, if you need to locate/modify these files in a running instance of jetspeed,
+      they will be located under /WEB-INF/classes.
+     -->
+  <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
     <property name="jndiName">
       <value>java:comp/env/jdbc/jetspeed</value>
     </property>
   </bean>     
   
   <!-- If would like use a commons DBCP Pooled datasource as opposed to the default 
-	   JNDI one above you can uncomment the configuration below and fill in 
-	   the datasource information as it relates to your environment.
-	-->
+       JNDI one above you can uncomment the configuration below and fill in 
+       the datasource information as it relates to your environment.
+
+       A requirement for this to work is to have the 
+       ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
+       or to have
+       ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl
+       This property is located in /etc/db-ojb/OJB.properties in the source tree.
+    -->
 	<!--
-    <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
     <property name="driverClassName">
       <value>{my.drivers.class.name}</value>
     </property>
@@ -47,9 +54,4 @@
    </bean>      
    -->
   
-  <!-- OJB Locale Configurer 
-	 - see: http://www.springframework.org/docs/reference/orm.html#d0e7571
-	-->
-	
-  <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>    	
-</beans>
\ No newline at end of file
+</beans>
Index: etc/db-ojb/repository_database.xml
===================================================================
--- etc/db-ojb/repository_database.xml	(revision 233258)
+++ etc/db-ojb/repository_database.xml	(working copy)
@@ -32,14 +32,15 @@
 -->
 
 <!-- 
-	There is no need to specify any DB or JNDI info as the org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
-	defined in OJB.properties will be using a matching Datasource that is defined in Spring.
+	This is just a partial definition. The properties given will be merged 
+	with additional properties by a ConnectionRepositoryEntry JavaBean
+	instantiated in datasource.xml. This bean handles configuration of the
+	jndi name of this connection descriptor and all properties that can
+	dynamically be derived from the data source.
 	-->
     <jdbc-connection-descriptor
         jcd-alias="JetspeedDS"
-        platform="@PLATFORM@"
         default-connection="true"
-        jdbc-level="2.0"
         batch-mode="false"
      >
         <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
Index: etc/db-ojb/test-repository-datasource-spring.xml
===================================================================
--- etc/db-ojb/test-repository-datasource-spring.xml	(revision 233258)
+++ etc/db-ojb/test-repository-datasource-spring.xml	(working copy)
@@ -3,7 +3,7 @@
 <beans>		
 
   <!-- datasource bean -->
-  <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+  <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
     <property name="driverClassName">
       <value>${org.apache.jetspeed.database.driver}</value>
     </property>
@@ -16,11 +16,8 @@
     <property name="password">
       <value>${org.apache.jetspeed.database.password}</value>
     </property>
-  </bean>      
+  </bean>     
      
-  <!-- OJB configurer -->
-  <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>    	
-
   <!-- properties configurer used to pick up system properties -->
   <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
Index: etc/db-ojb/OJB.properties
===================================================================
--- etc/db-ojb/OJB.properties	(revision 233258)
+++ etc/db-ojb/OJB.properties	(working copy)
@@ -131,12 +131,15 @@
 # this default connection factory entry in each JDBCConnectionDescriptor.
 #
 
+# Note that due to using org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl as
+# ConnectionManager (see below) this connection factory class will be used
+# as a fallback only, i.e. if no special connection factory has been defined
+# in the JDBC connection descriptor.
+
 #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryPooledImpl
-# Use Spring managed-connections instead
-ConnectionFactoryClass=org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
-
 #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryNotPooledImpl
-#ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
+ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
+#ConnectionFactoryClass=org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
 #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
 #
 #
@@ -144,9 +147,16 @@
 # ConnectionManager
 #----------------------------------------------------------------------------------------
 # The ConnectionManagerClass entry defines the ConnectionManager implemementation to be used
-ConnectionManagerClass=org.apache.ojb.broker.accesslayer.ConnectionManagerImpl
 #
+# It is recommended to use the improved connection manager provided by Jetspeed.
+# Instead of always using the ConnectionFactoryClass specified above, it uses the 
+# specific class configured for a JDBC connection descriptor (and the class specified
+# above as a fallback only).
+
+#ConnectionManagerClass=org.apache.ojb.broker.accesslayer.ConnectionManagerImpl
+ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl
 #
+#
 #----------------------------------------------------------------------------------------
 # SqlGenerator
 #----------------------------------------------------------------------------------------
@@ -459,4 +469,4 @@
 #----------------------------------------------------------------------------------------
 #----------------------------------------------------------------------------------------
 # End of OJB.properties file
-#----------------------------------------------------------------------------------------
\ No newline at end of file
+#----------------------------------------------------------------------------------------