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 2009/12/02 17:43:22 UTC
svn commit: r886200 - in /jackrabbit/trunk/jackrabbit-core/src:
main/java/org/apache/jackrabbit/core/config/
test/java/org/apache/jackrabbit/core/config/
Author: jukka
Date: Wed Dec 2 16:43:19 2009
New Revision: 886200
URL: http://svn.apache.org/viewvc?rev=886200&view=rev
Log:
JCR-1456: Database connection pooling
Hide the new RepositoryConfigurationParser constructor signature.
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/SecurityConfigTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/WorkspaceConfigTest.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java?rev=886200&r1=886199&r2=886200&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java Wed Dec 2 16:43:19 2009
@@ -213,16 +213,28 @@
private static final String CLUSTER_NODE_ID_FILE = "cluster_node.id";
/**
- * Creates a new configuration parser with the given parser variables.
+ * Creates a new configuration parser with the given parser variables
+ * and connection factory.
*
* @param variables parser variables
+ * @param connectionFactory connection factory
*/
- public RepositoryConfigurationParser(Properties variables, ConnectionFactory connectionFactory) {
+ protected RepositoryConfigurationParser(
+ Properties variables, ConnectionFactory connectionFactory) {
super(variables);
this.connectionFactory = connectionFactory;
}
/**
+ * Creates a new configuration parser with the given parser variables.
+ *
+ * @param variables parser variables
+ */
+ public RepositoryConfigurationParser(Properties variables) {
+ this(variables, new ConnectionFactory());
+ }
+
+ /**
* Parses repository configuration. Repository configuration uses the
* following format:
* <pre>
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/SecurityConfigTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/SecurityConfigTest.java?rev=886200&r1=886199&r2=886200&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/SecurityConfigTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/SecurityConfigTest.java Wed Dec 2 16:43:19 2009
@@ -58,7 +58,7 @@
protected void setUp() throws Exception {
super.setUp();
- parser = new RepositoryConfigurationParser(new Properties(), null);
+ parser = new RepositoryConfigurationParser(new Properties());
}
protected void tearDown() throws Exception {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/WorkspaceConfigTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/WorkspaceConfigTest.java?rev=886200&r1=886199&r2=886200&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/WorkspaceConfigTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/WorkspaceConfigTest.java Wed Dec 2 16:43:19 2009
@@ -47,7 +47,7 @@
protected void setUp() {
Properties variables = new Properties();
variables.setProperty("wsp.home", "target");
- parser = new RepositoryConfigurationParser(variables, null);
+ parser = new RepositoryConfigurationParser(variables);
}
/**