Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/Oracle10R2FileSystem.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/Oracle10R2FileSystem.java (revision 0) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/Oracle10R2FileSystem.java (revision 0) @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jackrabbit.core.fs.db; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * {@inheritDoc} + *

+ * Oracle10R2FileSystem works for Oracle database version 10 R2+. + */ +public class Oracle10R2FileSystem extends OracleBaseFileSystem { + /** + * Logger instance + */ + private static Logger log = LoggerFactory.getLogger(Oracle10R2FileSystem.class); + + /** + * Creates a new Oracle10FileSystem instance. + */ + public Oracle10R2FileSystem() { + super(); + } +} Property changes on: jackrabbit-core\src\main\java\org\apache\jackrabbit\core\fs\db\Oracle10R2FileSystem.java ___________________________________________________________________ Name: svn:eol-style + native Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleBaseFileSystem.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleBaseFileSystem.java (revision 0) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleBaseFileSystem.java (revision 0) @@ -0,0 +1,284 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jackrabbit.core.fs.db; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.Statement; + +import javax.jcr.RepositoryException; + +import org.apache.commons.io.IOUtils; +import org.apache.jackrabbit.util.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * OracleBaseFileSystem is a JDBC-based FileSystem + * base implementation for Jackrabbit that persists file system entries in an + * Oracle database. + *

+ * It is configured through the following properties: + *

+ * See also {@link DbFileSystem}. + *

+ * The following is a fragment from a sample configuration: + * 

+ *   <FileSystem class="org.apache.jackrabbit.core.fs.db.Oracle*FileSystem">
+ *       <param name="url" value="jdbc:oracle:thin:@127.0.0.1:1521:orcl"/>
+ *       <param name="user" value="scott"/>
+ *       <param name="password" value="tiger"/>
+ *       <param name="schemaObjectPrefix" value="rep_"/>
+ *       <param name="tableSpace" value="default"/>
+ *  </FileSystem>
+ *
+ */ +public class OracleBaseFileSystem extends DbFileSystem { + /** + * Logger instance + */ + private static Logger log = LoggerFactory.getLogger(OracleBaseFileSystem.class); + + /** the variable for the Oracle table space */ + public static final String TABLE_SPACE_VARIABLE = "${tableSpace}"; + + /** the Oracle table space to use */ + protected String tableSpace; + + /** + * Creates a new OracleBaseFileSystem instance. + */ + protected OracleBaseFileSystem() { + // preset some attributes to reasonable defaults + schema = "oracle"; + driver = "oracle.jdbc.OracleDriver"; + schemaObjectPrefix = ""; + user = ""; + password = ""; + initialized = false; + } + + /** + * Returns the configured Oracle table space. + * @return the configured Oracle table space. + */ + public String getTableSpace() { + return tableSpace; + } + + /** + * Sets the Oracle table space. + * @param tableSpace the Oracle table space. + */ + public void setTableSpace(String tableSpace) { + if (tableSpace != null) { + this.tableSpace = tableSpace.trim(); + } else { + this.tableSpace = null; + } + } + + /** + * {@inheritDoc} + *

+ * Overridden in order to support multiple oracle schemas. Note that schema + * names in Oracle correspond to the username of the connection. See + * http://issues.apache.org/jira/browse/JCR-582 + * + * @throws Exception if an error occurs + */ + protected void checkSchema() throws Exception { + DatabaseMetaData metaData = con.getMetaData(); + String tableName = schemaObjectPrefix + "FSENTRY"; + if (metaData.storesLowerCaseIdentifiers()) { + tableName = tableName.toLowerCase(); + } else if (metaData.storesUpperCaseIdentifiers()) { + tableName = tableName.toUpperCase(); + } + String userName = metaData.getUserName(); + + ResultSet rs = metaData.getTables(null, userName, tableName, null); + boolean schemaExists; + try { + schemaExists = rs.next(); + } finally { + rs.close(); + } + + if (!schemaExists) { + // read ddl from resources + InputStream in = OracleFileSystem.class.getResourceAsStream(schema + ".ddl"); + if (in == null) { + String msg = "Configuration error: unknown schema '" + schema + "'"; + log.debug(msg); + throw new RepositoryException(msg); + } + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + Statement stmt = con.createStatement(); + try { + String sql = reader.readLine(); + while (sql != null) { + // Skip comments and empty lines + if (!sql.startsWith("#") && sql.length() > 0) { + // replace prefix variable + sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix); + + // set the tablespace if it is defined + String tspace; + if (tableSpace == null || "".equals(tableSpace)) { + tspace = ""; + } else { + tspace = "tablespace " + tableSpace; + } + sql = Text.replace(sql, TABLE_SPACE_VARIABLE, tspace).trim(); + + // execute sql stmt + stmt.executeUpdate(sql); + } + // read next sql stmt + sql = reader.readLine(); + } + } finally { + IOUtils.closeQuietly(in); + closeStatement(stmt); + } + } + } + + /** + * Builds the SQL statements + *

+ * Since Oracle treats emtpy strings and BLOBs as null values the SQL + * statements had to be adapated accordingly. The following changes were + * necessary: + *

+ */ + protected void buildSQLStatements() { + insertFileSQL = "insert into " + + schemaObjectPrefix + "FSENTRY " + + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, " + + "FSENTRY_LASTMOD, FSENTRY_LENGTH) " + + "values (?, ?, ?, ?, ?)"; + + insertFolderSQL = "insert into " + + schemaObjectPrefix + "FSENTRY " + + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_LASTMOD, FSENTRY_LENGTH) " + + "values (?, nvl(?, ' '), ?, null)"; + + updateDataSQL = "update " + + schemaObjectPrefix + "FSENTRY " + + "set FSENTRY_DATA = ?, FSENTRY_LASTMOD = ?, FSENTRY_LENGTH = ? " + + "where FSENTRY_PATH = ? and FSENTRY_NAME = ? " + + "and FSENTRY_LENGTH is not null"; + + updateLastModifiedSQL = "update " + + schemaObjectPrefix + "FSENTRY set FSENTRY_LASTMOD = ? " + + "where FSENTRY_PATH = ? and FSENTRY_NAME = ? " + + "and FSENTRY_LENGTH is not null"; + + selectExistSQL = "select 1 from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME = nvl(?, ' ')"; + + selectFileExistSQL = "select 1 from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; + + selectFolderExistSQL = "select 1 from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME = nvl(?, ' ') and FSENTRY_LENGTH is null"; + + selectFileNamesSQL = "select FSENTRY_NAME from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_LENGTH is not null"; + + selectFolderNamesSQL = "select FSENTRY_NAME from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME != ' ' " + + "and FSENTRY_LENGTH is null"; + + selectFileAndFolderNamesSQL = "select FSENTRY_NAME from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME != ' '"; + + selectChildCountSQL = "select count(FSENTRY_NAME) from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME != ' '"; + + selectDataSQL = "select nvl(FSENTRY_DATA, empty_blob()) from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; + + selectLastModifiedSQL = "select FSENTRY_LASTMOD from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME = nvl(?, ' ')"; + + selectLengthSQL = "select nvl(FSENTRY_LENGTH, 0) from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; + + deleteFileSQL = "delete from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; + + deleteFolderSQL = "delete from " + + schemaObjectPrefix + "FSENTRY where " + + "(FSENTRY_PATH = ? and FSENTRY_NAME = nvl(?, ' ') and FSENTRY_LENGTH is null) " + + "or (FSENTRY_PATH = ?) " + + "or (FSENTRY_PATH like ?) "; + + copyFileSQL = "insert into " + + schemaObjectPrefix + "FSENTRY " + + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, " + + "FSENTRY_LASTMOD, FSENTRY_LENGTH) " + + "select ?, ?, FSENTRY_DATA, " + + "FSENTRY_LASTMOD, FSENTRY_LENGTH from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; + + copyFilesSQL = "insert into " + + schemaObjectPrefix + "FSENTRY " + + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, " + + "FSENTRY_LASTMOD, FSENTRY_LENGTH) " + + "select ?, FSENTRY_NAME, FSENTRY_DATA, " + + "FSENTRY_LASTMOD, FSENTRY_LENGTH from " + + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " + + "and FSENTRY_LENGTH is not null"; + } +} Property changes on: jackrabbit-core\src\main\java\org\apache\jackrabbit\core\fs\db\OracleBaseFileSystem.java ___________________________________________________________________ Name: svn:eol-style + native Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java (revision 649584) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java (working copy) @@ -16,66 +16,32 @@ */ package org.apache.jackrabbit.core.fs.db; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.RandomAccessFile; +import java.lang.reflect.Method; +import java.sql.Blob; +import java.sql.Connection; + import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.util.Text; -import org.apache.jackrabbit.util.TransientFileFactory; import org.apache.jackrabbit.core.fs.FileSystemException; import org.apache.jackrabbit.core.fs.FileSystemPathUtil; import org.apache.jackrabbit.core.fs.RandomAccessOutputStream; +import org.apache.jackrabbit.util.TransientFileFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jcr.RepositoryException; -import java.sql.DatabaseMetaData; -import java.sql.ResultSet; -import java.sql.Statement; -import java.sql.Blob; -import java.sql.Connection; -import java.io.InputStream; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.IOException; -import java.io.File; -import java.io.FilterOutputStream; -import java.io.FileOutputStream; -import java.io.FileInputStream; -import java.io.RandomAccessFile; -import java.lang.reflect.Method; - /** - * OracleFileSystem is a JDBC-based FileSystem - * implementation for Jackrabbit that persists file system entries in an - * Oracle database. + * {@inheritDoc} *

- * It is configured through the following properties: - *

- * See also {@link DbFileSystem}. - *

- * The following is a fragment from a sample configuration: - * 

- *   <FileSystem class="org.apache.jackrabbit.core.fs.db.OracleFileSystem">
- *       <param name="url" value="jdbc:oracle:thin:@127.0.0.1:1521:orcl"/>
- *       <param name="user" value="scott"/>
- *       <param name="password" value="tiger"/>
- *       <param name="schemaObjectPrefix" value="rep_"/>
- *       <param name="tableSpace" value="default"/>
- *  </FileSystem>
- *
+ * OracleFileSystem works for Oracle database version up to, and including, 10 R1. */ -public class OracleFileSystem extends DbFileSystem { - +public class OracleFileSystem extends OracleBaseFileSystem { /** * Logger instance */ @@ -85,46 +51,6 @@ private Integer durationSessionConstant; private Integer modeReadWriteConstant; - /** the variable for the Oracle table space */ - public static final String TABLE_SPACE_VARIABLE = - "${tableSpace}"; - - /** the Oracle table space to use */ - protected String tableSpace; - - /** - * Creates a new OracleFileSystem instance. - */ - public OracleFileSystem() { - // preset some attributes to reasonable defaults - schema = "oracle"; - driver = "oracle.jdbc.OracleDriver"; - schemaObjectPrefix = ""; - user = ""; - password = ""; - initialized = false; - } - - /** - * Returns the configured Oracle table space. - * @return the configured Oracle table space. - */ - public String getTableSpace() { - return tableSpace; - } - - /** - * Sets the Oracle table space. - * @param tableSpace the Oracle table space. - */ - public void setTableSpace(String tableSpace) { - if (tableSpace != null) { - this.tableSpace = tableSpace.trim(); - } else { - this.tableSpace = null; - } - } - //-----------------------------------------< DatabaseFileSystem overrides > /** * {@inheritDoc} @@ -158,183 +84,6 @@ /** * {@inheritDoc} *

- * Overridden in order to support multiple oracle schemas. Note that - * schema names in Oracle correspond to the username of the connection. - * See http://issues.apache.org/jira/browse/JCR-582 - * - * @throws Exception if an error occurs - */ - protected void checkSchema() throws Exception { - DatabaseMetaData metaData = con.getMetaData(); - String tableName = schemaObjectPrefix + "FSENTRY"; - if (metaData.storesLowerCaseIdentifiers()) { - tableName = tableName.toLowerCase(); - } else if (metaData.storesUpperCaseIdentifiers()) { - tableName = tableName.toUpperCase(); - } - String userName = metaData.getUserName(); - - ResultSet rs = metaData.getTables(null, userName, tableName, null); - boolean schemaExists; - try { - schemaExists = rs.next(); - } finally { - rs.close(); - } - - if (!schemaExists) { - // read ddl from resources - InputStream in = OracleFileSystem.class.getResourceAsStream(schema + ".ddl"); - if (in == null) { - String msg = "Configuration error: unknown schema '" + schema + "'"; - log.debug(msg); - throw new RepositoryException(msg); - } - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - Statement stmt = con.createStatement(); - try { - String sql = reader.readLine(); - while (sql != null) { - // Skip comments and empty lines - if (!sql.startsWith("#") && sql.length() > 0) { - // replace prefix variable - sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix); - - // set the tablespace if it is defined - String tspace; - if (tableSpace == null || "".equals(tableSpace)) { - tspace = ""; - } else { - tspace = "tablespace " + tableSpace; - } - sql = Text.replace(sql, TABLE_SPACE_VARIABLE, tspace).trim(); - - // execute sql stmt - stmt.executeUpdate(sql); - } - // read next sql stmt - sql = reader.readLine(); - } - } finally { - IOUtils.closeQuietly(in); - closeStatement(stmt); - } - } - } - - /** - * Builds the SQL statements - *

- * Since Oracle treats emtpy strings and BLOBs as null values the SQL - * statements had to be adapated accordingly. The following changes were - * necessary: - *

- */ - protected void buildSQLStatements() { - insertFileSQL = "insert into " - + schemaObjectPrefix + "FSENTRY " - + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, " - + "FSENTRY_LASTMOD, FSENTRY_LENGTH) " - + "values (?, ?, ?, ?, ?)"; - - insertFolderSQL = "insert into " - + schemaObjectPrefix + "FSENTRY " - + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_LASTMOD, FSENTRY_LENGTH) " - + "values (?, nvl(?, ' '), ?, null)"; - - updateDataSQL = "update " - + schemaObjectPrefix + "FSENTRY " - + "set FSENTRY_DATA = ?, FSENTRY_LASTMOD = ?, FSENTRY_LENGTH = ? " - + "where FSENTRY_PATH = ? and FSENTRY_NAME = ? " - + "and FSENTRY_LENGTH is not null"; - - updateLastModifiedSQL = "update " - + schemaObjectPrefix + "FSENTRY set FSENTRY_LASTMOD = ? " - + "where FSENTRY_PATH = ? and FSENTRY_NAME = ? " - + "and FSENTRY_LENGTH is not null"; - - selectExistSQL = "select 1 from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = nvl(?, ' ')"; - - selectFileExistSQL = "select 1 from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; - - selectFolderExistSQL = "select 1 from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = nvl(?, ' ') and FSENTRY_LENGTH is null"; - - selectFileNamesSQL = "select FSENTRY_NAME from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_LENGTH is not null"; - - selectFolderNamesSQL = "select FSENTRY_NAME from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME != ' ' " - + "and FSENTRY_LENGTH is null"; - - selectFileAndFolderNamesSQL = "select FSENTRY_NAME from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME != ' '"; - - selectChildCountSQL = "select count(FSENTRY_NAME) from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME != ' '"; - - selectDataSQL = "select nvl(FSENTRY_DATA, empty_blob()) from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; - - selectLastModifiedSQL = "select FSENTRY_LASTMOD from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = nvl(?, ' ')"; - - selectLengthSQL = "select nvl(FSENTRY_LENGTH, 0) from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; - - deleteFileSQL = "delete from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; - - deleteFolderSQL = "delete from " - + schemaObjectPrefix + "FSENTRY where " - + "(FSENTRY_PATH = ? and FSENTRY_NAME = nvl(?, ' ') and FSENTRY_LENGTH is null) " - + "or (FSENTRY_PATH = ?) " - + "or (FSENTRY_PATH like ?) "; - - copyFileSQL = "insert into " - + schemaObjectPrefix + "FSENTRY " - + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, " - + "FSENTRY_LASTMOD, FSENTRY_LENGTH) " - + "select ?, ?, FSENTRY_DATA, " - + "FSENTRY_LASTMOD, FSENTRY_LENGTH from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_LENGTH is not null"; - - copyFilesSQL = "insert into " - + schemaObjectPrefix + "FSENTRY " - + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, " - + "FSENTRY_LASTMOD, FSENTRY_LENGTH) " - + "select ?, FSENTRY_NAME, FSENTRY_DATA, " - + "FSENTRY_LASTMOD, FSENTRY_LENGTH from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_LENGTH is not null"; - } - - - /** - * {@inheritDoc} - *

* Overridden because we need to use oracle.sql.BLOB * and PreparedStatement#setBlob instead of just * PreparedStatement#setBinaryStream.