jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marti...@apache.org
Subject svn commit: r800715 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db: DB2FileSystem.java MSSqlFileSystem.java
Date Tue, 04 Aug 2009 09:30:49 GMT
Author: martijnh
Date: Tue Aug  4 09:30:48 2009
New Revision: 800715

URL: http://svn.apache.org/viewvc?rev=800715&view=rev
Log:
JCR-2223 MSSqlFileSystem - JNDI & several configuration issues

Applied patch:
* Use null values for user and password such that JNDI configuration does not require a username/password
in the repository descriptor.
* Set tableSpace default to the empty string to prevent NPE.

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/MSSqlFileSystem.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java?rev=800715&r1=800714&r2=800715&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java
Tue Aug  4 09:30:48 2009
@@ -52,10 +52,6 @@
         // preset some attributes to reasonable defaults
         schema = "db2";
         driver = "com.ibm.db2.jcc.DB2Driver";
-        schemaObjectPrefix = "";
-        user = "";
-        password = "";
-        initialized = false;
     }
 
     //-----------------------------------------< DatabaseFileSystem overrides >

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/MSSqlFileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/MSSqlFileSystem.java?rev=800715&r1=800714&r2=800715&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/MSSqlFileSystem.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/MSSqlFileSystem.java
Tue Aug  4 09:30:48 2009
@@ -55,7 +55,7 @@
     public static final String TABLE_SPACE_VARIABLE = "${tableSpace}";
 
     /** the MS SQL table space to use */
-    protected String tableSpace;
+    protected String tableSpace = "";
 
     /**
      * Returns the configured MS SQL table space.
@@ -84,11 +84,6 @@
         // preset some attributes to reasonable defaults
         schema = "mssql";
         driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
-        schemaObjectPrefix = "";
-        user = "";
-        password = "";
-        tableSpace = null;
-        initialized = false;
     }
 
    protected String createSchemaSql(String sql) {



Mime
View raw message