Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 94706 invoked from network); 18 Mar 2006 13:16:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Mar 2006 13:16:30 -0000 Received: (qmail 9920 invoked by uid 500); 18 Mar 2006 13:16:29 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 9909 invoked by uid 99); 18 Mar 2006 13:16:29 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Mar 2006 05:16:29 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 18 Mar 2006 05:16:27 -0800 Received: (qmail 94621 invoked by uid 65534); 18 Mar 2006 13:16:06 -0000 Message-ID: <20060318131606.94620.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r386848 - in /incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db: DB2FileSystem.java DatabaseFileSystem.java DbFileSystem.java JNDIDatabaseFileSystem.java Date: Sat, 18 Mar 2006 13:16:02 -0000 To: jackrabbit-commits@incubator.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jukka Date: Sat Mar 18 05:15:58 2006 New Revision: 386848 URL: http://svn.apache.org/viewcvs?rev=386848&view=rev Log: JCR-313: Extracted common database file system functionality to an abstract DatabaseFileSystem class. Added a JNDIDatabaseFileSystem class. Added: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java - copied, changed from r386840, incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java (with props) Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java?rev=386848&r1=386847&r2=386848&view=diff ============================================================================== --- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java (original) +++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DB2FileSystem.java Sat Mar 18 05:15:58 2006 @@ -82,7 +82,8 @@ try { // setup jdbc connection - initConnection(); + con = getConnection(); + con.setAutoCommit(false); // make sure schemaObjectPrefix consists of legal name characters only prepareSchemaObjectPrefix(); Copied: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java (from r386840, incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java) URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java?p2=incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java&p1=incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java&r1=386840&r2=386848&rev=386848&view=diff ============================================================================== --- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java (original) +++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java Sat Mar 18 05:15:58 2006 @@ -39,7 +39,6 @@ import java.io.RandomAccessFile; import java.sql.Connection; import java.sql.DatabaseMetaData; -import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -47,73 +46,14 @@ import java.util.ArrayList; /** - * DbFileSystem is a generic JDBC-based FileSystem - * implementation for Jackrabbit that persists file system entries in a - * database table. - *

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

    - *
  • driver: the FQN name of the JDBC driver class
    • - *
  • url: the database url of the form jdbc:subprotocol:subname
    • - *
  • user: the database user
    • - *
  • password: the user's password
    • - *
  • schema: type of schema to be used - * (e.g. mysql, mssql, etc.);
    • - *
  • schemaObjectPrefix: prefix to be prepended to schema objects
    • - *
- * The required schema objects are automatically created by executing the DDL - * statements read from the [schema].ddl file. The .ddl file is read from the - * resources by calling getClass().getResourceAsStream(schema + ".ddl"). - * Every line in the specified .ddl file is executed separatly by calling - * java.sql.Statement.execute(String) where every occurence of the - * the string "${schemaObjectPrefix}" has been replaced with the - * value of the property schemaObjectPrefix. - *

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

- *   <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
- *       <param name="driver" value="com.mysql.jdbc.Driver"/>
- *       <param name="url" value="jdbc:mysql:///test"/>
- *       <param name="schema" value="mysql"/>
- *       <param name="schemaObjectPrefix" value="rep_"/>
- *   </FileSystem>
- *
- * The following is a fragment from a sample configuration using Daffodil One$DB Embedded: - * 
- *   <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
- *       <param name="driver" value="in.co.daffodil.db.jdbc.DaffodilDBDriver"/>
- *       <param name="url" value="jdbc:daffodilDB_embedded:rep;path=${rep.home}/databases;create=true"/>
- *       <param name="user" value="daffodil"/>
- *       <param name="password" value="daffodil"/>
- *       <param name="schema" value="daffodil"/>
- *       <param name="schemaObjectPrefix" value="rep_"/>
- *   </FileSystem>
- *
- * The following is a fragment from a sample configuration using MSSQL: - * 
- *   <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
- *       <param name="driver" value="com.microsoft.jdbc.sqlserver.SQLServerDriver"/>
- *       <param name="url" value="jdbc:microsoft:sqlserver://localhost:1433;;DatabaseName=test;SelectMethod=Cursor;"/>
- *       <param name="schema" value="mssql"/>
- *       <param name="user" value="sa"/>
- *       <param name="password" value=""/>
- *       <param name="schemaObjectPrefix" value="rep_"/>
- *   </FileSystem>
- *
- * The following is a fragment from a sample configuration using PostgreSQL: - * 
- *   <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
- *       <param name="driver" value="org.postgresql.Driver"/>
- *       <param name="url" value="jdbc:postgresql://localhost/test"/>
- *       <param name="schema" value="postgresql"/>
- *       <param name="user" value="postgres"/>
- *       <param name="password" value="postgres"/>
- *       <param name="schemaObjectPrefix" value="rep_"/>
- *   </FileSystem>
- *
- * See also {@link DerbyFileSystem}, {@link DB2FileSystem}. + * Abstract base class for database file systems. This class contains common + * functionality for database file system subclasses that normally differ only + * in the way the database connection is acquired. + *

+ * See the {@link DbFileSystem} for a detailed description of the available + * configuration options and database behaviour. */ -public class DbFileSystem implements FileSystem { +public abstract class DatabaseFileSystem implements FileSystem { /** * Logger instance @@ -125,10 +65,6 @@ protected boolean initialized; - protected String driver; - protected String url; - protected String user; - protected String password; protected String schema; protected String schemaObjectPrefix; @@ -161,45 +97,13 @@ /** * Default constructor */ - public DbFileSystem() { + public DatabaseFileSystem() { schema = "default"; schemaObjectPrefix = ""; initialized = false; } //----------------------------------------------------< setters & getters > - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDriver() { - return driver; - } - - public void setDriver(String driver) { - this.driver = driver; - } - public String getSchemaObjectPrefix() { return schemaObjectPrefix; } @@ -225,13 +129,9 @@ if (this == obj) { return true; } - if (obj instanceof DbFileSystem) { - DbFileSystem other = (DbFileSystem) obj; - if (((driver != null) ? driver.equals(other.driver) : other.driver == null) - && ((url != null) ? url.equals(other.url) : other.url == null) - && ((user != null) ? user.equals(other.user) : other.user == null) - && ((password != null) ? password.equals(other.password) : other.password == null) - && ((schema != null) ? schema.equals(other.schema) : other.schema == null) + if (obj instanceof DatabaseFileSystem) { + DatabaseFileSystem other = (DatabaseFileSystem) obj; + if (((schema != null) ? schema.equals(other.schema) : other.schema == null) && ((schemaObjectPrefix != null) ? schemaObjectPrefix.equals(other.schemaObjectPrefix) : other.schemaObjectPrefix == null)) { return true; } @@ -261,7 +161,8 @@ try { // setup jdbc connection - initConnection(); + con = getConnection(); + con.setAutoCommit(false); // make sure schemaObjectPrefix consists of legal name characters only prepareSchemaObjectPrefix(); @@ -399,7 +300,7 @@ closeStatement(copyFilesStmt); // close jdbc connection - con.close(); + closeConnection(con); } catch (SQLException e) { String msg = "error closing file system"; log.error(msg, e); @@ -1165,15 +1066,37 @@ } //----------------------------------< misc. helper methods & overridables > + /** - * Initialize the JDBC connection. + * Abstract factory method for creating a new database connection. This + * method is called by {@link #init()} when the file system is started. + * The returned connection should come with the default JDBC settings, + * as the {@link #init()} method will explicitly set the + * autoCommit and other properties as needed. + *

+ * Note that the returned database connection is kept during the entire + * lifetime of the file system, after which it is closed by + * {@link #close()} using the {@link #closeConnection(Connection)} method. * + * @return new connection + * @throws Exception if an error occurs + */ + protected abstract Connection getConnection() throws Exception; + + /** + * Closes the given database connection. This method is called by + * {@link #close()} to close the connection acquired using + * {@link #getConnection()} when the file system was started. + *

+ * The default implementation just calls the {@link Connection#close()} + * method of the given connection, but subclasses can override this + * method to provide more extensive database and connection cleanup. + * + * @param connection database connection * @throws Exception if an error occurs */ - protected void initConnection() throws Exception { - Class.forName(driver); - con = DriverManager.getConnection(url, user, password); - con.setAutoCommit(false); + protected void closeConnection(Connection connection) throws SQLException { + connection.close(); } /** Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java?rev=386848&r1=386847&r2=386848&view=diff ============================================================================== --- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java (original) +++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DbFileSystem.java Sat Mar 18 05:15:58 2006 @@ -16,35 +16,9 @@ */ package org.apache.jackrabbit.core.fs.db; -import org.apache.jackrabbit.core.fs.FileSystem; -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.Text; -import org.apache.jackrabbit.util.TransientFileFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.jcr.RepositoryException; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FilterInputStream; -import java.io.FilterOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.FileInputStream; -import java.io.RandomAccessFile; import java.sql.Connection; -import java.sql.DatabaseMetaData; import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; /** * DbFileSystem is a generic JDBC-based FileSystem @@ -113,59 +87,12 @@ * * See also {@link DerbyFileSystem}, {@link DB2FileSystem}. */ -public class DbFileSystem implements FileSystem { - - /** - * Logger instance - */ - private static Logger log = LoggerFactory.getLogger(DbFileSystem.class); - - protected static final String SCHEMA_OBJECT_PREFIX_VARIABLE = - "${schemaObjectPrefix}"; - - protected boolean initialized; +public class DbFileSystem extends DatabaseFileSystem { protected String driver; protected String url; protected String user; protected String password; - protected String schema; - protected String schemaObjectPrefix; - - // initial size of buffer used to serialize objects - protected static final int INITIAL_BUFFER_SIZE = 8192; - - // jdbc connection - protected Connection con; - - // shared prepared statements - protected PreparedStatement selectExistStmt; - protected PreparedStatement selectFileExistStmt; - protected PreparedStatement selectFolderExistStmt; - protected PreparedStatement selectChildCountStmt; - protected PreparedStatement selectDataStmt; - protected PreparedStatement selectLastModifiedStmt; - protected PreparedStatement selectLengthStmt; - protected PreparedStatement selectFileNamesStmt; - protected PreparedStatement selectFolderNamesStmt; - protected PreparedStatement selectFileAndFolderNamesStmt; - protected PreparedStatement deleteFileStmt; - protected PreparedStatement deleteFolderStmt; - protected PreparedStatement insertFileStmt; - protected PreparedStatement insertFolderStmt; - protected PreparedStatement updateDataStmt; - protected PreparedStatement updateLastModifiedStmt; - protected PreparedStatement copyFileStmt; - protected PreparedStatement copyFilesStmt; - - /** - * Default constructor - */ - public DbFileSystem() { - schema = "default"; - schemaObjectPrefix = ""; - initialized = false; - } //----------------------------------------------------< setters & getters > public String getUrl() { @@ -200,22 +127,6 @@ this.driver = driver; } - public String getSchemaObjectPrefix() { - return schemaObjectPrefix; - } - - public void setSchemaObjectPrefix(String schemaObjectPrefix) { - // make sure prefix is all uppercase - this.schemaObjectPrefix = schemaObjectPrefix.toUpperCase(); - } - - public String getSchema() { - return schema; - } - - public void setSchema(String schema) { - this.schema = schema; - } //-------------------------------------------< java.lang.Object overrides > /** @@ -231,8 +142,7 @@ && ((url != null) ? url.equals(other.url) : other.url == null) && ((user != null) ? user.equals(other.user) : other.user == null) && ((password != null) ? password.equals(other.password) : other.password == null) - && ((schema != null) ? schema.equals(other.schema) : other.schema == null) - && ((schemaObjectPrefix != null) ? schemaObjectPrefix.equals(other.schemaObjectPrefix) : other.schemaObjectPrefix == null)) { + && super.equals(other)) { return true; } } @@ -250,1217 +160,17 @@ return 0; } - //-----------------------------------------------------------< FileSystem > - /** - * {@inheritDoc} - */ - public void init() throws FileSystemException { - if (initialized) { - throw new IllegalStateException("already initialized"); - } - - try { - // setup jdbc connection - initConnection(); - - // make sure schemaObjectPrefix consists of legal name characters only - prepareSchemaObjectPrefix(); - - // check if schema objects exist and create them if necessary - checkSchema(); - - // prepare statements - insertFileStmt = con.prepareStatement("insert into " - + schemaObjectPrefix + "FSENTRY " - + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, " - + "FSENTRY_LASTMOD, FSENTRY_LENGTH) " - + "values (?, ?, ?, ?, ?)"); - - insertFolderStmt = con.prepareStatement("insert into " - + schemaObjectPrefix + "FSENTRY " - + "(FSENTRY_PATH, FSENTRY_NAME, FSENTRY_LASTMOD, FSENTRY_LENGTH) " - + "values (?, ?, ?, 0)"); - - updateDataStmt = con.prepareStatement("update " - + schemaObjectPrefix + "FSENTRY " - + "set FSENTRY_DATA = ?, FSENTRY_LASTMOD = ?, FSENTRY_LENGTH = ? " - + "where FSENTRY_PATH = ? and FSENTRY_NAME = ? " - + "and FSENTRY_DATA is not null"); - - updateLastModifiedStmt = con.prepareStatement("update " - + schemaObjectPrefix + "FSENTRY set FSENTRY_LASTMOD = ? " - + "where FSENTRY_PATH = ? and FSENTRY_NAME = ? " - + "and FSENTRY_DATA is not null"); - - selectExistStmt = con.prepareStatement("select 1 from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ?"); - - selectFileExistStmt = con.prepareStatement("select 1 from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null"); - - selectFolderExistStmt = con.prepareStatement("select 1 from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_DATA is null"); - - selectFileNamesStmt = con.prepareStatement("select FSENTRY_NAME from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_DATA is not null"); - - selectFolderNamesStmt = con.prepareStatement("select FSENTRY_NAME from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_DATA is null"); - - selectFileAndFolderNamesStmt = con.prepareStatement("select FSENTRY_NAME from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ?"); - - selectChildCountStmt = con.prepareStatement("select count(FSENTRY_NAME) from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? "); - - selectDataStmt = con.prepareStatement("select FSENTRY_DATA from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null"); - - selectLastModifiedStmt = con.prepareStatement("select FSENTRY_LASTMOD from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ?"); - - selectLengthStmt = con.prepareStatement("select FSENTRY_LENGTH from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null"); - - deleteFileStmt = con.prepareStatement("delete from " - + schemaObjectPrefix + "FSENTRY where FSENTRY_PATH = ? " - + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null"); - - deleteFolderStmt = con.prepareStatement("delete from " - + schemaObjectPrefix + "FSENTRY where " - + "(FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is null) " - + "or (FSENTRY_PATH = ?) " - + "or (FSENTRY_PATH like ?) "); - - copyFileStmt = con.prepareStatement("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_DATA is not null"); - - copyFilesStmt = con.prepareStatement("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_DATA is not null"); - - // finally verify that there's a file system root entry - verifyRoodExists(); - - initialized = true; - } catch (Exception e) { - String msg = "failed to initialize file system"; - log.error(msg, e); - throw new FileSystemException(msg, e); - } - } - - /** - * {@inheritDoc} - */ - public void close() throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - try { - // close shared prepared statements - closeStatement(insertFileStmt); - closeStatement(insertFolderStmt); - closeStatement(updateDataStmt); - closeStatement(updateLastModifiedStmt); - closeStatement(selectExistStmt); - closeStatement(selectFileExistStmt); - closeStatement(selectFolderExistStmt); - closeStatement(selectFileNamesStmt); - closeStatement(selectFolderNamesStmt); - closeStatement(selectFileAndFolderNamesStmt); - closeStatement(selectChildCountStmt); - closeStatement(selectDataStmt); - closeStatement(selectLastModifiedStmt); - closeStatement(selectLengthStmt); - closeStatement(deleteFolderStmt); - closeStatement(deleteFileStmt); - closeStatement(copyFileStmt); - closeStatement(copyFilesStmt); - - // close jdbc connection - con.close(); - } catch (SQLException e) { - String msg = "error closing file system"; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - initialized = false; - } - } - - /** - * {@inheritDoc} - */ - public void createFolder(String folderPath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(folderPath); - - if (!exists(folderPath)) { - createDeepFolder(folderPath); - } else { - throw new FileSystemException("file system entry already exists: " + folderPath); - } - } - - /** - * {@inheritDoc} - */ - public void deleteFile(String filePath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(filePath); - - String parentDir = FileSystemPathUtil.getParentDir(filePath); - String name = FileSystemPathUtil.getName(filePath); - - int count = 0; - PreparedStatement stmt = deleteFileStmt; - synchronized (stmt) { - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - count = stmt.executeUpdate(); - } catch (SQLException e) { - String msg = "failed to delete file: " + filePath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - resetStatement(stmt); - } - } - - if (count == 0) { - throw new FileSystemException("no such file: " + filePath); - } - } - - /** - * {@inheritDoc} - */ - public void deleteFolder(String folderPath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(folderPath); - - if (folderPath.equals(FileSystem.SEPARATOR)) { - throw new FileSystemException("cannot delete root"); - } - - String parentDir = FileSystemPathUtil.getParentDir(folderPath); - String name = FileSystemPathUtil.getName(folderPath); - - int count = 0; - PreparedStatement stmt = deleteFolderStmt; - synchronized (stmt) { - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - stmt.setString(3, folderPath); - stmt.setString(4, folderPath + FileSystem.SEPARATOR + "%"); - count = stmt.executeUpdate(); - } catch (SQLException e) { - String msg = "failed to delete folder: " + folderPath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - resetStatement(stmt); - } - } - - if (count == 0) { - throw new FileSystemException("no such folder: " + folderPath); - } - } - - /** - * {@inheritDoc} - */ - public boolean exists(String path) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(path); - - String parentDir = FileSystemPathUtil.getParentDir(path); - String name = FileSystemPathUtil.getName(path); - - PreparedStatement stmt = selectExistStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - stmt.execute(); - rs = stmt.getResultSet(); - - // a file system entry exists if the result set - // has at least one entry - return rs.next(); - } catch (SQLException e) { - String msg = "failed to check existence of file system entry: " + path; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public boolean isFile(String path) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(path); - - String parentDir = FileSystemPathUtil.getParentDir(path); - String name = FileSystemPathUtil.getName(path); - - PreparedStatement stmt = selectFileExistStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - stmt.execute(); - rs = stmt.getResultSet(); - - // a file exists if the result set has at least one entry - return rs.next(); - } catch (SQLException e) { - String msg = "failed to check existence of file: " + path; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public boolean isFolder(String path) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(path); - - String parentDir = FileSystemPathUtil.getParentDir(path); - String name = FileSystemPathUtil.getName(path); - - PreparedStatement stmt = selectFolderExistStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - stmt.execute(); - rs = stmt.getResultSet(); - - // a folder exists if the result set has at least one entry - return rs.next(); - } catch (SQLException e) { - String msg = "failed to check existence of folder: " + path; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public long lastModified(String path) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(path); - - String parentDir = FileSystemPathUtil.getParentDir(path); - String name = FileSystemPathUtil.getName(path); - - PreparedStatement stmt = selectLastModifiedStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - stmt.execute(); - rs = stmt.getResultSet(); - if (!rs.next()) { - throw new FileSystemException("no such file system entry: " + path); - } - return rs.getLong(1); - } catch (SQLException e) { - String msg = "failed to determine lastModified of file system entry: " + path; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public long length(String filePath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(filePath); - - String parentDir = FileSystemPathUtil.getParentDir(filePath); - String name = FileSystemPathUtil.getName(filePath); - - PreparedStatement stmt = selectLengthStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - stmt.execute(); - rs = stmt.getResultSet(); - if (!rs.next()) { - throw new FileSystemException("no such file: " + filePath); - } - return rs.getLong(1); - } catch (SQLException e) { - String msg = "failed to determine length of file: " + filePath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public boolean hasChildren(String path) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(path); - - if (!exists(path)) { - throw new FileSystemException("no such file system entry: " + path); - } - - PreparedStatement stmt = selectChildCountStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, path); - stmt.execute(); - rs = stmt.getResultSet(); - if (!rs.next()) { - return false; - } - int count = rs.getInt(1); - if (FileSystemPathUtil.denotesRoot(path)) { - // ingore file system root entry - count--; - } - return (count > 0); - } catch (SQLException e) { - String msg = "failed to determine child count of file system entry: " + path; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } + //--------------------------------------------------< DatabaseFileSystem > /** - * {@inheritDoc} - */ - public String[] list(String folderPath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(folderPath); - - if (!isFolder(folderPath)) { - throw new FileSystemException("no such folder: " + folderPath); - } - - PreparedStatement stmt = selectFileAndFolderNamesStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, folderPath); - stmt.execute(); - rs = stmt.getResultSet(); - ArrayList names = new ArrayList(); - while (rs.next()) { - String name = rs.getString(1); - if (name.length() == 0 - && FileSystemPathUtil.denotesRoot(folderPath)) { - // this is the file system root entry, skip... - continue; - } - names.add(name); - } - return (String[]) names.toArray(new String[names.size()]); - } catch (SQLException e) { - String msg = "failed to list child entries of folder: " + folderPath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public String[] listFiles(String folderPath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(folderPath); - - if (!isFolder(folderPath)) { - throw new FileSystemException("no such folder: " + folderPath); - } - - PreparedStatement stmt = selectFileNamesStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, folderPath); - stmt.execute(); - rs = stmt.getResultSet(); - ArrayList names = new ArrayList(); - while (rs.next()) { - names.add(rs.getString(1)); - } - return (String[]) names.toArray(new String[names.size()]); - } catch (SQLException e) { - String msg = "failed to list file entries of folder: " + folderPath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public String[] listFolders(String folderPath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(folderPath); - - if (!isFolder(folderPath)) { - throw new FileSystemException("no such folder: " + folderPath); - } - - PreparedStatement stmt = selectFolderNamesStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, folderPath); - stmt.execute(); - rs = stmt.getResultSet(); - ArrayList names = new ArrayList(); - while (rs.next()) { - String name = rs.getString(1); - if (name.length() == 0 - && FileSystemPathUtil.denotesRoot(folderPath)) { - // this is the file system root entry, skip... - continue; - } - names.add(name); - } - return (String[]) names.toArray(new String[names.size()]); - } catch (SQLException e) { - String msg = "failed to list folder entries of folder: " + folderPath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public void touch(String filePath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(filePath); - - String parentDir = FileSystemPathUtil.getParentDir(filePath); - String name = FileSystemPathUtil.getName(filePath); - - int count = 0; - PreparedStatement stmt = updateLastModifiedStmt; - synchronized (stmt) { - try { - stmt.setLong(1, System.currentTimeMillis()); - stmt.setString(2, parentDir); - stmt.setString(3, name); - count = stmt.executeUpdate(); - } catch (SQLException e) { - String msg = "failed to touch file: " + filePath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - resetStatement(stmt); - } - } - - if (count == 0) { - throw new FileSystemException("no such file: " + filePath); - } - } - - /** - * {@inheritDoc} - */ - public InputStream getInputStream(String filePath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(filePath); - - String parentDir = FileSystemPathUtil.getParentDir(filePath); - String name = FileSystemPathUtil.getName(filePath); - - PreparedStatement stmt = selectDataStmt; - synchronized (stmt) { - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - stmt.execute(); - final ResultSet rs = stmt.getResultSet(); - if (!rs.next()) { - throw new FileSystemException("no such file: " + filePath); - } - InputStream in = rs.getBinaryStream(1); - /** - * return an InputStream wrapper in order to - * close the ResultSet when the stream is closed - */ - return new FilterInputStream(in) { - public void close() throws IOException { - super.close(); - // close ResultSet - closeResultSet(rs); - } - }; - } catch (SQLException e) { - String msg = "failed to retrieve data of file: " + filePath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - resetStatement(stmt); - } - } - } - - /** - * {@inheritDoc} - */ - public OutputStream getOutputStream(final String filePath) - throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(filePath); - - final String parentDir = FileSystemPathUtil.getParentDir(filePath); - final String name = FileSystemPathUtil.getName(filePath); - - if (!isFolder(parentDir)) { - throw new FileSystemException("path not found: " + parentDir); - } - - if (isFolder(filePath)) { - throw new FileSystemException("path denotes folder: " + filePath); - } - - try { - TransientFileFactory fileFactory = TransientFileFactory.getInstance(); - final File tmpFile = fileFactory.createTransientFile("bin", null, null); - - return new FilterOutputStream(new FileOutputStream(tmpFile)) { - File f = tmpFile; - - public void close() throws IOException { - super.close(); - - PreparedStatement stmt = null; - InputStream in = null; - try { - if (isFile(filePath)) { - stmt = updateDataStmt; - synchronized (stmt) { - long length = f.length(); - in = new FileInputStream(f); - stmt.setBinaryStream(1, in, (int) length); - stmt.setLong(2, System.currentTimeMillis()); - stmt.setLong(3, length); - stmt.setString(4, parentDir); - stmt.setString(5, name); - stmt.executeUpdate(); - } - } else { - stmt = insertFileStmt; - stmt.setString(1, parentDir); - stmt.setString(2, name); - long length = f.length(); - in = new FileInputStream(f); - stmt.setBinaryStream(3, in, (int) length); - stmt.setLong(4, System.currentTimeMillis()); - stmt.setLong(5, length); - stmt.executeUpdate(); - } - - } catch (Exception e) { - throw new IOException(e.getMessage()); - } finally { - if (stmt != null) { - resetStatement(stmt); - } - if (in != null) { - in.close(); - } - // temp file can now safely be removed - f.delete(); - f = null; - } - } - }; - } catch (Exception e) { - String msg = "failed to open output strean to file: " + filePath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } - } - - /** - * {@inheritDoc} - */ - public RandomAccessOutputStream getRandomAccessOutputStream(final String filePath) - throws FileSystemException, UnsupportedOperationException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(filePath); - - final String parentDir = FileSystemPathUtil.getParentDir(filePath); - final String name = FileSystemPathUtil.getName(filePath); - - if (!isFolder(parentDir)) { - throw new FileSystemException("path not found: " + parentDir); - } - - if (isFolder(filePath)) { - throw new FileSystemException("path denotes folder: " + filePath); - } - - try { - TransientFileFactory fileFactory = TransientFileFactory.getInstance(); - final File tmpFile = fileFactory.createTransientFile("bin", null, null); - - // @todo FIXME use java.sql.Blob - - if (isFile(filePath)) { - // file entry exists, spool contents to temp file first - InputStream in = getInputStream(filePath); - OutputStream out = new FileOutputStream(tmpFile); - try { - int read; - byte[] ba = new byte[8192]; - while ((read = in.read(ba, 0, ba.length)) != -1) { - out.write(ba, 0, read); - } - } finally { - out.close(); - in.close(); - } - } - - return new RandomAccessOutputStream() { - File f = tmpFile; - RandomAccessFile raf = new RandomAccessFile(f, "rw"); - - public void close() throws IOException { - raf.close(); - - PreparedStatement stmt = null; - InputStream in = null; - try { - if (isFile(filePath)) { - stmt = updateDataStmt; - synchronized (stmt) { - long length = f.length(); - in = new FileInputStream(f); - stmt.setBinaryStream(1, in, (int) length); - stmt.setLong(2, System.currentTimeMillis()); - stmt.setLong(3, length); - stmt.setString(4, parentDir); - stmt.setString(5, name); - stmt.executeUpdate(); - } - } else { - stmt = insertFileStmt; - stmt.setString(1, parentDir); - stmt.setString(2, name); - long length = f.length(); - in = new FileInputStream(f); - stmt.setBinaryStream(3, in, (int) length); - stmt.setLong(4, System.currentTimeMillis()); - stmt.setLong(5, length); - stmt.executeUpdate(); - } - - } catch (Exception e) { - throw new IOException(e.getMessage()); - } finally { - if (stmt != null) { - resetStatement(stmt); - } - if (in != null) { - in.close(); - } - // temp file can now safely be removed - f.delete(); - f = null; - raf = null; - } - } - - public void seek(long position) throws IOException { - raf.seek(position); - } - - public void write(int b) throws IOException { - raf.write(b); - } - - public void flush() /*throws IOException*/ { - // nop - } - - public void write(byte b[]) throws IOException { - raf.write(b); - } - - public void write(byte b[], int off, int len) throws IOException { - raf.write(b, off, len); - } - }; - } catch (Exception e) { - String msg = "failed to open output strean to file: " + filePath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } - } - - /** - * {@inheritDoc} - */ - public void copy(String srcPath, String destPath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(srcPath); - FileSystemPathUtil.checkFormat(destPath); - - if (isFolder(srcPath)) { - // src is a folder - copyDeepFolder(srcPath, destPath); - } else { - // src is a file - copyFile(srcPath, destPath); - } - } - - /** - * {@inheritDoc} - */ - public void move(String srcPath, String destPath) throws FileSystemException { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - - FileSystemPathUtil.checkFormat(srcPath); - FileSystemPathUtil.checkFormat(destPath); - - // @todo optimize move (use sql update stmts) - copy(srcPath, destPath); - if (isFile(srcPath)) { - deleteFile(srcPath); - } else { - deleteFolder(srcPath); - } - } - - //----------------------------------< misc. helper methods & overridables > - /** * Initialize the JDBC connection. * * @throws Exception if an error occurs */ - protected void initConnection() throws Exception { + protected Connection getConnection() throws ClassNotFoundException, SQLException { Class.forName(driver); - con = DriverManager.getConnection(url, user, password); - con.setAutoCommit(false); - } - - /** - * Makes sure that schemaObjectPrefix does only consist of - * characters that are allowed in names on the target database. Illegal - * characters will be escaped as necessary. - * - * @throws Exception if an error occurs - */ - protected void prepareSchemaObjectPrefix() throws Exception { - DatabaseMetaData metaData = con.getMetaData(); - String legalChars = metaData.getExtraNameCharacters(); - legalChars += "ABCDEFGHIJKLMNOPQRSTUVWXZY0123456789_"; - - String prefix = schemaObjectPrefix.toUpperCase(); - StringBuffer escaped = new StringBuffer(); - for (int i = 0; i < prefix.length(); i++) { - char c = prefix.charAt(i); - if (legalChars.indexOf(c) == -1) { - escaped.append("_x"); - String hex = Integer.toHexString(c); - escaped.append("0000".toCharArray(), 0, 4 - hex.length()); - escaped.append(hex); - escaped.append("_"); - } else { - escaped.append(c); - } - } - schemaObjectPrefix = escaped.toString(); - } - - /** - * Checks if the required schema objects exist and creates them if they - * don't exist yet. - * - * @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(); - } - ResultSet rs = metaData.getTables(null, null, tableName, null); - boolean schemaExists; - try { - schemaExists = rs.next(); - } finally { - rs.close(); - } - - if (!schemaExists) { - // read ddl from resources - InputStream in = getClass().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) { - // replace prefix variable - sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix); - // execute sql stmt - stmt.executeUpdate(sql); - // read next sql stmt - sql = reader.readLine(); - } - } finally { - closeStream(in); - closeStatement(stmt); - } - } - } - - /** - * Verifies that the root file system entry exists. If it doesn't exist yet - * it will be automatically created. - * - * @throws Exception if an error occurs - */ - protected void verifyRoodExists() throws Exception { - // check if root file system entry exists - PreparedStatement stmt = selectFolderExistStmt; - synchronized (stmt) { - ResultSet rs = null; - try { - stmt.setString(1, FileSystem.SEPARATOR); - stmt.setString(2, ""); - stmt.execute(); - rs = stmt.getResultSet(); - - if (rs.next()) { - // root entry exists - return; - } - } catch (SQLException e) { - String msg = "failed to check existence of file system root entry"; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - closeResultSet(rs); - resetStatement(stmt); - } - } - - // the root entry doesn't exist yet, create it... - createDeepFolder(FileSystem.SEPARATOR); - } - - /** - * Creates the specified files system folder entry, recursively creating - * any non-existing intermediate folder entries. - * - * @param folderPath folder entry to create - * @throws FileSystemException if an error occurs - */ - protected void createDeepFolder(String folderPath) - throws FileSystemException { - String parentDir = FileSystemPathUtil.getParentDir(folderPath); - String name = FileSystemPathUtil.getName(folderPath); - - if (!FileSystemPathUtil.denotesRoot(folderPath)) { - if (!exists(parentDir)) { - createDeepFolder(parentDir); - } - } - - PreparedStatement stmt = insertFolderStmt; - synchronized (stmt) { - try { - stmt.setString(1, parentDir); - stmt.setString(2, name); - stmt.setLong(3, System.currentTimeMillis()); - stmt.executeUpdate(); - } catch (SQLException e) { - String msg = "failed to create folder entry: " + folderPath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - resetStatement(stmt); - } - } + Connection connection = DriverManager.getConnection(url, user, password); + return connection; } - /** - * Recursively copies the given folder to the given destination. - * - * @param srcPath folder to be copied - * @param destPath destination path to which the folder is to be copied - * @throws FileSystemException if an error occurs - */ - protected void copyDeepFolder(String srcPath, String destPath) - throws FileSystemException { - - if (!exists(destPath)) { - createDeepFolder(destPath); - } - - String[] names = listFolders(srcPath); - - for (int i = 0; i < names.length; i++) { - String src = (FileSystemPathUtil.denotesRoot(srcPath) ? - srcPath + names[i] : srcPath + FileSystem.SEPARATOR + names[i]); - String dest = (FileSystemPathUtil.denotesRoot(destPath) ? - destPath + names[i] : destPath + FileSystem.SEPARATOR + names[i]); - copyDeepFolder(src, dest); - } - - PreparedStatement stmt = copyFilesStmt; - synchronized (stmt) { - try { - stmt.setString(1, destPath); - stmt.setString(2, srcPath); - stmt.executeUpdate(); - } catch (SQLException e) { - String msg = "failed to copy file entries from " + srcPath + " to " + destPath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - resetStatement(stmt); - } - } - } - - /** - * Copies the given file entry to the given destination path. The parent - * folder of the destination path will be created if it doesn't exist - * already. If the destination path refers to an existing file, the file - * will be overwritten. - * - * @param srcPath file to be copied - * @param destPath destination path to which the file is to be copied - * @throws FileSystemException if an error occurs - */ - protected void copyFile(String srcPath, String destPath) - throws FileSystemException { - - final String srcParentDir = FileSystemPathUtil.getParentDir(srcPath); - final String srcName = FileSystemPathUtil.getName(srcPath); - - final String destParentDir = FileSystemPathUtil.getParentDir(destPath); - final String destName = FileSystemPathUtil.getName(destPath); - - if (!exists(destParentDir)) { - createDeepFolder(destParentDir); - } - if (isFile(destPath)) { - deleteFile(destPath); - } - - int count = 0; - PreparedStatement stmt = copyFileStmt; - synchronized (stmt) { - try { - stmt.setString(1, destParentDir); - stmt.setString(2, destName); - stmt.setString(3, srcParentDir); - stmt.setString(4, srcName); - count = stmt.executeUpdate(); - } catch (SQLException e) { - String msg = "failed to copy file from " + srcPath + " to " + destPath; - log.error(msg, e); - throw new FileSystemException(msg, e); - } finally { - resetStatement(stmt); - } - } - - if (count == 0) { - throw new FileSystemException("no such file: " + srcPath); - } - } - - /** - * Resets the given PreparedStatement by clearing the parameters - * and warnings contained. - *

- * NOTE: This method MUST be called in a synchronized context as neither - * this method nor the PreparedStatement instance on which it - * operates are thread safe. - * - * @param stmt The PreparedStatement to reset. If - * null this method does nothing. - */ - protected void resetStatement(PreparedStatement stmt) { - if (stmt != null) { - try { - stmt.clearParameters(); - stmt.clearWarnings(); - } catch (SQLException se) { - log.error("failed resetting PreparedStatement", se); - } - } - } - - protected void closeResultSet(ResultSet rs) { - if (rs != null) { - try { - rs.close(); - } catch (SQLException se) { - log.error("failed closing ResultSet", se); - } - } - } - - protected void closeStream(InputStream in) { - if (in != null) { - try { - in.close(); - } catch (IOException ignore) { - } - } - } - - protected void closeStatement(Statement stmt) { - if (stmt != null) { - try { - stmt.close(); - } catch (SQLException se) { - log.error("failed closing Statement", se); - } - } - } } Added: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java?rev=386848&view=auto ============================================================================== --- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java (added) +++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java Sat Mar 18 05:15:58 2006 @@ -0,0 +1,80 @@ +/* + * Copyright 2004-2005 The Apache Software Foundation or its licensors, + * as applicable. + * + * Licensed 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.sql.Connection; +import java.sql.SQLException; + +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.sql.DataSource; + +/** + * Database file system that uses JNDI to acquire the database connection. + * The JNDI location of the {@link DataSource} to be used in given as + * the dataSourceLocation configuration property. See the + * {@link DbFileSystem} for more configuration details. + *

+ * WARNING: The acquired database connection is kept + * for the entire lifetime of the file system instance. The configured data + * source should be prepared for this. + */ +public class JNDIDatabaseFileSystem extends DatabaseFileSystem { + + /** + * JNDI location of the data source used to acquire database connections. + */ + private String dataSourceLocation; + + //----------------------------------------------------< setters & getters > + + /** + * Returns the JNDI location of the data source. + * + * @return data source location + */ + public String getDataSourceLocation() { + return dataSourceLocation; + } + + /** + * Sets the JNDI location of the data source. + * + * @param dataSourceLocation data source location + */ + public void setDataSourceLocation(String dataSourceLocation) { + this.dataSourceLocation = dataSourceLocation; + } + + //--------------------------------------------------< DatabaseFileSystem > + + /** + * Returns a JDBC connection from a {@link DataSource} acquired from JNDI + * with the configured data source location. + * + * @return new database connection + * @throws NamingException if the given data source location does not exist + * @throws Exception if a database access error occurs + * @see DatabaseFileManager#getConnection() + */ + protected Connection getConnection() throws NamingException, SQLException { + InitialContext ic = new InitialContext(); + DataSource dataSource = (DataSource) ic.lookup(dataSourceLocation); + return dataSource.getConnection(); + } + +} Propchange: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java ------------------------------------------------------------------------------ svn:eol-style = native