PersistenceManager that handles some
- * concepts.
+ * Legacy class kept for backward compatibility reasons.
+ * @deprecated use {@link org.apache.jackrabbit.core.persistence.AbstractPersistenceManager}
+ * instead.
*/
-public abstract class AbstractPersistenceManager implements PersistenceManager {
-
- /**
- * {@inheritDoc}
- */
- public NodeState createNew(NodeId id) {
- return new NodeState(id, null, null, NodeState.STATUS_NEW, false);
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyState createNew(PropertyId id) {
- return new PropertyState(id, PropertyState.STATUS_NEW, false);
- }
-
- /**
- * Right now, this iterates over all items in the changelog and
- * calls the individual methods that handle single item states
- * or node references objects. Properly implemented, this method
- * should ensure that changes are either written completely to
- * the underlying persistence layer, or not at all.
- *
- * {@inheritDoc}
- */
- public synchronized void store(ChangeLog changeLog) throws ItemStateException {
- Iterator iter = changeLog.deletedStates();
- while (iter.hasNext()) {
- ItemState state = (ItemState) iter.next();
- if (state.isNode()) {
- destroy((NodeState) state);
- } else {
- destroy((PropertyState) state);
- }
- }
- iter = changeLog.addedStates();
- while (iter.hasNext()) {
- ItemState state = (ItemState) iter.next();
- if (state.isNode()) {
- store((NodeState) state);
- } else {
- store((PropertyState) state);
- }
- }
- iter = changeLog.modifiedStates();
- while (iter.hasNext()) {
- ItemState state = (ItemState) iter.next();
- if (state.isNode()) {
- store((NodeState) state);
- } else {
- store((PropertyState) state);
- }
- }
- iter = changeLog.modifiedRefs();
- while (iter.hasNext()) {
- NodeReferences refs = (NodeReferences) iter.next();
- if (refs.hasReferences()) {
- store(refs);
- } else {
- if (exists(refs.getId())) {
- destroy(refs);
- }
- }
- }
- }
-
- /**
- * Store a node state. Subclass responsibility.
- *
- * @param state node state to store
- * @throws ItemStateException if an error occurs
- */
- protected abstract void store(NodeState state) throws ItemStateException;
-
- /**
- * Store a property state. Subclass responsibility.
- *
- * @param state property state to store
- * @throws ItemStateException if an error occurs
- */
- protected abstract void store(PropertyState state) throws ItemStateException;
-
- /**
- * Store a references object. Subclass responsibility.
- *
- * @param refs references object to store
- * @throws ItemStateException if an error occurs
- */
- protected abstract void store(NodeReferences refs) throws ItemStateException;
-
- /**
- * Destroy a node state. Subclass responsibility.
- *
- * @param state node state to destroy
- * @throws ItemStateException if an error occurs
- */
- protected abstract void destroy(NodeState state) throws ItemStateException;
-
- /**
- * Destroy a property state. Subclass responsibility.
- *
- * @param state property state to destroy
- * @throws ItemStateException if an error occurs
- */
- protected abstract void destroy(PropertyState state) throws ItemStateException;
+public abstract class AbstractPersistenceManager extends org.apache.jackrabbit.core.persistence.AbstractPersistenceManager {
- /**
- * Destroy a node references object. Subclass responsibility.
- *
- * @param refs node references object to destroy
- * @throws ItemStateException if an error occurs
- */
- protected abstract void destroy(NodeReferences refs)
- throws ItemStateException;
-}
+}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PMContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PMContext.java?view=diff&rev=467925&r1=467924&r2=467925
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PMContext.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PMContext.java Thu Oct 26 02:11:18 2006
@@ -16,107 +16,22 @@
*/
package org.apache.jackrabbit.core.state;
+import org.apache.jackrabbit.core.NodeId;
import org.apache.jackrabbit.core.fs.FileSystem;
import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
-import org.apache.jackrabbit.core.NodeId;
import javax.jcr.NamespaceRegistry;
import java.io.File;
/**
- * A PMContext is used to provide context information for a
- * PersistenceManager.
- *
- * @see PersistenceManager#init(PMContext)
+ * Legacy class kept for backward compatibility reasons.
+ * @deprecated use {@link org.apache.jackrabbit.core.persistence.PMContext}
+ * instead.
*/
-public class PMContext {
-
- /**
- * the physcial home dir
- */
- private final File physicalHomeDir;
-
- /**
- * the virtual jackrabbit filesystem
- */
- private final FileSystem fs;
-
- /**
- * namespace registry
- */
- private final NamespaceRegistry nsReg;
-
- /**
- * node type registry
- */
- private final NodeTypeRegistry ntReg;
-
- /**
- * uuid of the root node
- */
- private final NodeId rootNodeId;
-
- /**
- * Creates a new PMContext.
- *
- * @param homeDir the physical home directory
- * @param fs the virtual jackrabbit filesystem
- * @param rootNodeId id of the root node
- * @param nsReg namespace registry
- * @param ntReg node type registry
- */
- public PMContext(File homeDir,
- FileSystem fs,
- NodeId rootNodeId,
- NamespaceRegistry nsReg,
- NodeTypeRegistry ntReg) {
- this.physicalHomeDir = homeDir;
- this.fs = fs;
- this.rootNodeId = rootNodeId;
- this.nsReg = nsReg;
- this.ntReg = ntReg;
- }
-
-
- /**
- * Returns the physical home directory for this persistence manager
- * @return the physical home directory for this persistence manager
- */
- public File getHomeDir() {
- return physicalHomeDir;
- }
-
- /**
- * Returns the virtual filesystem for this persistence manager
- * @return the virtual filesystem for this persistence manager
- */
- public FileSystem getFileSystem() {
- return fs;
- }
-
- /**
- * Returns the id of the root node
- * @return the id of the root node
- */
- public NodeId getRootNodeId() {
- return rootNodeId;
- }
-
- /**
- * Returns the namespace registry
- *
- * @return the namespace registry
- */
- public NamespaceRegistry getNamespaceRegistry() {
- return nsReg;
- }
+public class PMContext extends org.apache.jackrabbit.core.persistence.PMContext {
- /**
- * Returns the node type registry
- *
- * @return the node type registry
- */
- public NodeTypeRegistry getNodeTypeRegistry() {
- return ntReg;
+ public PMContext(File homeDir, FileSystem fs, NodeId rootNodeId,
+ NamespaceRegistry nsReg, NodeTypeRegistry ntReg) {
+ super(homeDir, fs, rootNodeId, nsReg, ntReg);
}
-}
+}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PersistenceManager.java?view=diff&rev=467925&r1=467924&r2=467925
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PersistenceManager.java Thu Oct 26 02:11:18 2006
@@ -16,160 +16,11 @@
*/
package org.apache.jackrabbit.core.state;
-import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.PropertyId;
-
/**
- * Persistence manager interface. Persistence managers are
- * internal Jackrabbit components that handle the persistent
- * storage of content nodes and properties. A persistence
- * manager knows how to retrieve the persistent states of
- * content items and how to atomically save a set of changes
- * to the persistent state.
- * - * Each workspace of a Jackrabbit content repository uses separate - * persistence manager to store the content in that workspace. Also - * the Jackrabbit version handler uses a separate persistence manager. - * The persistence managers in use are configured in the Jackrabbit - * XML configuration files. The configured persistence managers are - * instantiated and initialized using the JavaBeans conventions. - * - *
- * The life cycle of a persistence manager instance contains four phases: - *
- * An appropriate exception is thrown if the persistence manager - * initialization fails for whatever reason. In this case the - * state of the persistence manager is undefined and the instance - * should be discarded. - * - * @param context persistence manager context - * @throws Exception if the persistence manager intialization failed - */ - void init(PMContext context) throws Exception; - - /** - * Closes the persistence manager. The consistency of the persistent - * storage is guaranteed and all acquired resources are released. - * It is an error to invoke any methods on a closed persistence manager, - * and implementations are free to enforce this constraint by throwing - * IllegalStateExceptions in such cases. - *
- * An appropriate exception is thrown if the persistence manager
- * could not be closed properly. In this case the state of the
- * persistence manager is undefined and the instance should be
- * discarded.
- *
- * @throws Exception if the persistence manager failed to close properly
- */
- void close() throws Exception;
-
- /**
- * Creates a new node state instance with the given id.
- *
- * @param id node id
- * @return node state instance
- */
- NodeState createNew(NodeId id);
-
- /**
- * Creates a new property state instance with the given id.
- *
- * @param id property id
- * @return property state instance
- */
- PropertyState createNew(PropertyId id);
-
- /**
- * Load the persistent members of a node state.
- *
- * @param id node id
- * @return loaded node state
- * @throws NoSuchItemStateException if the node state does not exist
- * @throws ItemStateException if another error occurs
- */
- NodeState load(NodeId id)
- throws NoSuchItemStateException, ItemStateException;
-
- /**
- * Load the persistent members of a property state.
- *
- * @param id property id
- * @return loaded property state
- * @throws NoSuchItemStateException if the property state does not exist
- * @throws ItemStateException if another error occurs
- */
- PropertyState load(PropertyId id)
- throws NoSuchItemStateException, ItemStateException;
-
- /**
- * Load the persistent members of a node references object.
- *
- * @param id reference target node id
- * @throws NoSuchItemStateException if the target node does not exist
- * @throws ItemStateException if another error occurs
- */
- NodeReferences load(NodeReferencesId id)
- throws NoSuchItemStateException, ItemStateException;
-
- /**
- * Checks whether the identified node exists.
- *
- * @param id node id
- * @return true if the node exists,
- * false otherwise
- * @throws ItemStateException on persistence manager errors
- */
- boolean exists(NodeId id) throws ItemStateException;
-
- /**
- * Checks whether the identified property exists.
- *
- * @param id property id
- * @return true if the property exists,
- * false otherwise
- * @throws ItemStateException on persistence manager errors
- */
- boolean exists(PropertyId id) throws ItemStateException;
-
- /**
- * Checks whether references of the identified target node exist.
- *
- * @param targetId target node id
- * @return true if the references exist,
- * false otherwise
- * @throws ItemStateException on persistence manager errors
- */
- boolean exists(NodeReferencesId targetId) throws ItemStateException;
-
- /**
- * Atomically saves the given set of changes.
- *
- * @param changeLog change log containing states that were changed
- * @throws ItemStateException if the changes could not be saved
- */
- void store(ChangeLog changeLog) throws ItemStateException;
-
-}
+public interface PersistenceManager
+ extends org.apache.jackrabbit.core.persistence.PersistenceManager {
+}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?view=diff&rev=467925&r1=467924&r2=467925
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Thu Oct 26 02:11:18 2006
@@ -21,6 +21,7 @@
import org.apache.jackrabbit.core.ItemId;
import org.apache.jackrabbit.core.NodeId;
import org.apache.jackrabbit.core.PropertyId;
+import org.apache.jackrabbit.core.persistence.PersistenceManager;
import org.apache.jackrabbit.core.version.XAVersionManager;
import org.apache.jackrabbit.core.nodetype.EffectiveNodeType;
import org.apache.jackrabbit.core.nodetype.NodeDefId;
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java?view=diff&rev=467925&r1=467924&r2=467925
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java Thu Oct 26 02:11:18 2006
@@ -16,1059 +16,11 @@
*/
package org.apache.jackrabbit.core.state.db;
-import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.PropertyId;
-import org.apache.jackrabbit.core.fs.FileSystem;
-import org.apache.jackrabbit.core.fs.local.LocalFileSystem;
-import org.apache.jackrabbit.core.state.AbstractPersistenceManager;
-import org.apache.jackrabbit.core.state.ChangeLog;
-import org.apache.jackrabbit.core.state.ItemStateException;
-import org.apache.jackrabbit.core.state.NoSuchItemStateException;
-import org.apache.jackrabbit.core.state.NodeReferences;
-import org.apache.jackrabbit.core.state.NodeReferencesId;
-import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.jackrabbit.core.state.PMContext;
-import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.state.ItemState;
-import org.apache.jackrabbit.core.state.util.BLOBStore;
-import org.apache.jackrabbit.core.state.util.FileSystemBLOBStore;
-import org.apache.jackrabbit.core.state.util.Serializer;
-import org.apache.jackrabbit.core.value.BLOBFileValue;
-import org.apache.jackrabbit.core.value.InternalValue;
-import org.apache.jackrabbit.util.Text;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.FilterInputStream;
-import java.io.ByteArrayInputStream;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.DatabaseMetaData;
-
/**
- * Abstract base class for database persistence managers. This class
- * contains common functionality for database persistence manager subclasses
- * that normally differ only in the way the database connection is acquired.
- * Subclasses should override the {@link #getConnection()} method to return
- * the configured database connection.
- *
- * See the {@link SimpleDbPersistenceManager} for a detailed description
- * of the available configuration options and database behaviour.
+ * Legacy class kept for backward compatibility reasons.
+ * @deprecated use {@link org.apache.jackrabbit.core.persistence.db.DatabasePersistenceManager}
+ * instead.
*/
-public abstract class DatabasePersistenceManager extends AbstractPersistenceManager {
-
- /**
- * Logger instance
- */
- private static Logger log = LoggerFactory.getLogger(DatabasePersistenceManager.class);
-
- protected static final String SCHEMA_OBJECT_PREFIX_VARIABLE =
- "${schemaObjectPrefix}";
-
- protected boolean initialized;
-
- protected String schema;
- protected String schemaObjectPrefix;
-
- protected boolean externalBLOBs;
-
- // initial size of buffer used to serialize objects
- protected static final int INITIAL_BUFFER_SIZE = 1024;
-
- // jdbc connection
- protected Connection con;
-
- // shared prepared statements for NodeState management
- protected PreparedStatement nodeStateInsert;
- protected PreparedStatement nodeStateUpdate;
- protected PreparedStatement nodeStateSelect;
- protected PreparedStatement nodeStateSelectExist;
- protected PreparedStatement nodeStateDelete;
-
- // shared prepared statements for PropertyState management
- protected PreparedStatement propertyStateInsert;
- protected PreparedStatement propertyStateUpdate;
- protected PreparedStatement propertyStateSelect;
- protected PreparedStatement propertyStateSelectExist;
- protected PreparedStatement propertyStateDelete;
-
- // shared prepared statements for NodeReference management
- protected PreparedStatement nodeReferenceInsert;
- protected PreparedStatement nodeReferenceUpdate;
- protected PreparedStatement nodeReferenceSelect;
- protected PreparedStatement nodeReferenceSelectExist;
- protected PreparedStatement nodeReferenceDelete;
-
- // shared prepared statements for BLOB management
- // (if externalBLOBs==false)
- protected PreparedStatement blobInsert;
- protected PreparedStatement blobUpdate;
- protected PreparedStatement blobSelect;
- protected PreparedStatement blobSelectExist;
- protected PreparedStatement blobDelete;
-
- /**
- * file system where BLOB data is stored
- * (if externalBLOBs==true)
- */
- protected FileSystem blobFS;
- /**
- * BLOBStore that manages BLOB data in the file system
- * (if externalBLOBs==true)
- */
- protected BLOBStore blobStore;
-
- /**
- * Creates a new DatabasePersistenceManager instance.
- */
- public DatabasePersistenceManager() {
- schema = "default";
- schemaObjectPrefix = "";
- externalBLOBs = true;
- initialized = false;
- }
-
- //----------------------------------------------------< setters & getters >
-
- 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;
- }
-
- public boolean isExternalBLOBs() {
- return externalBLOBs;
- }
-
- public void setExternalBLOBs(boolean externalBLOBs) {
- this.externalBLOBs = externalBLOBs;
- }
-
- public void setExternalBLOBs(String externalBLOBs) {
- this.externalBLOBs = Boolean.valueOf(externalBLOBs).booleanValue();
- }
-
- //---------------------------------------------------< PersistenceManager >
- /**
- * {@inheritDoc}
- */
- public void init(PMContext context) throws Exception {
- if (initialized) {
- throw new IllegalStateException("already initialized");
- }
-
- // 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
- nodeStateInsert =
- con.prepareStatement("insert into "
- + schemaObjectPrefix + "NODE (NODE_DATA, NODE_ID) values (?, ?)");
- nodeStateUpdate =
- con.prepareStatement("update "
- + schemaObjectPrefix + "NODE set NODE_DATA = ? where NODE_ID = ?");
- nodeStateSelect =
- con.prepareStatement("select NODE_DATA from "
- + schemaObjectPrefix + "NODE where NODE_ID = ?");
- nodeStateSelectExist =
- con.prepareStatement("select 1 from "
- + schemaObjectPrefix + "NODE where NODE_ID = ?");
- nodeStateDelete =
- con.prepareStatement("delete from "
- + schemaObjectPrefix + "NODE where NODE_ID = ?");
-
- propertyStateInsert =
- con.prepareStatement("insert into "
- + schemaObjectPrefix + "PROP (PROP_DATA, PROP_ID) values (?, ?)");
- propertyStateUpdate =
- con.prepareStatement("update "
- + schemaObjectPrefix + "PROP set PROP_DATA = ? where PROP_ID = ?");
- propertyStateSelect =
- con.prepareStatement("select PROP_DATA from "
- + schemaObjectPrefix + "PROP where PROP_ID = ?");
- propertyStateSelectExist =
- con.prepareStatement("select 1 from "
- + schemaObjectPrefix + "PROP where PROP_ID = ?");
- propertyStateDelete =
- con.prepareStatement("delete from "
- + schemaObjectPrefix + "PROP where PROP_ID = ?");
-
- nodeReferenceInsert =
- con.prepareStatement("insert into "
- + schemaObjectPrefix + "REFS (REFS_DATA, NODE_ID) values (?, ?)");
- nodeReferenceUpdate =
- con.prepareStatement("update "
- + schemaObjectPrefix + "REFS set REFS_DATA = ? where NODE_ID = ?");
- nodeReferenceSelect =
- con.prepareStatement("select REFS_DATA from "
- + schemaObjectPrefix + "REFS where NODE_ID = ?");
- nodeReferenceSelectExist =
- con.prepareStatement("select 1 from "
- + schemaObjectPrefix + "REFS where NODE_ID = ?");
- nodeReferenceDelete =
- con.prepareStatement("delete from "
- + schemaObjectPrefix + "REFS where NODE_ID = ?");
-
- if (externalBLOBs) {
- /**
- * store BLOBs in local file system in a sub directory
- * of the workspace home directory
- */
- LocalFileSystem blobFS = new LocalFileSystem();
- blobFS.setRoot(new File(context.getHomeDir(), "blobs"));
- blobFS.init();
- this.blobFS = blobFS;
- blobStore = new FileSystemBLOBStore(blobFS);
- } else {
- /**
- * store BLOBs in db
- */
- blobStore = new DbBLOBStore();
-
- blobInsert =
- con.prepareStatement("insert into "
- + schemaObjectPrefix + "BINVAL (BINVAL_DATA, BINVAL_ID) values (?, ?)");
- blobUpdate =
- con.prepareStatement("update "
- + schemaObjectPrefix + "BINVAL set BINVAL_DATA = ? where BINVAL_ID = ?");
- blobSelect =
- con.prepareStatement("select BINVAL_DATA from "
- + schemaObjectPrefix + "BINVAL where BINVAL_ID = ?");
- blobSelectExist =
- con.prepareStatement("select 1 from "
- + schemaObjectPrefix + "BINVAL where BINVAL_ID = ?");
- blobDelete =
- con.prepareStatement("delete from "
- + schemaObjectPrefix + "BINVAL where BINVAL_ID = ?");
- }
-
- initialized = true;
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void close() throws Exception {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- try {
- // close shared prepared statements
- closeStatement(nodeStateInsert);
- closeStatement(nodeStateUpdate);
- closeStatement(nodeStateSelect);
- closeStatement(nodeStateSelectExist);
- closeStatement(nodeStateDelete);
-
- closeStatement(propertyStateInsert);
- closeStatement(propertyStateUpdate);
- closeStatement(propertyStateSelect);
- closeStatement(propertyStateSelectExist);
- closeStatement(propertyStateDelete);
-
- closeStatement(nodeReferenceInsert);
- closeStatement(nodeReferenceUpdate);
- closeStatement(nodeReferenceSelect);
- closeStatement(nodeReferenceSelectExist);
- closeStatement(nodeReferenceDelete);
-
- if (!externalBLOBs) {
- closeStatement(blobInsert);
- closeStatement(blobUpdate);
- closeStatement(blobSelect);
- closeStatement(blobSelectExist);
- closeStatement(blobDelete);
- } else {
- // close BLOB file system
- blobFS.close();
- blobFS = null;
- }
- blobStore = null;
-
- // close jdbc connection
- closeConnection(con);
-
- } finally {
- initialized = false;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void store(ChangeLog changeLog)
- throws ItemStateException {
- ItemStateException ise = null;
- try {
- super.store(changeLog);
- } catch (ItemStateException e) {
- ise = e;
- } finally {
- if (ise == null) {
- // storing the changes succeeded, now commit the changes
- try {
- con.commit();
- } catch (SQLException e) {
- String msg = "committing change log failed";
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- }
- } else {
- // storing the changes failed, rollback changes
- try {
- con.rollback();
- } catch (SQLException e) {
- String msg = "rollback of change log failed";
- log.error(msg, e);
- }
- // re-throw original exception
- throw ise;
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public NodeState load(NodeId id)
- throws NoSuchItemStateException, ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- PreparedStatement stmt = nodeStateSelect;
- synchronized (stmt) {
- ResultSet rs = null;
- InputStream in = null;
- try {
- stmt.setString(1, id.toString());
- stmt.execute();
- rs = stmt.getResultSet();
- if (!rs.next()) {
- throw new NoSuchItemStateException(id.toString());
- }
-
- in = rs.getBinaryStream(1);
- NodeState state = createNew(id);
- Serializer.deserialize(state, in);
-
- return state;
- } catch (Exception e) {
- if (e instanceof NoSuchItemStateException) {
- throw (NoSuchItemStateException) e;
- }
- String msg = "failed to read node state: " + id;
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- closeStream(in);
- closeResultSet(rs);
- resetStatement(stmt);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyState load(PropertyId id)
- throws NoSuchItemStateException, ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- PreparedStatement stmt = propertyStateSelect;
- synchronized (stmt) {
- ResultSet rs = null;
- InputStream in = null;
- try {
- stmt.setString(1, id.toString());
- stmt.execute();
- rs = stmt.getResultSet();
- if (!rs.next()) {
- throw new NoSuchItemStateException(id.toString());
- }
-
- in = rs.getBinaryStream(1);
- PropertyState state = createNew(id);
- Serializer.deserialize(state, in, blobStore);
-
- return state;
- } catch (Exception e) {
- if (e instanceof NoSuchItemStateException) {
- throw (NoSuchItemStateException) e;
- }
- String msg = "failed to read property state: " + id;
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- closeStream(in);
- closeResultSet(rs);
- resetStatement(stmt);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- *
PreparedStatements which must
- * be executed strictly sequentially. Because this method synchronizes on
- * the persistence manager instance there is no need to synchronize on the
- * shared statement. If the method would not be sychronized the shared
- * statements would have to be synchronized.
- */
- public synchronized void store(NodeState state) throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- // check if insert or update
- boolean update = state.getStatus() != ItemState.STATUS_NEW;
- //boolean update = exists(state.getId());
- PreparedStatement stmt = (update) ? nodeStateUpdate : nodeStateInsert;
-
- try {
- ByteArrayOutputStream out =
- new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
- // serialize node state
- Serializer.serialize(state, out);
-
- // we are synchronized on this instance, therefore we do not
- // not have to additionally synchronize on the preparedStatement
-
- stmt.setBytes(1, out.toByteArray());
- stmt.setString(2, state.getNodeId().toString());
- stmt.executeUpdate();
-
- // there's no need to close a ByteArrayOutputStream
- //out.close();
- } catch (Exception e) {
- String msg = "failed to write node state: " + state.getNodeId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * This method uses shared PreparedStatements which must
- * be executed strictly sequentially. Because this method synchronizes on
- * the persistence manager instance there is no need to synchronize on the
- * shared statement. If the method would not be sychronized the shared
- * statements would have to be synchronized.
- */
- public synchronized void store(PropertyState state)
- throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- // check if insert or update
- boolean update = state.getStatus() != ItemState.STATUS_NEW;
- //boolean update = exists(state.getId());
- PreparedStatement stmt = (update) ? propertyStateUpdate : propertyStateInsert;
-
- try {
- ByteArrayOutputStream out =
- new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
- // serialize property state
- Serializer.serialize(state, out, blobStore);
-
- // we are synchronized on this instance, therefore we do not
- // not have to additionally synchronize on the preparedStatement
-
- stmt.setBytes(1, out.toByteArray());
- stmt.setString(2, state.getPropertyId().toString());
- stmt.executeUpdate();
-
- // there's no need to close a ByteArrayOutputStream
- //out.close();
- } catch (Exception e) {
- String msg = "failed to write property state: " + state.getPropertyId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void destroy(NodeState state)
- throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- PreparedStatement stmt = nodeStateDelete;
- try {
- stmt.setString(1, state.getNodeId().toString());
- stmt.executeUpdate();
- } catch (Exception e) {
- String msg = "failed to delete node state: " + state.getNodeId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void destroy(PropertyState state)
- throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- // make sure binary values (BLOBs) are properly removed
- InternalValue[] values = state.getValues();
- if (values != null) {
- for (int i = 0; i < values.length; i++) {
- InternalValue val = values[i];
- if (val != null) {
- if (val.getType() == PropertyType.BINARY) {
- BLOBFileValue blobVal = (BLOBFileValue) val.internalValue();
- // delete internal resource representation of BLOB value
- blobVal.delete(true);
- // also remove from BLOBStore
- String blobId = blobStore.createId(state.getPropertyId(), i);
- try {
- blobStore.remove(blobId);
- } catch (Exception e) {
- log.warn("failed to remove from BLOBStore: " + blobId, e);
- }
- }
- }
- }
- }
-
- PreparedStatement stmt = propertyStateDelete;
- try {
- stmt.setString(1, state.getPropertyId().toString());
- stmt.executeUpdate();
- } catch (Exception e) {
- String msg = "failed to delete property state: " + state.getPropertyId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public NodeReferences load(NodeReferencesId targetId)
- throws NoSuchItemStateException, ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- PreparedStatement stmt = nodeReferenceSelect;
- synchronized (stmt) {
- ResultSet rs = null;
- InputStream in = null;
- try {
- stmt.setString(1, targetId.toString());
- stmt.execute();
- rs = stmt.getResultSet();
- if (!rs.next()) {
- throw new NoSuchItemStateException(targetId.toString());
- }
-
- in = rs.getBinaryStream(1);
- NodeReferences refs = new NodeReferences(targetId);
- Serializer.deserialize(refs, in);
-
- return refs;
- } catch (Exception e) {
- if (e instanceof NoSuchItemStateException) {
- throw (NoSuchItemStateException) e;
- }
- String msg = "failed to read node references: " + targetId;
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- closeStream(in);
- closeResultSet(rs);
- resetStatement(stmt);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * This method uses shared PreparedStatements which must
- * be executed strictly sequentially. Because this method synchronizes on
- * the persistence manager instance there is no need to synchronize on the
- * shared statement. If the method would not be sychronized the shared
- * statements would have to be synchronized.
- */
- public synchronized void store(NodeReferences refs)
- throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- // check if insert or update
- boolean update = exists(refs.getId());
- PreparedStatement stmt = (update) ? nodeReferenceUpdate : nodeReferenceInsert;
-
- try {
- ByteArrayOutputStream out =
- new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
- // serialize references
- Serializer.serialize(refs, out);
-
- // we are synchronized on this instance, therefore we do not
- // not have to additionally synchronize on the preparedStatement
-
- stmt.setBytes(1, out.toByteArray());
- stmt.setString(2, refs.getId().toString());
- stmt.executeUpdate();
-
- // there's no need to close a ByteArrayOutputStream
- //out.close();
- } catch (Exception e) {
- String msg = "failed to write node references: " + refs.getId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void destroy(NodeReferences refs)
- throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- PreparedStatement stmt = nodeReferenceDelete;
- try {
- stmt.setString(1, refs.getId().toString());
- stmt.executeUpdate();
- } catch (Exception e) {
- String msg = "failed to delete node references: " + refs.getId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean exists(NodeId id) throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- PreparedStatement stmt = nodeStateSelectExist;
- synchronized (stmt) {
- ResultSet rs = null;
- try {
- stmt.setString(1, id.toString());
- stmt.execute();
- rs = stmt.getResultSet();
-
- // a node state exists if the result has at least one entry
- return rs.next();
- } catch (Exception e) {
- String msg = "failed to check existence of node state: " + id;
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- closeResultSet(rs);
- resetStatement(stmt);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean exists(PropertyId id) throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- PreparedStatement stmt = propertyStateSelectExist;
- synchronized (stmt) {
- ResultSet rs = null;
- try {
- stmt.setString(1, id.toString());
- stmt.execute();
- rs = stmt.getResultSet();
-
- // a property state exists if the result has at least one entry
- return rs.next();
- } catch (Exception e) {
- String msg = "failed to check existence of property state: " + id;
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- closeResultSet(rs);
- resetStatement(stmt);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean exists(NodeReferencesId targetId) throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- PreparedStatement stmt = nodeReferenceSelectExist;
- synchronized (stmt) {
- ResultSet rs = null;
- try {
- stmt.setString(1, targetId.toString());
- stmt.execute();
- rs = stmt.getResultSet();
-
- // a reference exists if the result has at least one entry
- return rs.next();
- } catch (Exception e) {
- String msg = "failed to check existence of node references: "
- + targetId;
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- closeResultSet(rs);
- resetStatement(stmt);
- }
- }
- }
-
- //----------------------------------< misc. helper methods & overridables >
-
- /**
- * Initializes the database connection used by this file system.
- *
- * Subclasses should normally override the {@link #getConnection()}
- * method instead of this one. The default implementation calls
- * {@link #getConnection()} to get the database connection and disables
- * the autocommit feature.
- *
- * @throws Exception if an error occurs
- */
- protected void initConnection() throws Exception {
- con = getConnection();
- con.setAutoCommit(false);
- }
-
- /**
- * Abstract factory method for creating a new database connection. This
- * method is called by {@link #init(PMContext)} when the persistence
- * manager is started. The returned connection should come with the default
- * JDBC settings, as the {@link #init(PMContext)} 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 persistence manager, after which it is closed by - * {@link #close()} using the {@link #closeConnection(Connection)} method. - * - * @return new connection - * @throws Exception if an error occurs - */ - protected Connection getConnection() throws Exception { - throw new UnsupportedOperationException("Override in a subclass!"); - } - - /** - * Closes the given database connection. This method is called by - * {@link #close()} to close the connection acquired using - * {@link #getConnection()} when the persistence manager 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 closeConnection(Connection connection) throws Exception {
- connection.close();
- }
-
- /**
- * Resets the given PreparedStatement by clearing the parameters
- * and warnings contained.
- *
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) {
- logException("failed resetting PreparedStatement", se);
- }
- }
- }
-
- protected void closeResultSet(ResultSet rs) {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException se) {
- logException("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) {
- logException("failed closing Statement", se);
- }
- }
- }
-
- protected void logException(String message, SQLException se) {
- if (message != null) {
- log.error(message);
- }
- log.error(" reason: " + se.getMessage());
- log.error("state/code: " + se.getSQLState() + "/" + se.getErrorCode());
- log.debug(" dump:", se);
- }
-
- /**
- * 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 + "NODE";
- 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) {
- // Skip comments and empty lines
- if (!sql.startsWith("#") && sql.length() > 0) {
- // 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();
- }
- // commit the changes
- con.commit();
- } finally {
- closeStream(in);
- closeStatement(stmt);
- }
- }
- }
-
- //--------------------------------------------------------< inner classes >
- class DbBLOBStore implements BLOBStore {
- /**
- * {@inheritDoc}
- */
- public String createId(PropertyId id, int index) {
- // the blobId is a simple string concatenation of id plus index
- StringBuffer sb = new StringBuffer();
- sb.append(id.toString());
- sb.append('[');
- sb.append(index);
- sb.append(']');
- return sb.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public InputStream get(String blobId) throws Exception {
- PreparedStatement stmt = blobSelect;
- synchronized (stmt) {
- try {
- stmt.setString(1, blobId);
- stmt.execute();
- final ResultSet rs = stmt.getResultSet();
- if (!rs.next()) {
- closeResultSet(rs);
- throw new Exception("no such BLOB: " + blobId);
- }
- InputStream in = rs.getBinaryStream(1);
- if (in == null) {
- // some databases treat zero-length values as NULL;
- // return empty InputStream in such a case
- closeResultSet(rs);
- return new ByteArrayInputStream(new byte[0]);
- }
-
- /**
- * return an InputStream wrapper in order to
- * close the ResultSet when the stream is closed
- */
- return new FilterInputStream(in) {
- public void close() throws IOException {
- in.close();
- // now it's safe to close ResultSet
- closeResultSet(rs);
- }
- };
- } finally {
- resetStatement(stmt);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void put(String blobId, InputStream in, long size)
- throws Exception {
- PreparedStatement stmt = blobSelectExist;
- try {
- stmt.setString(1, blobId);
- stmt.execute();
- ResultSet rs = stmt.getResultSet();
- // a BLOB exists if the result has at least one entry
- boolean exists = rs.next();
- resetStatement(stmt);
- closeResultSet(rs);
-
- stmt = (exists) ? blobUpdate : blobInsert;
- stmt.setBinaryStream(1, in, (int) size);
- stmt.setString(2, blobId);
- stmt.executeUpdate();
- } finally {
- resetStatement(stmt);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized boolean remove(String blobId) throws Exception {
- PreparedStatement stmt = blobDelete;
- try {
- stmt.setString(1, blobId);
- return stmt.executeUpdate() == 1;
- } finally {
- resetStatement(stmt);
- }
- }
- }
-}
+public abstract class DatabasePersistenceManager
+ extends org.apache.jackrabbit.core.persistence.db.DatabasePersistenceManager {
+}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java?view=diff&rev=467925&r1=467924&r2=467925
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java Thu Oct 26 02:11:18 2006
@@ -16,98 +16,11 @@
*/
package org.apache.jackrabbit.core.state.db;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
/**
- * DerbyPersistenceManager is a JDBC-based
- * PersistenceManager for Jackrabbit that persists
- * ItemState and NodeReferences objects in an
- * embedded Derby database using a simple custom serialization format and a
- * very basic non-normalized database schema (in essence tables with one 'key'
- * and one 'data' column).
- *
- * It is configured through the following properties:
- * url: the database url of the form
- * "jdbc:derby:[db];[attributes]"schemaObjectPrefix: prefix to be prepended to schema objectsdriver: the FQN name of the JDBC driver class
- * (default: "org.apache.derby.jdbc.EmbeddedDriver")schema: type of schema to be used
- * (default: "derby")user: the database user (default: "")password: the user's password (default: "")externalBLOBs: if true (the default) BINARY
- * values (BLOBs) are stored in the local file system;
- * if false BLOBs are stored in the database
- * <PersistenceManager class="org.apache.jackrabbit.core.state.db.DerbyPersistenceManager">
- * <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
- * <param name="schemaObjectPrefix" value="${wsp.name}_"/>
- * <param name="externalBLOBs" value="false"/>
- * </PersistenceManager>
- *
- */
-public class DerbyPersistenceManager extends SimpleDbPersistenceManager {
-
- /**
- * Logger instance
- */
- private static Logger log = LoggerFactory.getLogger(DerbyPersistenceManager.class);
-
- /**
- * Creates a new SimpleDbPersistenceManager instance.
- */
- public DerbyPersistenceManager() {
- // preset some attributes to reasonable defaults
- schema = "derby";
- driver = "org.apache.derby.jdbc.EmbeddedDriver";
- schemaObjectPrefix = "";
- user = "";
- password = "";
- }
-
- //------------------------------------------< DatabasePersistenceManager >
-
- /**
- * Closes the given connection by shutting down the embedded Derby
- * database.
- *
- * @param connection database connection
- * @throws SQLException if an error occurs
- * @see DatabasePersistenceManager#closeConnection(Connection)
- */
- protected void closeConnection(Connection connection) throws SQLException {
- // prepare connection url for issuing shutdown command
- String url = connection.getMetaData().getURL();
- int pos = url.lastIndexOf(';');
- if (pos != -1) {
- // strip any attributes from connection url
- url = url.substring(0, pos);
- }
- url += ";shutdown=true";
-
- // we have to reset the connection to 'autoCommit=true' before closing it;
- // otherwise Derby would mysteriously complain about some pending uncommitted
- // changes which can't possibly be true.
- // @todo further investigate
- connection.setAutoCommit(true);
-
- // now it's safe to shutdown the embedded Derby database
- try {
- DriverManager.getConnection(url);
- } catch (SQLException e) {
- // a shutdown command always raises a SQLException
- log.info(e.getMessage());
- }
- }
-}
+ * Legacy class kept for backward compatibility reasons.
+ * @deprecated use {@link org.apache.jackrabbit.core.persistence.db.DerbyPersistenceManager}
+ * instead.
+ */
+public class DerbyPersistenceManager
+ extends org.apache.jackrabbit.core.persistence.db.DerbyPersistenceManager {
+}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java?view=diff&rev=467925&r1=467924&r2=467925
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java Thu Oct 26 02:11:18 2006
@@ -16,66 +16,11 @@
*/
package org.apache.jackrabbit.core.state.db;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-
/**
- * Database persistence manager 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 SimpleDbPersistenceManager} for more configuration
- * details.
- *
- * WARNING: The acquired database connection is kept
- * for the entire lifetime of the persistence manager instance. The
- * configured data source should be prepared for this.
- */
-public class JNDIDatabasePersistenceManager extends DatabasePersistenceManager {
-
- /**
- * 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;
- }
-
- //-------------------------------------------< DatabasePersistenceManager >
-
- /**
- * 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 SQLException if a database access error occurs
- * @see DatabasePersistenceManager#getConnection()
- */
- protected Connection getConnection() throws NamingException, SQLException {
- InitialContext ic = new InitialContext();
- DataSource dataSource = (DataSource) ic.lookup(dataSourceLocation);
- return dataSource.getConnection();
- }
-
-}
+ * Legacy class kept for backward compatibility reasons.
+ * @deprecated use {@link org.apache.jackrabbit.core.persistence.db.JNDIDatabasePersistenceManager}
+ * instead.
+ */
+public class JNDIDatabasePersistenceManager
+ extends org.apache.jackrabbit.core.persistence.db.JNDIDatabasePersistenceManager {
+}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/OraclePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/OraclePersistenceManager.java?view=diff&rev=467925&r1=467924&r2=467925
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/OraclePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/OraclePersistenceManager.java Thu Oct 26 02:11:18 2006
@@ -16,399 +16,11 @@
*/
package org.apache.jackrabbit.core.state.db;
-import org.apache.jackrabbit.core.state.PMContext;
-import org.apache.jackrabbit.core.state.NodeReferences;
-import org.apache.jackrabbit.core.state.ItemStateException;
-import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.state.ItemState;
-import org.apache.jackrabbit.core.state.util.Serializer;
-import org.apache.jackrabbit.util.Text;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.sql.Blob;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.DatabaseMetaData;
-import java.sql.Statement;
-
/**
- * OraclePersistenceManager is a JDBC-based
- * PersistenceManager for Jackrabbit that persists
- * ItemState and NodeReferences objects in Oracle
- * database using a simple custom serialization format and a
- * very basic non-normalized database schema (in essence tables with one 'key'
- * and one 'data' column).
- *
driver: the FQN name of the JDBC driver class
- * (default: "oracle.jdbc.OracleDriver")schema: type of schema to be used
- * (default: "oracle")url: the database url (e.g.
- * "jdbc:oracle:thin:@[host]:[port]:[sid]")user: the database userpassword: the user's passwordschemaObjectPrefix: prefix to be prepended to schema objectsexternalBLOBs: if true (the default) BINARY
- * values (BLOBs) are stored in the local file system;
- * if false BLOBs are stored in the database
- * <PersistenceManager class="org.apache.jackrabbit.core.state.db.OraclePersistenceManager">
- * <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="${wsp.name}_"/>
- * <param name="externalBLOBs" value="false"/>
- * </PersistenceManager>
- *
- */
-public class OraclePersistenceManager extends SimpleDbPersistenceManager {
-
- /**
- * Logger instance
- */
- private static Logger log = LoggerFactory.getLogger(OraclePersistenceManager.class);
-
- private Class blobClass;
- private Integer DURATION_SESSION_CONSTANT;
- private Integer MODE_READWRITE_CONSTANT;
-
- /**
- * Creates a new OraclePersistenceManager instance.
- */
- public OraclePersistenceManager() {
- // preset some attributes to reasonable defaults
- schema = "oracle";
- driver = "oracle.jdbc.OracleDriver";
- schemaObjectPrefix = "";
- user = "";
- password = "";
- initialized = false;
- }
-
- //---------------------------------< SimpleDbPersistenceManager overrides >
- /**
- * {@inheritDoc}
- *
- * Retrieve the oracle.sql.BLOB class via reflection, and
- * initialize the values for the DURATION_SESSION and
- * MODE_READWRITE constants defined there.
- * @see oracle.sql.BLOB#DURATION_SESSION
- * @see oracle.sql.BLOB#MODE_READWRITE
- */
- public void init(PMContext context) throws Exception {
- super.init(context);
-
- if (!externalBLOBs) {
- blobStore = new OracleBLOBStore();
- }
-
- // initialize oracle.sql.BLOB class & constants
-
- // use the Connection object for using the exact same
- // class loader that the Oracle driver was loaded with
- blobClass = con.getClass().getClassLoader().loadClass("oracle.sql.BLOB");
- DURATION_SESSION_CONSTANT =
- new Integer(blobClass.getField("DURATION_SESSION").getInt(null));
- MODE_READWRITE_CONSTANT =
- new Integer(blobClass.getField("MODE_READWRITE").getInt(null));
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void store(NodeState state) throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- // check if insert or update
- boolean update = state.getStatus() != ItemState.STATUS_NEW;
- //boolean update = exists((NodeId) state.getId());
- PreparedStatement stmt = (update) ? nodeStateUpdate : nodeStateInsert;
-
- Blob blob = null;
- try {
- ByteArrayOutputStream out =
- new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
- // serialize node state
- Serializer.serialize(state, out);
-
- // we are synchronized on this instance, therefore we do not
- // not have to additionally synchronize on the preparedStatement
-
- blob = createTemporaryBlob(new ByteArrayInputStream(out.toByteArray()));
- stmt.setBlob(1, blob);
- stmt.setString(2, state.getId().toString());
- stmt.executeUpdate();
-
- // there's no need to close a ByteArrayOutputStream
- //out.close();
- } catch (Exception e) {
- String msg = "failed to write node state: " + state.getId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- if (blob != null) {
- try {
- freeTemporaryBlob(blob);
- } catch (Exception e1) {
- }
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void store(PropertyState state) throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- // check if insert or update
- boolean update = state.getStatus() != ItemState.STATUS_NEW;
- //boolean update = exists((PropertyId) state.getId());
- PreparedStatement stmt = (update) ? propertyStateUpdate : propertyStateInsert;
-
- Blob blob = null;
- try {
- ByteArrayOutputStream out =
- new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
- // serialize property state
- Serializer.serialize(state, out, blobStore);
-
- // we are synchronized on this instance, therefore we do not
- // not have to additionally synchronize on the preparedStatement
-
- blob = createTemporaryBlob(new ByteArrayInputStream(out.toByteArray()));
- stmt.setBlob(1, blob);
- stmt.setString(2, state.getId().toString());
- stmt.executeUpdate();
-
- // there's no need to close a ByteArrayOutputStream
- //out.close();
- } catch (Exception e) {
- String msg = "failed to write property state: " + state.getId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- if (blob != null) {
- try {
- freeTemporaryBlob(blob);
- } catch (Exception e1) {
- }
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized void store(NodeReferences refs) throws ItemStateException {
- if (!initialized) {
- throw new IllegalStateException("not initialized");
- }
-
- // check if insert or update
- boolean update = exists(refs.getId());
- PreparedStatement stmt = (update) ? nodeReferenceUpdate : nodeReferenceInsert;
-
- Blob blob = null;
- try {
- ByteArrayOutputStream out =
- new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
- // serialize references
- Serializer.serialize(refs, out);
-
- // we are synchronized on this instance, therefore we do not
- // not have to additionally synchronize on the preparedStatement
-
- blob = createTemporaryBlob(new ByteArrayInputStream(out.toByteArray()));
- stmt.setBlob(1, blob);
- stmt.setString(2, refs.getId().toString());
- stmt.executeUpdate();
-
- // there's no need to close a ByteArrayOutputStream
- //out.close();
- } catch (Exception e) {
- String msg = "failed to write node references: " + refs.getId();
- log.error(msg, e);
- throw new ItemStateException(msg, e);
- } finally {
- resetStatement(stmt);
- if (blob != null) {
- try {
- freeTemporaryBlob(blob);
- } catch (Exception e1) {
- }
- }
- }
- }
-
- /**
- * {@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 + "NODE";
- 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 = 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) {
- // Skip comments and empty lines
- if (!sql.startsWith("#") && sql.length() > 0) {
- // 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();
- }
- // commit the changes
- con.commit();
- } finally {
- closeStream(in);
- closeStatement(stmt);
- }
- }
- }
-
- //----------------------------------------< oracle-specific blob handling >
- /**
- * Creates a temporary oracle.sql.BLOB instance via reflection and spools
- * the contents of the specified stream.
- */
- protected Blob createTemporaryBlob(InputStream in) throws Exception {
- /*
- BLOB blob = BLOB.createTemporary(con, false, BLOB.DURATION_SESSION);
- blob.open(BLOB.MODE_READWRITE);
- OutputStream out = blob.getBinaryOutputStream();
- ...
- out.flush();
- out.close();
- blob.close();
- return blob;
- */
- Method createTemporary = blobClass.getMethod("createTemporary",
- new Class[]{Connection.class, Boolean.TYPE, Integer.TYPE});
- Object blob = createTemporary.invoke(null,
- new Object[]{con, Boolean.FALSE, DURATION_SESSION_CONSTANT});
- Method open = blobClass.getMethod("open", new Class[]{Integer.TYPE});
- open.invoke(blob, new Object[]{MODE_READWRITE_CONSTANT});
- Method getBinaryOutputStream =
- blobClass.getMethod("getBinaryOutputStream", new Class[0]);
- OutputStream out = (OutputStream) getBinaryOutputStream.invoke(blob, null);
- try {
- int read;
- byte[] buf = new byte[8192];
- while ((read = in.read(buf, 0, buf.length)) > -1) {
- out.write(buf, 0, read);
- }
- } finally {
- try {
- out.flush();
- } catch (IOException ioe) {
- }
- out.close();
- }
- Method close = blobClass.getMethod("close", new Class[0]);
- close.invoke(blob, null);
- return (Blob) blob;
- }
-
- /**
- * Frees a temporary oracle.sql.BLOB instance via reflection.
- */
- protected void freeTemporaryBlob(Object blob) throws Exception {
- // blob.freeTemporary();
- Method freeTemporary = blobClass.getMethod("freeTemporary", new Class[0]);
- freeTemporary.invoke(blob, null);
- }
-
- //--------------------------------------------------------< inner classes >
- class OracleBLOBStore extends DbBLOBStore {
- /**
- * {@inheritDoc}
- */
- public synchronized void put(String blobId, InputStream in, long size)
- throws Exception {
- PreparedStatement stmt = blobSelectExist;
- Blob blob = null;
- try {
- stmt.setString(1, blobId);
- stmt.execute();
- ResultSet rs = stmt.getResultSet();
- // a BLOB exists if the result has at least one entry
- boolean exists = rs.next();
- resetStatement(stmt);
- closeResultSet(rs);
-
- stmt = (exists) ? blobUpdate : blobInsert;
-
- blob = createTemporaryBlob(in);
- stmt.setBlob(1, blob);
- stmt.setString(2, blobId);
- stmt.executeUpdate();
- } finally {
- resetStatement(stmt);
- if (blob != null) {
- try {
- freeTemporaryBlob(blob);
- } catch (Exception e1) {
- }
- }
- }
- }
- }
-}
+ * Legacy class kept for backward compatibility reasons.
+ * @deprecated use {@link org.apache.jackrabbit.core.persistence.db.OraclePersistenceManager}
+ * instead.
+ */
+public class OraclePersistenceManager
+ extends org.apache.jackrabbit.core.persistence.db.OraclePersistenceManager {
+}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java?view=diff&rev=467925&r1=467924&r2=467925
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java Thu Oct 26 02:11:18 2006
@@ -16,152 +16,11 @@
*/
package org.apache.jackrabbit.core.state.db;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-import org.apache.jackrabbit.core.state.util.Serializer;
-
/**
- * SimpleDbPersistenceManager is a generic JDBC-based
- * PersistenceManager for Jackrabbit that persists
- * ItemState and NodeReferences objects using a
- * simple custom binary serialization format (see {@link Serializer}) and a
- * very basic non-normalized database schema (in essence tables with one 'key'
- * and one 'data' column).
- *
- * It is configured through the following properties:
- * driver: the FQN name of the JDBC driver classurl: the database url of the form jdbc:subprotocol:subnameuser: the database userpassword: the user's passwordschema: type of schema to be used
- * (e.g. mysql, mssql, etc.); schemaObjectPrefix: prefix to be prepended to schema objectsexternalBLOBs: if true (the default) BINARY
- * values (BLOBs) are stored in the local file system;
- * if false BLOBs are stored in the databasegetClass().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:
- *
- * <PersistenceManager class="org.apache.jackrabbit.core.state.db.SimpleDbPersistenceManager">
- * <param name="driver" value="com.mysql.jdbc.Driver"/>
- * <param name="url" value="jdbc:mysql:///test?autoReconnect=true"/>
- * <param name="schema" value="mysql"/>
- * <param name="schemaObjectPrefix" value="${wsp.name}_"/>
- * <param name="externalBLOBs" value="false"/>
- * </PersistenceManager>
- *
- * The following is a fragment from a sample configuration using Daffodil One$DB Embedded:
- *
- * <PersistenceManager class="org.apache.jackrabbit.core.state.db.SimpleDbPersistenceManager">
- * <param name="driver" value="in.co.daffodil.db.jdbc.DaffodilDBDriver"/>
- * <param name="url" value="jdbc:daffodilDB_embedded:${wsp.name};path=${wsp.home}/../../databases;create=true"/>
- * <param name="user" value="daffodil"/>
- * <param name="password" value="daffodil"/>
- * <param name="schema" value="daffodil"/>
- * <param name="schemaObjectPrefix" value="${wsp.name}_"/>
- * <param name="externalBLOBs" value="false"/>
- * </PersistenceManager>
- *
- * The following is a fragment from a sample configuration using DB2:
- *
- * <PersistenceManager class="org.apache.jackrabbit.core.state.db.SimpleDbPersistenceManager">
- * <param name="driver" value="com.ibm.db2.jcc.DB2Driver"/>
- * <param name="url" value="jdbc:db2:test"/>
- * <param name="schema" value="db2"/>
- * <param name="schemaObjectPrefix" value="${wsp.name}_"/>
- * <param name="externalBLOBs" value="false"/>
- * </PersistenceManager>
- *
- * The following is a fragment from a sample configuration using MSSQL:
- *
- * <PersistenceManager class="org.apache.jackrabbit.core.state.db.SimpleDbPersistenceManager">
- * <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="${wsp.name}_"/>
- * <param name="externalBLOBs" value="false"/>
- * </PersistenceManager>
- *
- * The following is a fragment from a sample configuration using PostgreSQL:
- *
- * <PersistenceManager class="org.apache.jackrabbit.core.state.db.SimpleDbPersistenceManager">
- * <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="${wsp.name}_"/>
- * <param name="externalBLOBs" value="false"/>
- * </PersistenceManager>
- *
- * See also {@link DerbyPersistenceManager}, {@link OraclePersistenceManager}.
- */
-public class SimpleDbPersistenceManager extends DatabasePersistenceManager {
-
- protected String driver;
- protected String url;
- protected String user;
- protected String password;
-
- //----------------------------------------------------< 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;
- }
-
- //------------------------------------------< DatabasePersistenceManager >
-
- /**
- * Returns a JDBC connection acquired using the JDBC {@link DriverManager}.
- *
- * @throws ClassNotFoundException if the JDBC driver class is not found
- * @throws SQLException if a database access error occurs
- * @see DatabasePersistenceManager#getConnection()
- */
- protected Connection getConnection() throws ClassNotFoundException, SQLException {
- Class.forName(driver);
- Connection connection = DriverManager.getConnection(url, user, password);
- return connection;
- }
-
-}
+ * Legacy class kept for backward compatibility reasons.
+ * @deprecated use {@link org.apache.jackrabbit.core.persistence.db.SimpleDbPersistenceManager}
+ * instead.
+ */
+public class SimpleDbPersistenceManager
+ extends org.apache.jackrabbit.core.persistence.db.SimpleDbPersistenceManager {
+}
\ No newline at end of file