You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2008/05/08 15:02:09 UTC
svn commit: r654514 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle:
DerbyPersistenceManager.java H2PersistenceManager.java
Oracle9PersistenceManager.java OraclePersistenceManager.java
Author: thomasm
Date: Thu May 8 06:02:09 2008
New Revision: 654514
URL: http://svn.apache.org/viewvc?rev=654514&view=rev
Log:
JCR-1562: JNDI data sources with various PersistenceManager: wrong default values
Modified:
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/Oracle9PersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java?rev=654514&r1=654513&r2=654514&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java Thu May 8 06:02:09 2008
@@ -248,12 +248,6 @@
if (getUrl() == null) {
setUrl("jdbc:derby:" + context.getHomeDir().getPath() + "/db/itemState;create=true");
}
- if (getUser() == null) {
- setUser("");
- }
- if (getPassword() == null) {
- setPassword("");
- }
if (getSchemaObjectPrefix() == null) {
setSchemaObjectPrefix("");
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java?rev=654514&r1=654513&r2=654514&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java Thu May 8 06:02:09 2008
@@ -34,8 +34,8 @@
* <param name="{@link #setMinBlobSize(String) minBlobSize}" value="16384"/>
* <param name="{@link #setDriver(String) driver}" value="org.h2.Driver"/>
* <param name="{@link #setUrl(String) url}" value="jdbc:h2:file:${wsp.home}/db/itemState"/>
- * <param name="{@link #setUser(String) user}" value="sa"/>
- * <param name="{@link #setPassword(String) password}" value="sa"/>
+ * <param name="{@link #setUser(String) user}" value=""/>
+ * <param name="{@link #setPassword(String) password}" value=""/>
* <param name="{@link #setSchema(String) schema}" value="h2"/>
* <param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value=""/>
* <param name="{@link #setErrorHandling(String) errorHandling}" value=""/>
@@ -81,12 +81,6 @@
if (getUrl() == null) {
setUrl("jdbc:h2:file:" + context.getHomeDir().getPath() + "/db/itemState");
}
- if (getUser() == null) {
- setUser("sa");
- }
- if (getPassword() == null) {
- setPassword("sa");
- }
if (getSchema() == null) {
setSchema("h2");
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java?rev=654514&r1=654513&r2=654514&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java Thu May 8 06:02:09 2008
@@ -49,8 +49,8 @@
* <li><param name="{@link #setMinBlobSize(String) minBlobSize}" value="16384"/>
* <li><param name="{@link #setDriver(String) driver}" value="oracle.jdbc.OracleDriverr"/>
* <li><param name="{@link #setUrl(String) url}" value="jdbc:oracle:thin:@127.0.0.1:1521:xe"/>
- * <li><param name="{@link #setUser(String) user}" value="crx"/>
- * <li><param name="{@link #setPassword(String) password}" value="crx"/>
+ * <li><param name="{@link #setUser(String) user}" value=""/>
+ * <li><param name="{@link #setPassword(String) password}" value=""/>
* <li><param name="{@link #setSchema(String) schema}" value="oracle"/>
* <li><param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value="${wsp.name}_"/>
* <li><param name="{@link #setErrorHandling(String) errorHandling}" value=""/>
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java?rev=654514&r1=654513&r2=654514&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java Thu May 8 06:02:09 2008
@@ -37,8 +37,8 @@
* <li><param name="{@link #setMinBlobSize(String) minBlobSize}" value="16384"/>
* <li><param name="{@link #setDriver(String) driver}" value="oracle.jdbc.OracleDriverr"/>
* <li><param name="{@link #setUrl(String) url}" value="jdbc:oracle:thin:@127.0.0.1:1521:xe"/>
- * <li><param name="{@link #setUser(String) user}" value="crx"/>
- * <li><param name="{@link #setPassword(String) password}" value="crx"/>
+ * <li><param name="{@link #setUser(String) user}" value=""/>
+ * <li><param name="{@link #setPassword(String) password}" value=""/>
* <li><param name="{@link #setSchema(String) schema}" value="oracle"/>
* <li><param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value="${wsp.name}_"/>
* <li><param name="{@link #setTableSpace(String) tableSpace}" value=""/>
@@ -95,12 +95,6 @@
if (getUrl() == null) {
setUrl("jdbc:oracle:thin:@127.0.0.1:1521:xe");
}
- if (getUser() == null) {
- setUser("crx");
- }
- if (getPassword() == null) {
- setPassword("crx");
- }
if (getSchema() == null) {
setSchema("oracle");
}