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 2008/05/30 12:19:43 UTC
svn commit: r661631 - in /jackrabbit/branches/1.4/jackrabbit-core: ./
src/main/java/org/apache/jackrabbit/core/persistence/bundle/
Author: jukka
Date: Fri May 30 03:19:40 2008
New Revision: 661631
URL: http://svn.apache.org/viewvc?rev=661631&view=rev
Log:
1.4: Merged revision 654514 (JCR-1562)
Modified:
jackrabbit/branches/1.4/jackrabbit-core/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 30 03:19:40 2008
@@ -1 +1 @@
-/jackrabbit/trunk/jackrabbit-core:655917,656240,658583
+/jackrabbit/trunk/jackrabbit-core:654514,655917,656240,658583
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java?rev=661631&r1=661630&r2=661631&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java Fri May 30 03:19:40 2008
@@ -251,12 +251,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/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java?rev=661631&r1=661630&r2=661631&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java Fri May 30 03:19:40 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=""/>
@@ -84,12 +84,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/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java?rev=661631&r1=661630&r2=661631&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java Fri May 30 03:19:40 2008
@@ -48,8 +48,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/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java?rev=661631&r1=661630&r2=661631&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java Fri May 30 03:19:40 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=""/>
@@ -98,12 +98,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");
}