Index: src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java (revision 546776) +++ src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java (working copy) @@ -58,6 +58,7 @@ *
  • user: the database user
    • *
  • password: the user's password
    • *
  • schemaObjectPrefix: prefix to be prepended to schema objects
    • + *
  • tableSpace: the tablespace to use
    • * * See also {@link DbFileSystem}. *

    @@ -68,6 +69,7 @@ * <param name="user" value="scott"/> * <param name="password" value="tiger"/> * <param name="schemaObjectPrefix" value="rep_"/> + * <param name="tableSpace" value="default"/> * </FileSystem> * */ @@ -82,6 +84,13 @@ private Integer DURATION_SESSION_CONSTANT; private Integer MODE_READWRITE_CONSTANT; + /** the variable for the Oracle table space */ + public static final String TABLE_SPACE_VARIABLE = + "${tableSpace}"; + + /** the Oracle table space to use */ + protected String tableSpace; + /** * Creates a new OracleFileSystem instance. */ @@ -95,6 +104,26 @@ initialized = false; } + /** + * Returns the configured Oracle table space. + * @return the configured Oracle table space. + */ + public String getTableSpace() { + return tableSpace; + } + + /** + * Sets the Oracle table space. + * @param tableSpace the Oracle table space. + */ + public void setTableSpace(String tableSpace) { + if (tableSpace != null) { + this.tableSpace = tableSpace.trim(); + } else { + this.tableSpace = null; + } + } + //-----------------------------------------< DatabaseFileSystem overrides > /** * {@inheritDoc} @@ -169,6 +198,16 @@ if (!sql.startsWith("#") && sql.length() > 0) { // replace prefix variable sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix); + + // set the tablespace if it is defined + String tspace; + if (tableSpace == null || "".equals(tableSpace)) { + tspace = ""; + } else { + tspace = "tablespace " + tableSpace; + } + sql = Text.replace(sql, TABLE_SPACE_VARIABLE, tspace).trim(); + // execute sql stmt stmt.executeUpdate(sql); } Index: src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java (revision 546776) +++ src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java (working copy) @@ -578,7 +578,7 @@ // Skip comments and empty lines if (!sql.startsWith("#") && sql.length() > 0) { // replace prefix variable - sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix); + sql = createSchemaSQL(sql); // execute sql stmt stmt.executeUpdate(sql); } @@ -593,6 +593,16 @@ } /** + * Creates an SQL statement for schema creation by variable substitution. + * + * @param sql a SQL string which may contain variables to substitute + * @return a valid SQL string + */ + protected String createSchemaSQL(String sql) { + return Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix); + } + + /** * Builds and prepares the SQL statements. * * @throws SQLException if an error occurs Index: src/main/java/org/apache/jackrabbit/core/journal/OracleDatabaseJournal.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/journal/OracleDatabaseJournal.java (revision 0) +++ src/main/java/org/apache/jackrabbit/core/journal/OracleDatabaseJournal.java (revision 0) @@ -0,0 +1,60 @@ +package org.apache.jackrabbit.core.journal; + +import org.apache.jackrabbit.util.Text; + + + +/** + * It has the following property in addition to those of the DatabaseJournal: + *

    + */ +public class OracleDatabaseJournal extends DatabaseJournal { + + /** the variable for the Oracle table space */ + public static final String TABLE_SPACE_VARIABLE = + "${tableSpace}"; + + /** the Oracle table space to use */ + protected String tableSpace; + + /** + * Returns the configured Oracle table space. + * @return the configured Oracle table space. + */ + public String getTableSpace() { + return tableSpace; + } + + /** + * Sets the Oracle table space. + * @param tableSpace the Oracle table space. + */ + public void setTableSpace(String tableSpace) { + if (tableSpace != null) { + this.tableSpace = tableSpace.trim(); + } else { + this.tableSpace = null; + } + } + + /** + * {@inheritDoc} + */ + protected String createSchemaSQL(String sql) { + // replace the schemaObjectPrefix + sql = super.createSchemaSQL(sql); + // set the tablespace if it is defined + String tspace; + if (tableSpace == null || "".equals(tableSpace)) { + tspace = ""; + } else { + tspace = "tablespace " + tableSpace; + } + return Text.replace(sql, TABLE_SPACE_VARIABLE, tspace).trim(); + } + + + +} Property changes on: src\main\java\org\apache\jackrabbit\core\journal\OracleDatabaseJournal.java ___________________________________________________________________ Name: svn:keywords + LastChangedBy LastChangedDate LastChangedRevision HeadURL Name: svn:eol-style + native Index: src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (revision 546776) +++ src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (working copy) @@ -411,8 +411,7 @@ try { String sql = reader.readLine(); while (sql != null) { - // replace prefix variable - sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix).trim(); + sql = createSchemaSQL(sql); if (sql.length() > 0 && (sql.indexOf("BINVAL") < 0 || useDbBlobStore())) { // only create blob related tables of db blob store configured // execute sql stmt @@ -437,6 +436,17 @@ } /** + * Creates an SQL statement for schema creation by variable substitution. + * + * @param sql a SQL string which may contain variables to substitute + * @return a valid SQL string + */ + protected String createSchemaSQL(String sql) { + // replace prefix variable + return Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix).trim(); + } + + /** * Checks if the database table exist. * * @return true if the tables exist; Index: src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java (revision 546776) +++ src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java (working copy) @@ -22,6 +22,7 @@ import org.apache.jackrabbit.core.persistence.PMContext; import org.apache.jackrabbit.core.persistence.bundle.util.NGKDbNameIndex; import org.apache.jackrabbit.core.persistence.bundle.util.DbNameIndex; +import org.apache.jackrabbit.util.Text; /** * Extends the {@link BundleDbPersistenceManager} by Oracle specific code. @@ -38,6 +39,7 @@ *
  • <param name="{@link #setPassword(String) password}" value="crx"/> *
  • <param name="{@link #setSchema(String) schema}" value="oracle"/> *
  • <param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value="${wsp.name}_"/> + *
  • <param name="{@link #setTableSpace(String) tableSpace}" value=""/> *
  • <param name="{@link #setErrorHandling(String) errorHandling}" value=""/> * */ @@ -46,6 +48,14 @@ /** the cvs/svn id */ static final String CVS_ID = "$URL$ $Rev$ $Date$"; + /** the variable for the Oracle table space */ + public static final String TABLE_SPACE_VARIABLE = + "${tableSpace}"; + + /** the Oracle table space to use */ + protected String tableSpace; + + /** * Creates a new oracle persistence manager */ @@ -54,6 +64,26 @@ setExternalBLOBs(false); } + /** + * Returns the configured Oracle table space. + * @return the configured Oracle table space. + */ + public String getTableSpace() { + return tableSpace; + } + + /** + * Sets the Oracle table space. + * @param tableSpace the Oracle table space. + */ + public void setTableSpace(String tableSpace) { + if (tableSpace != null) { + this.tableSpace = tableSpace.trim(); + } else { + this.tableSpace = null; + } + } + public void init(PMContext context) throws Exception { // init default values if (getDriver() == null) { @@ -107,6 +137,21 @@ } /** + * {@inheritDoc} + */ + protected String createSchemaSQL(String sql) { + sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix).trim(); + // set the tablespace if it is defined + String tspace; + if (tableSpace == null || "".equals(tableSpace)) { + tspace = ""; + } else { + tspace = "tablespace " + tableSpace; + } + return Text.replace(sql, TABLE_SPACE_VARIABLE, tspace).trim(); + } + + /** * Since Oracle only supports table names up to 30 characters in * length illegal characters are simply replaced with "_" rather than * escaping them with "_x0000_". Index: src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java (revision 546776) +++ src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java (working copy) @@ -61,6 +61,7 @@ *
  • user: the database user
    • *
  • password: the user's password
    • *
  • schemaObjectPrefix: prefix to be prepended to schema objects
    • + *
  • tableSpace: the tablespace to use
    • *
  • externalBLOBs: if true (the default) BINARY * values (BLOBs) are stored in the local file system; * if false BLOBs are stored in the database
    • @@ -74,6 +75,7 @@ * <param name="user" value="scott"/> * <param name="password" value="tiger"/> * <param name="schemaObjectPrefix" value="${wsp.name}_"/> + * <param name="tableSpace" value=""/> * <param name="externalBLOBs" value="false"/> * </PersistenceManager> * @@ -89,6 +91,13 @@ private Integer DURATION_SESSION_CONSTANT; private Integer MODE_READWRITE_CONSTANT; + /** the variable for the Oracle table space */ + public static final String TABLE_SPACE_VARIABLE = + "${tableSpace}"; + + /** the Oracle table space to use */ + protected String tableSpace; + /** * Creates a new OraclePersistenceManager instance. */ @@ -102,6 +111,26 @@ initialized = false; } + /** + * Returns the configured Oracle table space. + * @return the configured Oracle table space. + */ + public String getTableSpace() { + return tableSpace; + } + + /** + * Sets the Oracle table space. + * @param tableSpace the Oracle table space. + */ + public void setTableSpace(String tableSpace) { + if (tableSpace != null) { + this.tableSpace = tableSpace.trim(); + } else { + this.tableSpace = null; + } + } + //---------------------------------< SimpleDbPersistenceManager overrides > /** * {@inheritDoc} @@ -297,6 +326,16 @@ if (!sql.startsWith("#") && sql.length() > 0) { // replace prefix variable sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix); + + // set the tablespace if it is defined + String tspace; + if (tableSpace == null || "".equals(tableSpace)) { + tspace = ""; + } else { + tspace = "tablespace " + tableSpace; + } + sql = Text.replace(sql, TABLE_SPACE_VARIABLE, tspace).trim(); + // execute sql stmt stmt.executeUpdate(sql); } Index: src/main/resources/org/apache/jackrabbit/core/fs/db/oracle.ddl =================================================================== --- src/main/resources/org/apache/jackrabbit/core/fs/db/oracle.ddl (revision 546776) +++ src/main/resources/org/apache/jackrabbit/core/fs/db/oracle.ddl (working copy) @@ -12,5 +12,5 @@ # 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. -create table ${schemaObjectPrefix}FSENTRY (FSENTRY_PATH varchar2(2048) not null, FSENTRY_NAME varchar2(255) not null, FSENTRY_DATA blob null, FSENTRY_LASTMOD number(38,0) not null, FSENTRY_LENGTH number(38,0) null) -create unique index ${schemaObjectPrefix}FSENTRY_IDX on ${schemaObjectPrefix}FSENTRY (FSENTRY_PATH, FSENTRY_NAME) +create table ${schemaObjectPrefix}FSENTRY (FSENTRY_PATH varchar2(2048) not null, FSENTRY_NAME varchar2(255) not null, FSENTRY_DATA blob null, FSENTRY_LASTMOD number(38,0) not null, FSENTRY_LENGTH number(38,0) null) ${tableSpace} +create unique index ${schemaObjectPrefix}FSENTRY_IDX on ${schemaObjectPrefix}FSENTRY (FSENTRY_PATH, FSENTRY_NAME) ${tableSpace} Index: src/main/resources/org/apache/jackrabbit/core/journal/oracle.ddl =================================================================== --- src/main/resources/org/apache/jackrabbit/core/journal/oracle.ddl (revision 546776) +++ src/main/resources/org/apache/jackrabbit/core/journal/oracle.ddl (working copy) @@ -12,10 +12,10 @@ # 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. -create table ${schemaObjectPrefix}JOURNAL (REVISION_ID number(20,0) NOT NULL, JOURNAL_ID varchar(255), PRODUCER_ID varchar(255), REVISION_DATA blob) -create unique index ${schemaObjectPrefix}JOURNAL_IDX on ${schemaObjectPrefix}JOURNAL (REVISION_ID) -create table ${schemaObjectPrefix}GLOBAL_REVISION (REVISION_ID number(20,0) NOT NULL) -create unique index ${schemaObjectPrefix}GLOBAL_REVISION_IDX on ${schemaObjectPrefix}GLOBAL_REVISION (REVISION_ID) +create table ${schemaObjectPrefix}JOURNAL (REVISION_ID number(20,0) NOT NULL, JOURNAL_ID varchar(255), PRODUCER_ID varchar(255), REVISION_DATA blob) ${tableSpace} +create unique index ${schemaObjectPrefix}JOURNAL_IDX on ${schemaObjectPrefix}JOURNAL (REVISION_ID) ${tableSpace} +create table ${schemaObjectPrefix}GLOBAL_REVISION (REVISION_ID number(20,0) NOT NULL) ${tableSpace} +create unique index ${schemaObjectPrefix}GLOBAL_REVISION_IDX on ${schemaObjectPrefix}GLOBAL_REVISION (REVISION_ID) ${tableSpace} # Inserting the one and only revision counter record now helps avoiding race conditions insert into ${schemaObjectPrefix}GLOBAL_REVISION VALUES(0) Index: src/main/resources/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl =================================================================== --- src/main/resources/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl (revision 546776) +++ src/main/resources/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl (working copy) @@ -1,13 +1,13 @@ -create table ${schemaObjectPrefix}BUNDLE (NODE_ID raw(16) not null, BUNDLE_DATA blob not null) -create unique index ${schemaObjectPrefix}BUNDLE_IDX on ${schemaObjectPrefix}BUNDLE (NODE_ID) +create table ${schemaObjectPrefix}BUNDLE (NODE_ID raw(16) not null, BUNDLE_DATA blob not null) ${tableSpace} +create unique index ${schemaObjectPrefix}BUNDLE_IDX on ${schemaObjectPrefix}BUNDLE (NODE_ID) ${tableSpace} -create table ${schemaObjectPrefix}REFS (NODE_ID raw(16) not null, REFS_DATA blob not null) -create unique index ${schemaObjectPrefix}REFS_IDX on ${schemaObjectPrefix}REFS (NODE_ID) +create table ${schemaObjectPrefix}REFS (NODE_ID raw(16) not null, REFS_DATA blob not null) ${tableSpace} +create unique index ${schemaObjectPrefix}REFS_IDX on ${schemaObjectPrefix}REFS (NODE_ID) ${tableSpace} -create table ${schemaObjectPrefix}BINVAL (BINVAL_ID varchar2(64) not null, BINVAL_DATA blob null) -create unique index ${schemaObjectPrefix}BINVAL_IDX on ${schemaObjectPrefix}BINVAL (BINVAL_ID) +create table ${schemaObjectPrefix}BINVAL (BINVAL_ID varchar2(64) not null, BINVAL_DATA blob null) ${tableSpace} +create unique index ${schemaObjectPrefix}BINVAL_IDX on ${schemaObjectPrefix}BINVAL (BINVAL_ID) ${tableSpace} -create table ${schemaObjectPrefix}NAMES (ID INTEGER primary key, NAME varchar2(255) not null) -create unique index ${schemaObjectPrefix}NAMES_IDX on ${schemaObjectPrefix}NAMES (NAME) +create table ${schemaObjectPrefix}NAMES (ID INTEGER primary key, NAME varchar2(255) not null) ${tableSpace} +create unique index ${schemaObjectPrefix}NAMES_IDX on ${schemaObjectPrefix}NAMES (NAME) ${tableSpace} create sequence ${schemaObjectPrefix}seq_names_id create trigger ${schemaObjectPrefix}t1 before insert on ${schemaObjectPrefix}NAMES for each row begin select ${schemaObjectPrefix}seq_names_id.nextval into :new.id from dual; end; \ No newline at end of file Index: src/main/resources/org/apache/jackrabbit/core/persistence/db/oracle.ddl =================================================================== --- src/main/resources/org/apache/jackrabbit/core/persistence/db/oracle.ddl (revision 546776) +++ src/main/resources/org/apache/jackrabbit/core/persistence/db/oracle.ddl (working copy) @@ -12,11 +12,11 @@ # 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. -create table ${schemaObjectPrefix}NODE (NODE_ID char(36) not null, NODE_DATA blob not null) -create unique index ${schemaObjectPrefix}NODE_IDX on ${schemaObjectPrefix}NODE (NODE_ID) -create table ${schemaObjectPrefix}PROP (PROP_ID varchar2(1024) not null, PROP_DATA blob not null) -create unique index ${schemaObjectPrefix}PROP_IDX on ${schemaObjectPrefix}PROP (PROP_ID) -create table ${schemaObjectPrefix}REFS (NODE_ID char(36) not null, REFS_DATA blob not null) -create unique index ${schemaObjectPrefix}REFS_IDX on ${schemaObjectPrefix}REFS (NODE_ID) -create table ${schemaObjectPrefix}BINVAL (BINVAL_ID varchar2(1024) not null, BINVAL_DATA blob null) -create unique index ${schemaObjectPrefix}BINVAL_IDX on ${schemaObjectPrefix}BINVAL (BINVAL_ID) +create table ${schemaObjectPrefix}NODE (NODE_ID char(36) not null, NODE_DATA blob not null) ${tableSpace} +create unique index ${schemaObjectPrefix}NODE_IDX on ${schemaObjectPrefix}NODE (NODE_ID) ${tableSpace} +create table ${schemaObjectPrefix}PROP (PROP_ID varchar2(1024) not null, PROP_DATA blob not null) ${tableSpace} +create unique index ${schemaObjectPrefix}PROP_IDX on ${schemaObjectPrefix}PROP (PROP_ID) ${tableSpace} +create table ${schemaObjectPrefix}REFS (NODE_ID char(36) not null, REFS_DATA blob not null) ${tableSpace} +create unique index ${schemaObjectPrefix}REFS_IDX on ${schemaObjectPrefix}REFS (NODE_ID) ${tableSpace} +create table ${schemaObjectPrefix}BINVAL (BINVAL_ID varchar2(1024) not null, BINVAL_DATA blob null) ${tableSpace} +create unique index ${schemaObjectPrefix}BINVAL_IDX on ${schemaObjectPrefix}BINVAL (BINVAL_ID) ${tableSpace}