You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/11/18 10:34:33 UTC
svn commit: r1036365 - in /jackrabbit/trunk/jackrabbit-core/src:
main/java/org/apache/jackrabbit/core/persistence/bundle/
main/java/org/apache/jackrabbit/core/persistence/pool/
main/resources/org/apache/jackrabbit/core/config/
test/java/org/apache/jack...
Author: jukka
Date: Thu Nov 18 09:34:32 2010
New Revision: 1036365
URL: http://svn.apache.org/viewvc?rev=1036365&view=rev
Log:
JCR-2803: Deprecate non-pooled bundle DB persistence managers
Replace old bundle db persistence manager with the pooled versions.
All existing configuration should still work thanks to the deprecation
mappings and the fact that the pooled bundle db persistence managers
support all the same configuration options as the non-pooled ones did.
Removed:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConnectionFactory.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConnectionRecoveryManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DbNameIndex.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/MSSqlPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/MySqlPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/NGKDbNameIndex.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/PostgreSQLNameIndex.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/PostgreSQLPersistenceManager.java
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/deprecated-classes.properties
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/PersistenceManagerTest.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java?rev=1036365&r1=1036364&r2=1036365&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java Thu Nov 18 09:34:32 2010
@@ -582,7 +582,7 @@ public class BundleDbPersistenceManager
*/
protected CheckSchemaOperation createCheckSchemaOperation() {
InputStream in =
- org.apache.jackrabbit.core.persistence.bundle.BundleDbPersistenceManager.class.getResourceAsStream(
+ AbstractBundlePersistenceManager.class.getResourceAsStream(
databaseType + ".ddl");
return new CheckSchemaOperation(conHelper, in, schemaObjectPrefix + "BUNDLE").addVariableReplacement(
CheckSchemaOperation.SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix);
Modified: jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/deprecated-classes.properties
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/deprecated-classes.properties?rev=1036365&r1=1036364&r2=1036365&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/deprecated-classes.properties (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/deprecated-classes.properties Thu Nov 18 09:34:32 2010
@@ -38,3 +38,13 @@ org.apache.jackrabbit.core.state.xml.XML
# "Pooled" bundle fs persistence manager
org.apache.jackrabbit.core.persistence.pool.BundleFsPersistenceManager=org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager
+
+# Non-pooled bundle db persistence managers
+org.apache.jackrabbit.core.persistence.bundle.BundleDbPersistenceManager=org.apache.jackrabbit.core.persistence.pool.BundleDbPersistenceManager
+org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager=org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager
+org.apache.jackrabbit.core.persistence.bundle.H2PersistenceManager=org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager
+org.apache.jackrabbit.core.persistence.bundle.MSSqlPersistenceManager=org.apache.jackrabbit.core.persistence.pool.MSSqlPersistenceManager
+org.apache.jackrabbit.core.persistence.bundle.MySqlPersistenceManager=org.apache.jackrabbit.core.persistence.pool.MySqlPersistenceManager
+org.apache.jackrabbit.core.persistence.bundle.OraclePersistenceManager=org.apache.jackrabbit.core.persistence.pool.OraclePersistenceManager
+org.apache.jackrabbit.core.persistence.bundle.Oracle9PersistenceManager=org.apache.jackrabbit.core.persistence.pool.Oracle9PersistenceManager
+org.apache.jackrabbit.core.persistence.bundle.PostgreSQLPersistenceManager=org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/PersistenceManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/PersistenceManagerTest.java?rev=1036365&r1=1036364&r2=1036365&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/PersistenceManagerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/PersistenceManagerTest.java Thu Nov 18 09:34:32 2010
@@ -94,22 +94,6 @@ public class PersistenceManagerTest exte
assertPersistenceManager(manager);
}
- public void testDerbyBundlePersistenceManager() throws Exception {
- org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager manager =
- new org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager();
- manager.setDriver("org.apache.derby.jdbc.EmbeddedDriver");
- manager.setUrl("jdbc:derby:" + database.getPath() + ";create=true");
- assertPersistenceManager(manager);
- }
-
- public void testH2BundlePersistenceManager() throws Exception {
- org.apache.jackrabbit.core.persistence.bundle.H2PersistenceManager manager =
- new org.apache.jackrabbit.core.persistence.bundle.H2PersistenceManager();
- manager.setDriver("org.h2.Driver");
- manager.setUrl("jdbc:h2:mem:" + database.getPath());
- assertPersistenceManager(manager);
- }
-
public void testDerbyPoolPersistenceManager() throws Exception {
org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager manager =
new org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager();