Index: src/main/java/org/apache/jackrabbit/core/fs/db/oracle.ddl
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/db/oracle.ddl (revision 28931)
+++ src/main/java/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/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java (revision 28931)
+++ 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,22 @@
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) {
+ this.tableSpace = tableSpace;
+ }
+
//-----------------------------------------< DatabaseFileSystem overrides >
/**
* {@inheritDoc}
@@ -169,6 +194,14 @@
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/persistence/bundle/BundleDbPersistenceManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (revision 28938)
+++ src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (working copy)
@@ -85,6 +85,7 @@
* <param name="{@link #setPassword(String) password}" value=""/>
* <param name="{@link #setSchema(String) schema}" value=""/>
* <param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value=""/>
+ * <param name="{@link #setTableSpace(String) tableSpace}" value=""/>
* <param name="{@link #setErrorHandling(String) errorHandling}" value=""/>
*
*/
@@ -100,6 +101,10 @@
public static final String SCHEMA_OBJECT_PREFIX_VARIABLE =
"${schemaObjectPrefix}";
+ /** the variable for the Oracle table space */
+ public static final String TABLE_SPACE_VARIABLE =
+ "${tableSpace}";
+
/** storage model modifier: binary keys */
public static final int SM_BINARY_KEYS = 1;
@@ -127,6 +132,9 @@
/** the prefix for the database objects */
protected String schemaObjectPrefix;
+ /** the Oracle table space to use */
+ protected String tableSpace;
+
/** flag indicating if a consistency check should be issued during startup */
protected boolean consistencyCheck = false;
@@ -272,6 +280,22 @@
}
/**
+ * 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) {
+ this.tableSpace = tableSpace;
+ }
+
+ /**
* Returns the configured schema identifier.
* @return the schema identifier.
*/
@@ -424,6 +448,16 @@
while (sql != null) {
// replace prefix variable
sql = Text.replace(sql, SCHEMA_OBJECT_PREFIX_VARIABLE, schemaObjectPrefix).trim();
+
+ // set the tablespace if it is defined (used for Oracle)
+ String tspace;
+ if (tableSpace == null || "".equals(tableSpace)) {
+ tspace = "";
+ } else {
+ tspace = "tablespace " + tableSpace;
+ }
+ sql = Text.replace(sql, TABLE_SPACE_VARIABLE, tspace).trim();
+
if (sql.length() > 0 && (sql.indexOf("BINVAL") < 0 || useDbBlobStore())) {
// only create blob related tables of db blob store configured
// execute sql stmt
Index: src/main/java/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl
===================================================================
--- src/main/java/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl (revision 28931)
+++ src/main/java/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl (working copy)
@@ -1,13 +1,14 @@
-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