exo-jcr SVN: r5899 - in jcr/branches/1.15.x: exo.jcr.component.core/src/main/resources/conf/portal and 17 other directories.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2012-03-19 10:53:26 -0400 (Mon, 19 Mar 2012)
New Revision: 5899
Modified:
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCDataContainerConfig.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRepositoryManagement.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceRestore.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWDCTest.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/StorageUpdateTest.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml
jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRdbmsWorkspaceInitializer.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/cluster/TestRepositoryCreationServiceInClusterNode1.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml
Log:
EXOJCR-1806 : Deprecated "multi-db" parameter was removed.
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCDataContainerConfig.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCDataContainerConfig.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCDataContainerConfig.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -104,12 +104,6 @@
public String dbTableSuffix;
/**
- * Use {@link #dbStructureType}
- */
- @Deprecated
- public boolean multiDb;
-
- /**
* Datasource provider
*/
public DataSourceProvider dsProvider;
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -122,11 +122,8 @@
public final static String SOURCE_NAME = "source-name";
- @Deprecated
- public final static String MULTIDB = "multi-db";
-
/**
- * Data structure type, replaces deprecated MULTI_DB
+ * Data structure type
*/
public final static String DB_STRUCTURE_TYPE = "db-structure-type";
@@ -213,7 +210,6 @@
this.containerConfig.dbStructureType = getDatabaseType(wsConfig);
this.containerConfig.dbTableSuffix = getDBTableSuffix(wsConfig);
- this.containerConfig.multiDb = containerConfig.dbStructureType.isMultiDatabase();
this.containerConfig.valueStorageProvider = valueStorageProvider;
this.containerConfig.dsProvider = dsProvider;
@@ -615,7 +611,7 @@
String str =
"JDBC based JCR Workspace Data container \n" + "container name: " + containerConfig.containerName + " \n"
+ (containerConfig.isManaged ? "managed " : "") + "data source JNDI name: " + containerConfig.dbSourceName
- + "\n" + "is multi database: " + containerConfig.multiDb + "\n" + "storage version: "
+ + "\n" + "is multi database: " + containerConfig.dbStructureType.isMultiDatabase() + "\n" + "storage version: "
+ containerConfig.storageVersion + "\n" + "value storage provider: " + containerConfig.valueStorageProvider
+ "\n" + "max buffer size (bytes): " + containerConfig.maxBufferSize + "\n" + "swap directory path: "
+ PrivilegedFileHelper.getAbsolutePath(containerConfig.swapDirectory);
@@ -957,7 +953,7 @@
restoreTableRule.setDstMultiDb(containerConfig.dbStructureType.isMultiDatabase());
restoreTableRule.setSrcTableName(srcTableName);
- if (containerConfig.multiDb)
+ if (containerConfig.dbStructureType.isMultiDatabase())
{
if (!dbType.isMultiDatabase())
{
@@ -1217,23 +1213,8 @@
*/
public static DatabaseStructureType getDatabaseType(WorkspaceEntry wsConfig) throws RepositoryConfigurationException
{
- try
- {
- if (wsConfig.getContainer().getParameterBoolean(MULTIDB))
- {
- return JDBCDataContainerConfig.DatabaseStructureType.MULTI;
- }
- else
- {
- return JDBCDataContainerConfig.DatabaseStructureType.SINGLE;
- }
- }
- catch (Exception e)
- {
- // parameter MULTIDB is missing
- String dbStructureType = wsConfig.getContainer().getParameterValue(DB_STRUCTURE_TYPE).toUpperCase();
- return JDBCDataContainerConfig.DatabaseStructureType.valueOf(dbStructureType);
- }
+ String dbStructureType = wsConfig.getContainer().getParameterValue(DB_STRUCTURE_TYPE).toUpperCase();
+ return JDBCDataContainerConfig.DatabaseStructureType.valueOf(dbStructureType);
}
/**
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -396,7 +396,7 @@
private String removeWorkspacePrefix(String str)
{
- return jdbcDataContainer.containerConfig.multiDb ? str : str
+ return jdbcDataContainer.containerConfig.dbStructureType.isMultiDatabase() ? str : str
.substring(jdbcDataContainer.containerConfig.containerName.length());
}
@@ -532,7 +532,7 @@
+ "where V.PROPERTY_ID = P.ID and P.I_CLASS=2)", new String[]{DBConstants.COLUMN_ID,
DBConstants.COLUMN_VPROPERTY_ID}, "All value records that has not related property record",
new ValueRecordsRemover(jdbcDataContainer.getConnectionFactory(),
- jdbcDataContainer.containerConfig.containerName, jdbcDataContainer.containerConfig.multiDb)));
+ jdbcDataContainer.containerConfig.containerName, jdbcDataContainer.containerConfig.dbStructureType.isMultiDatabase())));
// The differences in the queries by DB dialect.
String statement;
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -30,7 +30,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" />
</properties>
@@ -97,7 +97,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" />
</properties>
@@ -164,7 +164,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/TestRepositoryCheckController.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -42,6 +42,7 @@
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
import org.exoplatform.services.jcr.impl.dataflow.TransientValueData;
import org.exoplatform.services.jcr.impl.storage.jdbc.DBConstants;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
import org.exoplatform.services.jcr.impl.storage.value.fs.FileValueStorage;
import org.exoplatform.services.jcr.util.IdGenerator;
@@ -76,10 +77,6 @@
private static boolean NOT_SHARED_CACHE = false;
- private static boolean MULTI_DB = true;
-
- private static boolean SINGLE_DB = false;
-
private static boolean CACHE_ENABLED = true;
private static boolean CACHE_DISABLED = false;
@@ -115,15 +112,15 @@
public void testLockUsecases() throws Exception
{
- checkConsistentLocksInDataBase(helper.createRepository(container, SINGLE_DB, CACHE_ENABLED, NOT_SHARED_CACHE));
- checkConsistentLocksInDataBase(helper.createRepository(container, MULTI_DB, CACHE_ENABLED, NOT_SHARED_CACHE));
- checkConsistentLocksInDataBase(helper.createRepository(container, SINGLE_DB, CACHE_ENABLED, SHARED_CACHE));
- checkConsistentLocksInDataBase(helper.createRepository(container, MULTI_DB, CACHE_ENABLED, SHARED_CACHE));
+ checkConsistentLocksInDataBase(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_ENABLED, NOT_SHARED_CACHE));
+ checkConsistentLocksInDataBase(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_ENABLED, NOT_SHARED_CACHE));
+ checkConsistentLocksInDataBase(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_ENABLED, SHARED_CACHE));
+ checkConsistentLocksInDataBase(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_ENABLED, SHARED_CACHE));
- checkInconsistentLocksInLockTable(helper.createRepository(container, SINGLE_DB, CACHE_ENABLED, NOT_SHARED_CACHE));
- checkInconsistentLocksInLockTable(helper.createRepository(container, MULTI_DB, CACHE_ENABLED, NOT_SHARED_CACHE));
- checkInconsistentLocksInLockTable(helper.createRepository(container, SINGLE_DB, CACHE_ENABLED, SHARED_CACHE));
- checkInconsistentLocksInLockTable(helper.createRepository(container, MULTI_DB, CACHE_ENABLED, SHARED_CACHE));
+ checkInconsistentLocksInLockTable(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_ENABLED, NOT_SHARED_CACHE));
+ checkInconsistentLocksInLockTable(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_ENABLED, NOT_SHARED_CACHE));
+ checkInconsistentLocksInLockTable(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_ENABLED, SHARED_CACHE));
+ checkInconsistentLocksInLockTable(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_ENABLED, SHARED_CACHE));
}
private void checkConsistentLocksInDataBase(ManageableRepository repository) throws Exception
@@ -210,7 +207,7 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, SINGLE_DB, CACHE_DISABLED);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED);
TesterRepositoryCheckController checkController = new TesterRepositoryCheckController(repository);
Node node = addTestNode(repository);
@@ -236,7 +233,7 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, SINGLE_DB, CACHE_DISABLED);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED);
TesterRepositoryCheckController checkController = new TesterRepositoryCheckController(repository);
Node node = addTestNode(repository);
@@ -262,7 +259,7 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, SINGLE_DB, CACHE_DISABLED);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED);
TesterRepositoryCheckController checkController = new TesterRepositoryCheckController(repository);
Node node = addTestNode(repository);
@@ -285,11 +282,11 @@
*/
public void testDBUsecasesTheParentIdIsIdOfThisNode() throws Exception
{
- checkDBUsecasesTheParentIdIsIdOfThisNode(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
- checkDBUsecasesTheParentIdIsIdOfThisNode2(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
+ checkDBUsecasesTheParentIdIsIdOfThisNode(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
+ checkDBUsecasesTheParentIdIsIdOfThisNode2(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
- checkDBUsecasesTheParentIdIsIdOfThisNode(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
- checkDBUsecasesTheParentIdIsIdOfThisNode2(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
+ checkDBUsecasesTheParentIdIsIdOfThisNode(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
+ checkDBUsecasesTheParentIdIsIdOfThisNode2(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
}
private void checkDBUsecasesTheParentIdIsIdOfThisNode(ManageableRepository repository) throws Exception
@@ -347,8 +344,8 @@
*/
public void testDBUsecasesSeveralVersionsOfSameItem() throws Exception
{
- checkSeveralVersionsOfSameItem(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
- checkSeveralVersionsOfSameItem(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
+ checkSeveralVersionsOfSameItem(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
+ checkSeveralVersionsOfSameItem(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
}
private void checkSeveralVersionsOfSameItem(ManageableRepository repository) throws Exception
@@ -382,8 +379,8 @@
*/
public void testDBUsecasesPropertyWithoutParent() throws Exception
{
- checkDBUsecasesPropertyWithoutParent(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
- checkDBUsecasesPropertyWithoutParent(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
+ checkDBUsecasesPropertyWithoutParent(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
+ checkDBUsecasesPropertyWithoutParent(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
}
private void checkDBUsecasesPropertyWithoutParent(ManageableRepository repository) throws Exception
@@ -413,8 +410,8 @@
*/
public void testDBUsecasesIncorrectValueRecords() throws Exception
{
- checkDBUsecasesIncorrectValueRecords(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
- checkDBUsecasesIncorrectValueRecords(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
+ checkDBUsecasesIncorrectValueRecords(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
+ checkDBUsecasesIncorrectValueRecords(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
}
private void checkDBUsecasesIncorrectValueRecords(ManageableRepository repository) throws Exception
@@ -448,8 +445,8 @@
*/
public void testDBUsecasesValueRecordHasNoItemRecord() throws Exception
{
- checkDBUsecasesValueRecordHasNoItemRecord(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
- checkDBUsecasesValueRecordHasNoItemRecord(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
+ checkDBUsecasesValueRecordHasNoItemRecord(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
+ checkDBUsecasesValueRecordHasNoItemRecord(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
}
private void checkDBUsecasesValueRecordHasNoItemRecord(ManageableRepository repository) throws Exception
@@ -483,11 +480,11 @@
*/
public void testDBUsecasesPropertiesHasNoValueRecord() throws Exception
{
- checkDBUsecasesPropertiesHasNoSingleValueRecord(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
- checkDBUsecasesPropertiesHasEmptyMultiValueRecord(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
+ checkDBUsecasesPropertiesHasNoSingleValueRecord(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
+ checkDBUsecasesPropertiesHasEmptyMultiValueRecord(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
- checkDBUsecasesPropertiesHasNoSingleValueRecord(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
- checkDBUsecasesPropertiesHasEmptyMultiValueRecord(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
+ checkDBUsecasesPropertiesHasNoSingleValueRecord(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
+ checkDBUsecasesPropertiesHasEmptyMultiValueRecord(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
}
private void checkDBUsecasesPropertiesHasNoSingleValueRecord(ManageableRepository repository) throws Exception
@@ -543,9 +540,9 @@
*/
public void testDBUsecasesReferencePropertyWithoutReferenceRecord() throws Exception
{
- checkDBUsecasesReferencePropertyWithoutReferenceRecord(helper.createRepository(container, SINGLE_DB,
+ checkDBUsecasesReferencePropertyWithoutReferenceRecord(helper.createRepository(container, DatabaseStructureType.SINGLE,
CACHE_DISABLED));
- checkDBUsecasesReferencePropertyWithoutReferenceRecord(helper.createRepository(container, MULTI_DB,
+ checkDBUsecasesReferencePropertyWithoutReferenceRecord(helper.createRepository(container, DatabaseStructureType.MULTI,
CACHE_DISABLED));
}
@@ -583,8 +580,8 @@
*/
public void testDBUsecasesNodeHasNoProperties() throws Exception
{
- checkDBUsecasesNodeHasNotPrimaryTypeProperties(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
- checkDBUsecasesNodeHasNotPrimaryTypeProperties(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
+ checkDBUsecasesNodeHasNotPrimaryTypeProperties(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
+ checkDBUsecasesNodeHasNotPrimaryTypeProperties(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
}
private void checkDBUsecasesNodeHasNotPrimaryTypeProperties(ManageableRepository repository) throws Exception
@@ -616,8 +613,8 @@
*/
public void testValueStorageUsecases() throws Exception
{
- checkValueStorageUsecases(helper.createRepository(container, SINGLE_DB, CACHE_DISABLED));
- checkValueStorageUsecases(helper.createRepository(container, MULTI_DB, CACHE_DISABLED));
+ checkValueStorageUsecases(helper.createRepository(container, DatabaseStructureType.SINGLE, CACHE_DISABLED));
+ checkValueStorageUsecases(helper.createRepository(container, DatabaseStructureType.MULTI, CACHE_DISABLED));
}
private void checkValueStorageUsecases(ManageableRepository repository) throws Exception
@@ -683,7 +680,8 @@
{
WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0);
- boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB);
+ boolean isMultiDb = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME);
String vTable = "JCR_" + (isMultiDb ? "M" : "S") + "VALUE";
@@ -714,7 +712,8 @@
{
WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0);
- boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB);
+ boolean isMultiDb = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME);
String vTable = "JCR_" + (isMultiDb ? "M" : "S") + "VALUE";
@@ -736,7 +735,8 @@
{
WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0);
- boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB);
+ boolean isMultiDb = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME);
String vTable = "JCR_" + (isMultiDb ? "M" : "S") + "VALUE";
@@ -758,7 +758,8 @@
{
WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0);
- boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB);
+ boolean isMultiDb = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME);
String rTable = "JCR_" + (isMultiDb ? "M" : "S") + "REF";
@@ -778,7 +779,8 @@
{
WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0);
- boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB);
+ boolean isMultiDb = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME);
String vTable = "JCR_" + (isMultiDb ? "M" : "S") + "VALUE";
@@ -803,7 +805,8 @@
RepositoryConfigurationException, NamingException
{
WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0);
- boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB);
+ boolean isMultiDb = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String iTable = "JCR_" + (isMultiDb ? "M" : "S") + "ITEM";
String itemId = (isMultiDb ? "" : wsEntry.getName()) + item.getInternalIdentifier();
@@ -899,7 +902,8 @@
throws RepositoryConfigurationException, SQLException, NamingException, RepositoryException
{
WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0);
- boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB);
+ boolean isMultiDb = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String iTable = "JCR_" + (isMultiDb ? "M" : "S") + "ITEM";
String vTable = "JCR_" + (isMultiDb ? "M" : "S") + "VALUE";
@@ -937,7 +941,8 @@
throws RepositoryConfigurationException, SQLException, NamingException
{
WorkspaceEntry wsEntry = repository.getConfiguration().getWorkspaceEntries().get(0);
- boolean isMultiDb = wsEntry.getContainer().getParameterBoolean(JDBCWorkspaceDataContainer.MULTIDB);
+ boolean isMultiDb = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String sourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME);
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -24,6 +24,7 @@
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.QPath;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
import org.exoplatform.services.jcr.util.TesterConfigurationHelper;
@@ -341,11 +342,11 @@
public void testMoveWithoutGenerationChangesForAllSubTree() throws Exception
{
TesterConfigurationHelper helper = TesterConfigurationHelper.getInstance();
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
wsEntry.getContainer().getParameters()
.add(new SimpleParameterEntry(WorkspaceDataContainer.TRIGGER_EVENTS_FOR_DESCENDENTS_ON_RENAME, "false"));
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
SessionImpl session = (SessionImpl)repository.login(credentials, wsEntry.getName());
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRepositoryManagement.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRepositoryManagement.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRepositoryManagement.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -30,6 +30,7 @@
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.util.TesterConfigurationHelper;
import org.jibx.runtime.BindingDirectory;
import org.jibx.runtime.IBindingFactory;
@@ -54,14 +55,6 @@
public static int BINDED_DS_COUNT = 100;
- private static boolean isBinded = false;
-
- private final int lastDS = 0;
-
- private WorkspaceEntry wsEntry;
-
- private boolean isDefaultWsMultiDb;
-
private final TesterConfigurationHelper helper;
@@ -76,7 +69,7 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, false, null);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
Session session = null;
try
@@ -107,7 +100,7 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, false, null);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
final long lockManagerTimeOut =
repository.getConfiguration().getWorkspaceEntries().get(0).getLockManager().getParameterLong("time-out");
@@ -184,11 +177,11 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, false, null);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
try
{
- RepositoryEntry rEntry = helper.createRepositoryEntry(false, null, null, true);
+ RepositoryEntry rEntry = helper.createRepositoryEntry(DatabaseStructureType.SINGLE, null, null, true);
rEntry.setName(repository.getConfiguration().getName());
helper.createRepository(container, rEntry);
@@ -213,7 +206,7 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, false, null);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
@@ -238,7 +231,7 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, false, null);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
SessionImpl session = null;
try
@@ -271,7 +264,7 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, false, null);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
SessionImpl session = null;
try
@@ -302,7 +295,7 @@
public void testRemove() throws Exception
{
- ManageableRepository repository = helper.createRepository(container, false, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
service.removeRepository(repository.getConfiguration().getName());
@@ -413,7 +406,7 @@
try
{
latcher.await();
- tRrepository = helper.createRepository(container, false, null);
+ tRrepository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
}
catch (Exception e)
{
@@ -433,7 +426,7 @@
try
{
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
- RepositoryEntry repoEntry = helper.createRepositoryEntry(false, null, null, true);
+ RepositoryEntry repoEntry = helper.createRepositoryEntry(DatabaseStructureType.SINGLE, null, null, true);
try
{
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -25,6 +25,7 @@
import org.exoplatform.services.jcr.config.ValueStorageEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.util.TesterConfigurationHelper;
import java.util.ArrayList;
@@ -37,8 +38,6 @@
*/
public class TestWorkspaceManagement extends JcrImplBaseTest
{
- private boolean isDefaultWsMultiDb = false;
-
private final TesterConfigurationHelper helper;
private WorkspaceEntry wsEntry;
@@ -55,11 +54,11 @@
ManageableRepository repository = null;
try
{
- repository = helper.createRepository(container, false, null);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, null);
try
{
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, "not-existed-ds");
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, "not-existed-ds");
helper.addWorkspace(repository, wsEntry);
fail();
}
@@ -83,11 +82,11 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, false, dsName);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
try
{
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
wsEntry.setName(repository.getConfiguration().getSystemWorkspaceName());
helper.addWorkspace(repository, wsEntry);
@@ -113,11 +112,11 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, false, dsName);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
try
{
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
ValueStorageEntry valueStorageEntry = wsEntry.getContainer().getValueStorages().get(0);
@@ -149,11 +148,11 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, false, dsName);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
try
{
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
wsEntry.setContainer(new ContainerEntry(
"org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer", new ArrayList()));
@@ -180,12 +179,12 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, false, dsName);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
SessionImpl session = null;
try
{
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
session = (SessionImpl)repository.login(credentials, wsEntry.getName());
@@ -216,11 +215,11 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, false, dsName);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
try
{
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, dsName);
helper.addWorkspace(repository, wsEntry);
fail();
}
@@ -244,7 +243,7 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, false, dsName);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
try
{
@@ -270,8 +269,8 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, false, dsName);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
assertEquals(2, repository.getWorkspaceNames().length);
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceRestore.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceRestore.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceRestore.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -24,6 +24,7 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.util.TesterConfigurationHelper;
import java.io.BufferedInputStream;
@@ -50,15 +51,14 @@
private WorkspaceEntry wsEntry;
- private boolean isDefaultWsMultiDb;
+ private DatabaseStructureType dbStructureType;
@Override
public void setUp() throws Exception
{
super.setUp();
wsEntry = (WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
-
- isDefaultWsMultiDb = JDBCWorkspaceDataContainer.getDatabaseType(wsEntry).isMultiDatabase();
+ dbStructureType = JDBCWorkspaceDataContainer.getDatabaseType(wsEntry);
}
public void testRestore() throws RepositoryConfigurationException, Exception
@@ -67,10 +67,10 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, isDefaultWsMultiDb, dsName);
+ repository = helper.createRepository(container, dbStructureType, dsName);
WorkspaceEntry workspaceEntry =
- helper.createWorkspaceEntry(isDefaultWsMultiDb, isDefaultWsMultiDb ? helper.createDatasource() : dsName);
+ helper.createWorkspaceEntry(dbStructureType, dbStructureType.isMultiDatabase() ? helper.createDatasource() : dsName);
helper.addWorkspace(repository, workspaceEntry);
InputStream is = TestWorkspaceManagement.class.getResourceAsStream("/import-export/db1_ws1-20071220_0430.xml");
@@ -91,10 +91,10 @@
try
{
String dsName = helper.createDatasource();
- repository = helper.createRepository(container, isDefaultWsMultiDb, dsName);
+ repository = helper.createRepository(container, dbStructureType, dsName);
WorkspaceEntry workspaceEntry =
- helper.createWorkspaceEntry(isDefaultWsMultiDb, isDefaultWsMultiDb ? helper.createDatasource() : dsName);
+ helper.createWorkspaceEntry(dbStructureType, dbStructureType.isMultiDatabase() ? helper.createDatasource() : dsName);
helper.addWorkspace(repository, workspaceEntry);
Session defSession = repository.login(this.credentials, workspaceEntry.getName());
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWDCTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWDCTest.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWDCTest.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -82,7 +82,7 @@
ContainerEntry containerEntry = new ContainerEntry();
List params = new ArrayList();
params.add(new SimpleParameterEntry("sourceName", sourceName));
- params.add(new SimpleParameterEntry("multi-db", "true"));
+ params.add(new SimpleParameterEntry("db-structure-type", "multi"));
containerEntry.setParameters(params);
config.setContainer(containerEntry);
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/StorageUpdateTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/StorageUpdateTest.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/StorageUpdateTest.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -30,6 +30,7 @@
import org.exoplatform.services.jcr.impl.dataflow.TransientValueData;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCStorageConnection;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection;
@@ -70,7 +71,7 @@
private Version version2_node_R = null;
- private boolean isDefaultWsMultiDb;
+ private DatabaseStructureType dbStructureType;
@Override
public void setUp() throws Exception
@@ -89,10 +90,8 @@
.getComponentInstanceOfType(WorkspaceEntry.class);
- if ("true".equals(wsEntry.getContainer().getParameterValue("multi-db")))
- {
- isDefaultWsMultiDb = true;
- }
+ dbStructureType = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE));
testNode = session.getRootNode().addNode("test_node", "nt:unstructured");
// create referenceable node
@@ -165,7 +164,7 @@
// =================== remove version record ===================
Statement smnt = jdbcConn.getJdbcConnection().createStatement();
log.info("Update container version records: "
- + smnt.executeUpdate("update JCR_" + (isDefaultWsMultiDb ? "M" : "S") + "CONTAINER set VERSION='1.0'"));
+ + smnt.executeUpdate("update JCR_" + (dbStructureType.isMultiDatabase() ? "M" : "S") + "CONTAINER set VERSION='1.0'"));
jdbcConn.getJdbcConnection().commit();
conn.commit();
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -25,6 +25,7 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.jcr.util.TesterConfigurationHelper;
import org.exoplatform.services.log.ExoLogger;
@@ -207,13 +208,11 @@
{
TesterConfigurationHelper helper = TesterConfigurationHelper.getInstance();
WorkspaceEntry wsEntry = (WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
- boolean isDefaultWsMultiDb = false;
- if ("true".equals(wsEntry.getContainer().getParameterValue("multi-db")))
- {
- isDefaultWsMultiDb = true;
- }
+ DatabaseStructureType dbStructureType = DatabaseStructureType
+ .valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE));
WorkspaceEntry workspaceEntry =
- helper.createWorkspaceEntry(isDefaultWsMultiDb,
+ helper.createWorkspaceEntry(dbStructureType,
wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME));
return workspaceEntry.getName();
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -35,21 +35,20 @@
public class TestMultiDbJDBCConnection extends JDBCConnectionTestBase
{
- private void setUp(String scriptPath, boolean multiDB) throws Exception
+ private void setUp(String scriptPath, DatabaseStructureType dbStructureType) throws Exception
{
super.setUp();
JDBCDataContainerConfig containerConfig = new JDBCDataContainerConfig();
containerConfig.containerName = "ws3";
containerConfig.initScriptPath = scriptPath;
- containerConfig.dbStructureType = multiDB ? DatabaseStructureType.MULTI : DatabaseStructureType.SINGLE;
- containerConfig.multiDb = multiDB;
+ containerConfig.dbStructureType = dbStructureType;
new DBInitializer(getJNDIConnection(), containerConfig).init();
}
@Override
public void setUp() throws Exception
{
- setUp("/conf/storage/jcr-mjdbc.sql", true);
+ setUp("/conf/storage/jcr-mjdbc.sql", DatabaseStructureType.MULTI);
try
{
@@ -67,7 +66,6 @@
jdbcDataContainerConfig.containerName = "ws3";
jdbcDataContainerConfig.maxBufferSize = 10;
jdbcDataContainerConfig.dbStructureType = DatabaseStructureType.MULTI;
- jdbcDataContainerConfig.multiDb = true;
jdbcConn = new MultiDbJDBCConnection(getJNDIConnection(), false, jdbcDataContainerConfig);
tableType = "M";
st.close();
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -35,21 +35,20 @@
public class TestSingleDbJDBCConnection extends JDBCConnectionTestBase
{
- private void setUp(String scriptPath, boolean multiDB) throws Exception
+ private void setUp(String scriptPath, DatabaseStructureType dbStructureType) throws Exception
{
super.setUp();
JDBCDataContainerConfig containerConfig = new JDBCDataContainerConfig();
containerConfig.containerName = "ws3";
containerConfig.initScriptPath = scriptPath;
- containerConfig.dbStructureType = multiDB ? DatabaseStructureType.MULTI : DatabaseStructureType.SINGLE;
- containerConfig.multiDb = multiDB;
+ containerConfig.dbStructureType = dbStructureType;
new DBInitializer(getJNDIConnection(), containerConfig).init();
}
@Override
public void setUp() throws Exception
{
- setUp("/conf/storage/jcr-sjdbc.sql", false);
+ setUp("/conf/storage/jcr-sjdbc.sql", DatabaseStructureType.SINGLE);
try
{
Statement st = getJNDIConnection().createStatement();
@@ -68,7 +67,6 @@
jdbcDataContainerConfig.containerName = "ws3";
jdbcDataContainerConfig.maxBufferSize = 10;
jdbcDataContainerConfig.dbStructureType = DatabaseStructureType.SINGLE;
- jdbcDataContainerConfig.multiDb = false;
jdbcConn = new SingleDbJDBCConnection(getJNDIConnection(), false, jdbcDataContainerConfig);
tableType = "S";
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -34,6 +34,8 @@
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.WorkspaceContainerFacade;
import org.exoplatform.services.jcr.impl.core.SessionRegistry;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -116,32 +118,32 @@
}
- public ManageableRepository createRepository(ExoContainer container, boolean isMultiDb, String dsName)
+ public ManageableRepository createRepository(ExoContainer container, DatabaseStructureType dbStructureType, String dsName)
throws Exception
{
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
- RepositoryEntry repoEntry = createRepositoryEntry(isMultiDb, null, dsName, true);
+ RepositoryEntry repoEntry = createRepositoryEntry(dbStructureType, null, dsName, true);
service.createRepository(repoEntry);
service.getConfig().retain();
return service.getRepository(repoEntry.getName());
}
- public ManageableRepository createRepository(ExoContainer container, boolean isMultiDb, boolean cacheEnabled,
+ public ManageableRepository createRepository(ExoContainer container, DatabaseStructureType dbStructureType, boolean cacheEnabled,
boolean cacheShared) throws Exception
{
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
- RepositoryEntry repoEntry = createRepositoryEntry(isMultiDb, null, null, cacheEnabled, cacheShared);
+ RepositoryEntry repoEntry = createRepositoryEntry(dbStructureType, null, null, cacheEnabled, cacheShared);
service.createRepository(repoEntry);
service.getConfig().retain();
return service.getRepository(repoEntry.getName());
}
- public ManageableRepository createRepository(ExoContainer container, boolean isMultiDb, boolean cacheEnabled)
+ public ManageableRepository createRepository(ExoContainer container, DatabaseStructureType dbStructureType, boolean cacheEnabled)
throws Exception
{
- return createRepository(container, isMultiDb, cacheEnabled, false);
+ return createRepository(container, dbStructureType, cacheEnabled, false);
}
public ManageableRepository createRepository(ExoContainer container, RepositoryEntry repoEntry) throws Exception
@@ -155,22 +157,22 @@
/**
* Create workspace entry.
*/
- public RepositoryEntry createRepositoryEntry(boolean isMultiDb, String systemWSName, String dsName,
+ public RepositoryEntry createRepositoryEntry(DatabaseStructureType dbStructureType, String systemWSName, String dsName,
boolean cacheEnabled) throws Exception
{
- return createRepositoryEntry(isMultiDb, systemWSName, dsName, cacheEnabled, false);
+ return createRepositoryEntry(dbStructureType, systemWSName, dsName, cacheEnabled, false);
}
/**
* Create workspace entry.
*/
- public RepositoryEntry createRepositoryEntry(boolean isMultiDb, String systemWSName, String dsName,
+ public RepositoryEntry createRepositoryEntry(DatabaseStructureType dbStructureType, String systemWSName, String dsName,
boolean cacheEnabled, boolean cacheShared) throws Exception
{
// create system workspace entry
List<String> ids = new ArrayList<String>();
ids.add("id");
- WorkspaceEntry wsEntry = createWorkspaceEntry(isMultiDb, dsName, ids, cacheEnabled, cacheShared);
+ WorkspaceEntry wsEntry = createWorkspaceEntry(dbStructureType, dsName, ids, cacheEnabled, cacheShared);
if (systemWSName != null)
{
@@ -192,27 +194,27 @@
/**
* Create workspace entry.
*/
- public WorkspaceEntry createWorkspaceEntry(boolean isMultiDb, String dsName) throws Exception
+ public WorkspaceEntry createWorkspaceEntry(DatabaseStructureType dbStructureType, String dsName) throws Exception
{
List<String> ids = new ArrayList<String>();
ids.add("id");
- return createWorkspaceEntry(isMultiDb, dsName, ids, true);
+ return createWorkspaceEntry(dbStructureType, dsName, ids, true);
}
/**
* Create workspace entry.
*/
- public WorkspaceEntry createWorkspaceEntry(boolean isMultiDb, String dsName, List<String> valueStorageIds,
+ public WorkspaceEntry createWorkspaceEntry(DatabaseStructureType dbStructureType, String dsName, List<String> valueStorageIds,
boolean cacheEnabled) throws Exception
{
- return createWorkspaceEntry(isMultiDb, dsName, valueStorageIds, cacheEnabled, false);
+ return createWorkspaceEntry(dbStructureType, dsName, valueStorageIds, cacheEnabled, false);
}
/**
* Create workspace entry.
*/
- public WorkspaceEntry createWorkspaceEntry(boolean isMultiDb, String dsName, List<String> valueStorageIds,
+ public WorkspaceEntry createWorkspaceEntry(DatabaseStructureType dbStructureType, String dsName, List<String> valueStorageIds,
boolean cacheEnabled, boolean cacheShared) throws Exception
{
if (dsName == null)
@@ -226,7 +228,7 @@
// container entry
List params = new ArrayList();
params.add(new SimpleParameterEntry("source-name", dsName));
- params.add(new SimpleParameterEntry("multi-db", isMultiDb ? "true" : "false"));
+ params.add(new SimpleParameterEntry(JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE, dbStructureType.toString()));
params.add(new SimpleParameterEntry("max-buffer-size", "204800"));
params.add(new SimpleParameterEntry("dialect", "auto"));
params.add(new SimpleParameterEntry("swap-directory", "target/temp/swap/" + wsName));
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -23,7 +23,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
<property name="dialect" value="auto" />
@@ -93,7 +93,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr1" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
<property name="dialect" value="auto" />
@@ -168,7 +168,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr2" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
<property name="dialect" value="auto" />
@@ -244,7 +244,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr3" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
<property name="dialect" value="auto" />
@@ -345,7 +345,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcrdb2" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
<property name="dialect" value="auto" />
@@ -414,7 +414,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr1db2" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
<property name="dialect" value="auto" />
@@ -494,7 +494,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcrtck" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
<property name="dialect" value="auto" />
@@ -576,7 +576,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr1tck" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
<property name="dialect" value="auto" />
@@ -656,7 +656,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr2tck" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
<property name="dialect" value="auto" />
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -34,7 +34,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -94,7 +94,7 @@
<properties>
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -152,7 +152,7 @@
<properties>
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -211,7 +211,7 @@
<properties>
<property name="source-name" value="jdbcjcr3" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -300,7 +300,7 @@
<properties>
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -358,7 +358,7 @@
<properties>
<property name="source-name" value="jdbcjcr1db2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -425,7 +425,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -492,7 +492,7 @@
<properties>
<property name="source-name" value="jdbcjcr1tck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -558,7 +558,7 @@
<properties>
<property name="source-name" value="jdbcjcr2tck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -34,7 +34,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -95,7 +95,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -154,7 +154,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -214,7 +214,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -307,7 +307,7 @@
<properties>
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -365,7 +365,7 @@
<properties>
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -432,7 +432,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -499,7 +499,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -565,7 +565,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -30,7 +30,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" />
</properties>
@@ -90,7 +90,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" />
</properties>
@@ -150,7 +150,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -24,7 +24,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -92,7 +92,7 @@
<properties>
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -158,7 +158,7 @@
<properties>
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -225,7 +225,7 @@
<properties>
<property name="source-name" value="jdbcjcr3" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -324,7 +324,7 @@
<properties>
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -389,7 +389,7 @@
<properties>
<property name="source-name" value="jdbcjcr1db2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -463,7 +463,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -537,7 +537,7 @@
<properties>
<property name="source-name" value="jdbcjcr1tck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -610,7 +610,7 @@
<properties>
<property name="source-name" value="jdbcjcr2tck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -34,7 +34,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -90,7 +90,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -143,7 +143,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -197,7 +197,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -282,7 +282,7 @@
<properties>
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -335,7 +335,7 @@
<properties>
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -399,7 +399,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -459,7 +459,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -518,7 +518,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -34,7 +34,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -90,7 +90,7 @@
<properties>
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -143,7 +143,7 @@
<properties>
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -197,7 +197,7 @@
<properties>
<property name="source-name" value="jdbcjcr3" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -282,7 +282,7 @@
<properties>
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -335,7 +335,7 @@
<properties>
<property name="source-name" value="jdbcjcr1db2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -399,7 +399,7 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -459,7 +459,7 @@
<properties>
<property name="source-name" value="jdbcjcr1tck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -518,7 +518,7 @@
<properties>
<property name="source-name" value="jdbcjcr2tck" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -37,6 +37,7 @@
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.SessionRegistry;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.jdbc.impl.CloseableDataSource;
import org.exoplatform.services.log.ExoLogger;
@@ -696,8 +697,8 @@
Set<String> dataSourceNames = new HashSet<String>();
for (WorkspaceEntry wsEntry : repositoryEntry.getWorkspaceEntries())
{
- boolean isMultiDB =
- Boolean.parseBoolean(wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.MULTIDB));
+ boolean isMultiDB = DatabaseStructureType.valueOf(wsEntry.getContainer().getParameterValue(
+ JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE)).isMultiDatabase();
String dbSourceName = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME);
if (isMultiDB && dataSourceNames.contains(dbSourceName))
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -24,6 +24,7 @@
import org.exoplatform.services.jcr.config.SimpleParameterEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.ext.backup.impl.JobRepositoryRestore;
import org.exoplatform.services.jcr.ext.backup.impl.JobWorkspaceRestore;
import org.exoplatform.services.jcr.impl.Constants;
@@ -50,8 +51,8 @@
public void testFullBackupRestore() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -70,7 +71,7 @@
backup.stopBackup(bch);
// restore
- WorkspaceEntry newWS = helper.createWorkspaceEntry(true, null);
+ WorkspaceEntry newWS = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
File backLog = new File(bch.getLogFilePath());
assertTrue(backLog.exists());
@@ -87,8 +88,8 @@
public void testIncrementalBackupRestore() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -110,7 +111,7 @@
backup.stopBackup(bch);
// restore
- WorkspaceEntry newWS = helper.createWorkspaceEntry(true, null);
+ WorkspaceEntry newWS = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
File backLog = new File(bch.getLogFilePath());
assertTrue(backLog.exists());
@@ -128,8 +129,8 @@
public void testFullBackupRestoreAsync() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -148,7 +149,7 @@
backup.stopBackup(bch);
// restore
- WorkspaceEntry newWS = helper.createWorkspaceEntry(true, null);
+ WorkspaceEntry newWS = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
File backLog = new File(bch.getLogFilePath());
assertTrue(backLog.exists());
@@ -169,8 +170,8 @@
public void testAutoStopBackupFull() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
// backup
@@ -200,8 +201,8 @@
public void testAutoStopBackupIncr() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
// backup
@@ -233,8 +234,8 @@
public void _testAutoStopBackupIncrRepetion() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
// backup
@@ -312,8 +313,8 @@
public void testRestoreAfterFailureRestore() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -332,7 +333,7 @@
backup.stopBackup(bch);
// restore
- WorkspaceEntry newWS = helper.createWorkspaceEntry(true, "NOT_EXISTED_DS");
+ WorkspaceEntry newWS = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, "NOT_EXISTED_DS");
File backLog = new File(bch.getLogFilePath());
assertTrue(backLog.exists());
@@ -351,7 +352,7 @@
{
}
- newWS = helper.createWorkspaceEntry(true, null);
+ newWS = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
backup.restore(bchLog, config.getRepository(), newWS, false);
checkConent(repository, newWS.getName());
@@ -360,7 +361,7 @@
public void testRepositoryFullBackupRestore() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -378,7 +379,7 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(true, repository.getConfiguration().getSystemWorkspaceName(), null);
+ helper.createRepositoryEntry(DatabaseStructureType.MULTI, repository.getConfiguration().getSystemWorkspaceName(), null);
File backLog = new File(bch.getLogFilePath());
assertTrue(backLog.exists());
@@ -395,7 +396,7 @@
public void testRepositoryFullAndIncrementalBackupRestore() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -416,7 +417,7 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(true, repository.getConfiguration().getSystemWorkspaceName(), null);
+ helper.createRepositoryEntry(DatabaseStructureType.MULTI, repository.getConfiguration().getSystemWorkspaceName(), null);
File backLog = new File(bch.getLogFilePath());
assertTrue(backLog.exists());
@@ -434,7 +435,7 @@
public void testRepositoryFullBackupAsynchronusRestore() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -452,7 +453,7 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(true, repository.getConfiguration().getSystemWorkspaceName(), null);
+ helper.createRepositoryEntry(DatabaseStructureType.MULTI, repository.getConfiguration().getSystemWorkspaceName(), null);
File backLog = new File(bch.getLogFilePath());
assertTrue(backLog.exists());
@@ -471,7 +472,7 @@
public void testRepositoryFullBackupAsynchronusRestoreWorkspaceMapping() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -488,7 +489,7 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry newRE = helper.createRepositoryEntry(true, null, null);
+ RepositoryEntry newRE = helper.createRepositoryEntry(DatabaseStructureType.MULTI, null, null);
// create workspace mappingS
Map<String, String> workspaceMapping = new HashedMap();
@@ -511,7 +512,7 @@
public void _testAutoStopRepositoryBackupIncrRepetion() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -530,7 +531,7 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry newRE = helper.createRepositoryEntry(true, null, null);
+ RepositoryEntry newRE = helper.createRepositoryEntry(DatabaseStructureType.MULTI, null, null);
// create workspace mappingS
Map<String, String> workspaceMapping = new HashedMap();
@@ -554,7 +555,7 @@
public void testRepositoryRestoreFail() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -571,7 +572,7 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry newRE = helper.createRepositoryEntry(true, null, null);
+ RepositoryEntry newRE = helper.createRepositoryEntry(DatabaseStructureType.MULTI, null, null);
newRE.getWorkspaceEntries().get(0).getQueryHandler().setType("gg");
// create workspace mappingS
@@ -599,8 +600,8 @@
public void testExistedWorkspaceRestoreMultiDB() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -637,8 +638,8 @@
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -673,8 +674,8 @@
public void testExistedWorkspaceRestoreAsync() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -718,7 +719,7 @@
{
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, true, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, dsName);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -745,7 +746,7 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(true, repository.getConfiguration().getSystemWorkspaceName(), dsName);
+ helper.createRepositoryEntry(DatabaseStructureType.MULTI, repository.getConfiguration().getSystemWorkspaceName(), dsName);
newRE.setName(repository.getConfiguration().getName());
backup.restoreExistingRepository(bchLog, newRE, false);
@@ -756,7 +757,7 @@
{
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -783,7 +784,7 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(false, repository.getConfiguration().getSystemWorkspaceName(), dsName);
+ helper.createRepositoryEntry(DatabaseStructureType.SINGLE, repository.getConfiguration().getSystemWorkspaceName(), dsName);
newRE.setName(repository.getConfiguration().getName());
backup.restoreExistingRepository(bchLog, newRE, false);
@@ -794,7 +795,7 @@
{
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -820,7 +821,7 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(false, repository.getConfiguration().getSystemWorkspaceName(), dsName);
+ helper.createRepositoryEntry(DatabaseStructureType.SINGLE, repository.getConfiguration().getSystemWorkspaceName(), dsName);
newRE.setName(repository.getConfiguration().getName());
backup.restoreExistingRepository(bchLog, newRE, true);
@@ -837,8 +838,8 @@
public void testExistedWorkspaceRestoreWithConfig() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -873,7 +874,7 @@
{
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, true, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, dsName);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -899,7 +900,7 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(true, repository.getConfiguration().getSystemWorkspaceName(), dsName);
+ helper.createRepositoryEntry(DatabaseStructureType.MULTI, repository.getConfiguration().getSystemWorkspaceName(), dsName);
newRE.setName(repository.getConfiguration().getName());
backup.restoreExistingRepository(bchLog.getBackupId(), false);
@@ -909,8 +910,8 @@
public void testWorkspaceRestoreWithConfig() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -946,7 +947,7 @@
public void testRepositoryRestoreWithConfig() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -982,7 +983,7 @@
public void testRepositoryRestoreWithNullConfig() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -1017,8 +1018,8 @@
public void testWorkspaceRestoreWithNullConfig() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -1063,8 +1064,8 @@
public void testExistedWorkspaceRestoreWithConfigBackupSetDir() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -1098,7 +1099,7 @@
public void testExistedRepositoryRestoreWithConfigBackupSetDir() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -1130,8 +1131,8 @@
public void testWorkspaceRestoreWithConfigBackupSetDir() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -1167,7 +1168,7 @@
public void testRepositoryRestoreWithConfigBackupSetDir() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -1202,7 +1203,7 @@
public void testEnvironmentVariablesToBackupDir() throws Exception
{
// prepare stage #1
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
String tempDir = PrivilegedSystemHelper.getProperty("java.io.tmpdir");
@@ -1263,7 +1264,7 @@
public void testRelativeBackupDir() throws Exception
{
// prepare stage #1
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
// backup
@@ -1322,12 +1323,12 @@
String dsName1 = helper.createDatasource();
String dsName2 = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName1);
- WorkspaceEntry wsEntry1 = helper.createWorkspaceEntry(false, dsName1);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName1);
+ WorkspaceEntry wsEntry1 = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName1);
helper.addWorkspace(repository, wsEntry1);
addConent(repository, wsEntry1.getName());
- WorkspaceEntry wsEntry2 = helper.createWorkspaceEntry(false, dsName2);
+ WorkspaceEntry wsEntry2 = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName2);
helper.addWorkspace(repository, wsEntry2);
addConent(repository, wsEntry2.getName());
@@ -1374,12 +1375,12 @@
String dsName1 = helper.createDatasource();
String dsName2 = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName1);
- WorkspaceEntry wsEntry1 = helper.createWorkspaceEntry(false, dsName1);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName1);
+ WorkspaceEntry wsEntry1 = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName1);
helper.addWorkspace(repository, wsEntry1);
addConent(repository, wsEntry1.getName());
- WorkspaceEntry wsEntry2 = helper.createWorkspaceEntry(false, dsName2);
+ WorkspaceEntry wsEntry2 = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName2);
helper.addWorkspace(repository, wsEntry2);
addConent(repository, wsEntry2.getName());
@@ -1423,10 +1424,10 @@
{
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
addConent(repository, repository.getConfiguration().getSystemWorkspaceName());
- WorkspaceEntry wsEntry1 = helper.createWorkspaceEntry(false, dsName);
+ WorkspaceEntry wsEntry1 = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry1);
addConent(repository, wsEntry1.getName());
@@ -1464,12 +1465,12 @@
// create repository
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
String dsName = helper.createDatasource();
- RepositoryEntry repoEntry = helper.createRepositoryEntry(false, null, dsName);
+ RepositoryEntry repoEntry = helper.createRepositoryEntry(DatabaseStructureType.SINGLE, null, dsName);
service.createRepository(repoEntry);
ManageableRepository repository = service.getRepository(repoEntry.getName());
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
service.getConfig().retain();
@@ -1555,12 +1556,12 @@
// create repository
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
String dsName = helper.createDatasource();
- RepositoryEntry repoEntry = helper.createRepositoryEntry(false, null, dsName);
+ RepositoryEntry repoEntry = helper.createRepositoryEntry(DatabaseStructureType.SINGLE, null, dsName);
service.createRepository(repoEntry);
ManageableRepository repository = service.getRepository(repoEntry.getName());
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
service.getConfig().retain();
@@ -1646,12 +1647,12 @@
// create repository
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
String dsName = helper.createDatasource();
- RepositoryEntry repoEntry = helper.createRepositoryEntry(false, null, dsName);
+ RepositoryEntry repoEntry = helper.createRepositoryEntry(DatabaseStructureType.SINGLE, null, dsName);
service.createRepository(repoEntry);
ManageableRepository repository = service.getRepository(repoEntry.getName());
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
service.getConfig().retain();
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRdbmsWorkspaceInitializer.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRdbmsWorkspaceInitializer.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRdbmsWorkspaceInitializer.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -26,6 +26,7 @@
import org.exoplatform.services.jcr.impl.core.SysViewWorkspaceInitializer;
import org.exoplatform.services.jcr.impl.core.query.SystemSearchManager;
import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.impl.util.io.FileCleanerHolder;
import org.exoplatform.services.jcr.util.TesterConfigurationHelper;
import org.exoplatform.services.jcr.util.TesterRdbmsWorkspaceInitializer;
@@ -66,7 +67,7 @@
{
String dsName = helper.createDatasource();
WorkspaceEntry newEntry =
- helper.createWorkspaceEntry(true, dsName,
+ helper.createWorkspaceEntry(DatabaseStructureType.MULTI, dsName,
helper.getValueStorageIds(workspaceEntry.getContainer().getValueStorages()));
List<SimpleParameterEntry> wieParams = new ArrayList<SimpleParameterEntry>();
@@ -83,7 +84,7 @@
dsName = helper.createDatasource();
newEntry =
- helper.createWorkspaceEntry(true, dsName,
+ helper.createWorkspaceEntry(DatabaseStructureType.MULTI, dsName,
helper.getValueStorageIds(workspaceEntry.getContainer().getValueStorages()));
wieParams = new ArrayList<SimpleParameterEntry>();
@@ -132,7 +133,7 @@
{
String dsName = helper.createDatasource();
WorkspaceEntry newEntry =
- helper.createWorkspaceEntry(true, dsName,
+ helper.createWorkspaceEntry(DatabaseStructureType.MULTI, dsName,
helper.getValueStorageIds(workspaceEntry.getContainer().getValueStorages()));
List<SimpleParameterEntry> wieParams = new ArrayList<SimpleParameterEntry>();
@@ -153,7 +154,7 @@
dsName = helper.createDatasource();
newEntry =
- helper.createWorkspaceEntry(true, dsName,
+ helper.createWorkspaceEntry(DatabaseStructureType.MULTI, dsName,
helper.getValueStorageIds(workspaceEntry.getContainer().getValueStorages()));
wieParams = new ArrayList<SimpleParameterEntry>();
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -25,6 +25,7 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.core.ManageableRepository;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.ext.BaseStandaloneTest;
import org.exoplatform.services.jcr.ext.app.SessionProviderService;
import org.exoplatform.services.jcr.ext.app.ThreadLocalSessionProviderService;
@@ -356,7 +357,7 @@
public void testRemoveRepository() throws Exception
{
- ManageableRepository repository = helper.createRepository(container, true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
String wsName = repository.getConfiguration().getSystemWorkspaceName();
String repoName = repository.getConfiguration().getName();
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -21,6 +21,7 @@
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.jcr.ext.backup.AbstractBackupTestCase;
import org.exoplatform.services.jcr.ext.backup.BackupManager;
import org.exoplatform.services.jcr.ext.backup.ExtendedBackupManager;
@@ -48,8 +49,8 @@
public void testCreateRepositoryMultiDB() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -76,11 +77,11 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(true, repository.getConfiguration().getSystemWorkspaceName(),
+ helper.createRepositoryEntry(DatabaseStructureType.MULTI, repository.getConfiguration().getSystemWorkspaceName(),
IdGenerator.generate());
newRE.setName(tenantName);
- WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(true, IdGenerator.generate());
+ WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, IdGenerator.generate());
newWSEntry.setName(wsEntry.getName());
newRE.addWorkspace(newWSEntry);
@@ -125,8 +126,8 @@
{
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -155,10 +156,10 @@
String newDSName = IdGenerator.generate();
RepositoryEntry newRE =
- helper.createRepositoryEntry(false, repository.getConfiguration().getSystemWorkspaceName(), newDSName);
+ helper.createRepositoryEntry(DatabaseStructureType.SINGLE, repository.getConfiguration().getSystemWorkspaceName(), newDSName);
newRE.setName(tenantName);
- WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(false, newDSName);
+ WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, newDSName);
newWSEntry.setName(wsEntry.getName());
newRE.addWorkspace(newWSEntry);
@@ -212,8 +213,8 @@
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -242,10 +243,10 @@
String newDSName = IdGenerator.generate();
RepositoryEntry newRE =
- helper.createRepositoryEntry(false, repository.getConfiguration().getSystemWorkspaceName(), newDSName);
+ helper.createRepositoryEntry(DatabaseStructureType.SINGLE, repository.getConfiguration().getSystemWorkspaceName(), newDSName);
newRE.setName(tenantName);
- WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(false, newDSName);
+ WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, newDSName);
newWSEntry.setName(wsEntry.getName());
newRE.addWorkspace(newWSEntry);
@@ -324,8 +325,8 @@
String tenantName = "new_repository_3";
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -347,8 +348,8 @@
public void testCreateRepositoryMultiDBExistingDS() throws Exception
{
// prepare
- ManageableRepository repository = helper.createRepository(container, true, null);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(true, null);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.MULTI, null);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -375,10 +376,10 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(true, repository.getConfiguration().getSystemWorkspaceName(), null);
+ helper.createRepositoryEntry(DatabaseStructureType.MULTI, repository.getConfiguration().getSystemWorkspaceName(), null);
newRE.setName(tenantName);
- WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(true, null);
+ WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(DatabaseStructureType.MULTI, null);
newWSEntry.setName(wsEntry.getName());
newRE.addWorkspace(newWSEntry);
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/cluster/TestRepositoryCreationServiceInClusterNode1.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/cluster/TestRepositoryCreationServiceInClusterNode1.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/cluster/TestRepositoryCreationServiceInClusterNode1.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -25,9 +25,11 @@
import org.exoplatform.services.jcr.ext.backup.ExtendedBackupManager;
import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChain;
import org.exoplatform.services.jcr.ext.backup.RepositoryBackupConfig;
+import org.exoplatform.services.jcr.ext.distribution.DataDistributionMode;
import org.exoplatform.services.jcr.ext.repository.creation.DBCreationProperties;
import org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationException;
import org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationService;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import java.io.File;
import java.util.HashMap;
@@ -61,8 +63,8 @@
// prepare
String dsName = helper.createDatasource();
- ManageableRepository repository = helper.createRepository(container, false, dsName);
- WorkspaceEntry wsEntry = helper.createWorkspaceEntry(false, dsName);
+ ManageableRepository repository = helper.createRepository(container, DatabaseStructureType.SINGLE, dsName);
+ WorkspaceEntry wsEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, dsName);
helper.addWorkspace(repository, wsEntry);
addConent(repository, wsEntry.getName());
@@ -89,10 +91,10 @@
// restore
RepositoryEntry newRE =
- helper.createRepositoryEntry(false, repository.getConfiguration().getSystemWorkspaceName(), tenantName);
+ helper.createRepositoryEntry(DatabaseStructureType.SINGLE, repository.getConfiguration().getSystemWorkspaceName(), tenantName);
newRE.setName(tenantName);
- WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(false, tenantName);
+ WorkspaceEntry newWSEntry = helper.createWorkspaceEntry(DatabaseStructureType.SINGLE, tenantName);
newWSEntry.setName(wsEntry.getName());
newRE.addWorkspace(newWSEntry);
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2012-03-19 14:53:26 UTC (rev 5899)
@@ -33,6 +33,7 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCDataContainerConfig.DatabaseStructureType;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -95,11 +96,11 @@
}
- public ManageableRepository createRepository(ExoContainer container, boolean isMultiDb, String dsName)
+ public ManageableRepository createRepository(ExoContainer container, DatabaseStructureType dbStructureType, String dsName)
throws Exception
{
RepositoryService service = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
- RepositoryEntry repoEntry = createRepositoryEntry(isMultiDb, null, dsName);
+ RepositoryEntry repoEntry = createRepositoryEntry(dbStructureType, null, dsName);
service.createRepository(repoEntry);
return service.getRepository(repoEntry.getName());
@@ -108,12 +109,12 @@
/**
* Create workspace entry.
*/
- public RepositoryEntry createRepositoryEntry(boolean isMultiDb, String systemWSName, String dsName) throws Exception
+ public RepositoryEntry createRepositoryEntry(DatabaseStructureType dbStructureType, String systemWSName, String dsName) throws Exception
{
// create system workspace entry
List<String> ids = new ArrayList<String>();
ids.add("id");
- WorkspaceEntry wsEntry = createWorkspaceEntry(isMultiDb, dsName, ids);
+ WorkspaceEntry wsEntry = createWorkspaceEntry(dbStructureType, dsName, ids);
if (systemWSName != null)
{
@@ -265,18 +266,18 @@
/**
* Create workspace entry.
*/
- public WorkspaceEntry createWorkspaceEntry(boolean isMultiDb, String dsName) throws Exception
+ public WorkspaceEntry createWorkspaceEntry(DatabaseStructureType dbStructureType, String dsName) throws Exception
{
List<String> ids = new ArrayList<String>();
ids.add("id");
- return createWorkspaceEntry(isMultiDb, dsName, ids);
+ return createWorkspaceEntry(dbStructureType, dsName, ids);
}
/**
* Create workspace entry.
*/
- public WorkspaceEntry createWorkspaceEntry(boolean isMultiDb, String dsName, List<String> valueStorageIds)
+ public WorkspaceEntry createWorkspaceEntry(DatabaseStructureType dbStructureType, String dsName, List<String> valueStorageIds)
throws Exception
{
if (dsName == null)
@@ -290,7 +291,7 @@
// container entry
List params = new ArrayList();
params.add(new SimpleParameterEntry("source-name", dsName));
- params.add(new SimpleParameterEntry("multi-db", isMultiDb ? "true" : "false"));
+ params.add(new SimpleParameterEntry(JDBCWorkspaceDataContainer.DB_STRUCTURE_TYPE, dbStructureType.toString()));
params.add(new SimpleParameterEntry("max-buffer-size", "204800"));
params.add(new SimpleParameterEntry("dialect", "auto"));
params.add(new SimpleParameterEntry("swap-directory", "target/temp/swap/" + wsName));
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2012-03-19 14:13:16 UTC (rev 5898)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2012-03-19 14:53:26 UTC (rev 5899)
@@ -31,7 +31,7 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -79,7 +79,7 @@
<properties>
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -117,7 +117,7 @@
<properties>
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -155,7 +155,7 @@
<properties>
<property name="source-name" value="jdbcjcr3" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -193,7 +193,7 @@
<properties>
<property name="source-name" value="jdbcjcr4" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws4" />
</properties>
@@ -231,7 +231,7 @@
<properties>
<property name="source-name" value="jdbcjcr5" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws5" />
</properties>
@@ -277,7 +277,7 @@
<properties>
<property name="source-name" value="jdbcjcr19" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db2_ws" />
</properties>
@@ -545,7 +545,7 @@
<properties>
<property name="source-name" value="jdbcjcr21" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db5_ws" />
</properties>
@@ -584,7 +584,7 @@
<properties>
<property name="source-name" value="jdbcjcr23" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
+ <property name="db-structure-type" value="multi" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db5_ws1" />
</properties>
@@ -630,7 +630,7 @@
<properties>
<property name="source-name" value="jdbcjcr24" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db6_ws" />
</properties>
@@ -668,7 +668,7 @@
<properties>
<property name="source-name" value="jdbcjcr25" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db6_ws1" />
</properties>
@@ -706,7 +706,7 @@
<properties>
<property name="source-name" value="jdbcjcr26" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db6_ws2" />
</properties>
@@ -752,7 +752,7 @@
<properties>
<property name="source-name" value="jdbcjcr_to_repository_restore_singel_db" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db7_ws" />
</properties>
@@ -800,7 +800,7 @@
<properties>
<property name="source-name" value="jdbcjcr_to_repository_restore_singel_db" />
<property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
+ <property name="db-structure-type" value="single" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db7_ws1" />
</properties>
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5898 - in jcr/trunk: patch and 1 other directories.
by do-not-reply＠jboss.org
Author: andrew.plotnikov
Date: 2012-03-19 10:13:16 -0400 (Mon, 19 Mar 2012)
New Revision: 5898
Added:
jcr/trunk/patch/
jcr/trunk/patch/JCR-1716/
jcr/trunk/patch/JCR-1716/JCR-1716.patch
Log:
JCR-1716: patch proposed
Added: jcr/trunk/patch/JCR-1716/JCR-1716.patch
===================================================================
--- jcr/trunk/patch/JCR-1716/JCR-1716.patch (rev 0)
+++ jcr/trunk/patch/JCR-1716/JCR-1716.patch 2012-03-19 14:13:16 UTC (rev 5898)
@@ -0,0 +1,71 @@
+Index: exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml
+===================================================================
+--- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml (revision 5895)
++++ exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml (working copy)
+@@ -43,10 +43,10 @@
+ <section>
+ <title>Access Context Action</title>
+
+- <para>SetAccessContextAction implements Action and may be called by
++ <para>SetAccessControlContextAction implements Action and may be called by
+ SessionActionInterceptor as a reaction of some events - usually before
+ writing methods and after reading (getNode(), getProperty() etc). This
+- SetAccessContextAction calls the
++ SetAccessControlContextAction calls the
+ AccessManager.setContext(InvocationContext context) method which sets the
+ ThreadLocal invocation context for the current call.</para>
+
+@@ -56,7 +56,7 @@
+ <object type="org.exoplatform.services.jcr.impl.ext.action.ActionConfiguration">
+ <field name="eventTypes"><string>addNode,read</string></field>
+ <field name="workspace"><string>production</string></field >
+- <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.SetAccessContextAction</string></field>
++ <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.access.SetAccessControlContextAction</string></field>
+ </object>
+ </value></programlisting>
+ </section>
+@@ -124,11 +124,11 @@
+ <para>The sample CustomAccessManagerImpl below extends the default access
+ manager and uses some DecisionMakingService in the overloaded
+ hasPermission method to find out if a current user has permission to use
+- current <emphasis role="bold">item, event type, userID</emphasis> and some
++ current <emphasis role="bold">item, event type, user</emphasis> and some
+ parameter of AccessManager. To make this Access manager work, it is
+ necessary to configure it in jcr configuration as mentioned in <emphasis
+ role="bold">Custom Extended Access Manager</emphasis> and
+- SetAccessContextAction should be configured in the way mentioned in
++ SetAccessControlContextAction should be configured in the way mentioned in
+ <emphasis role="bold">Access Context Action.</emphasis></para>
+
+ <programlisting language="java">public class CustomAccessManagerImpl extends AccessManager {
+@@ -137,23 +137,23 @@
+ private DecisionMakingService theService;
+
+ public CustomAccessManagerImpl (RepositoryEntry config, WorkspaceEntry wsConfig,
+- OrganizationService orgService, DecisionMakingService someService) throws RepositoryException {
+- super(config, wsConfig, orgService);
++ DecisionMakingService someService) throws RepositoryException, RepositoryConfigurationException {
++ super(config, wsConfig);
+ this.property = wsConfig.getAccessManager().getParameterValue("someParam");
+- this.theService = someService;
++ this.theService = someService;
+ }
+
+ @Override
+- public boolean hasPermission(AccessControlList acl, String[] permission, String userId) {
++ public boolean hasPermission(AccessControlList acl, String[] permission, Identity user) {
+ // call the default permission check
+- if (super.hasPermission(acl, permission, userId)) {
++ if (super.hasPermission(acl, permission, user)) {
+
+ Item curItem = context().getCurrentItem();
+ int eventType = context().getEventType();
+ ExoContainer container = context().getContainer();
+
+-// call some service's method
+- return theService.makeDecision(curItem, eventType, userId, property);
++ // call some service's method
++ return theService.makeDecision(curItem, eventType, user, property);
+ } else {
+ return false;
+ }
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5897 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other.
by do-not-reply＠jboss.org
Author: andrew.plotnikov
Date: 2012-03-19 10:12:24 -0400 (Mon, 19 Mar 2012)
New Revision: 5897
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml
Log:
JCR-1716: Revert to revision 5895
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml 2012-03-19 13:21:25 UTC (rev 5896)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml 2012-03-19 14:12:24 UTC (rev 5897)
@@ -43,10 +43,10 @@
<section>
<title>Access Context Action</title>
- <para>SetAccessControlContextAction implements Action and may be called by
+ <para>SetAccessContextAction implements Action and may be called by
SessionActionInterceptor as a reaction of some events - usually before
writing methods and after reading (getNode(), getProperty() etc). This
- SetAccessControlContextAction calls the
+ SetAccessContextAction calls the
AccessManager.setContext(InvocationContext context) method which sets the
ThreadLocal invocation context for the current call.</para>
@@ -56,7 +56,7 @@
<object type="org.exoplatform.services.jcr.impl.ext.action.ActionConfiguration">
<field name="eventTypes"><string>addNode,read</string></field>
<field name="workspace"><string>production</string></field >
- <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.access.SetAccessControlContextAction</string></field>
+ <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.SetAccessContextAction</string></field>
</object>
</value></programlisting>
</section>
@@ -124,11 +124,11 @@
<para>The sample CustomAccessManagerImpl below extends the default access
manager and uses some DecisionMakingService in the overloaded
hasPermission method to find out if a current user has permission to use
- current <emphasis role="bold">item, event type, user</emphasis> and some
+ current <emphasis role="bold">item, event type, userID</emphasis> and some
parameter of AccessManager. To make this Access manager work, it is
necessary to configure it in jcr configuration as mentioned in <emphasis
role="bold">Custom Extended Access Manager</emphasis> and
- SetAccessControlContextAction should be configured in the way mentioned in
+ SetAccessContextAction should be configured in the way mentioned in
<emphasis role="bold">Access Context Action.</emphasis></para>
<programlisting language="java">public class CustomAccessManagerImpl extends AccessManager {
@@ -137,23 +137,23 @@
private DecisionMakingService theService;
public CustomAccessManagerImpl (RepositoryEntry config, WorkspaceEntry wsConfig,
- DecisionMakingService someService) throws RepositoryException, RepositoryConfigurationException {
- super(config, wsConfig);
+ OrganizationService orgService, DecisionMakingService someService) throws RepositoryException {
+ super(config, wsConfig, orgService);
this.property = wsConfig.getAccessManager().getParameterValue("someParam");
- this.theService = someService;
+ this.theService = someService;
}
@Override
- public boolean hasPermission(AccessControlList acl, String[] permission, Identity user) {
+ public boolean hasPermission(AccessControlList acl, String[] permission, String userId) {
// call the default permission check
- if (super.hasPermission(acl, permission, user)) {
+ if (super.hasPermission(acl, permission, userId)) {
Item curItem = context().getCurrentItem();
int eventType = context().getEventType();
ExoContainer container = context().getContainer();
- // call some service's method
- return theService.makeDecision(curItem, eventType, user, property);
+// call some service's method
+ return theService.makeDecision(curItem, eventType, userId, property);
} else {
return false;
}
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5896 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other.
by do-not-reply＠jboss.org
Author: andrew.plotnikov
Date: 2012-03-19 09:21:25 -0400 (Mon, 19 Mar 2012)
New Revision: 5896
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml
Log:
JCR-1716: fixed errors in doc about Access Manager
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml 2012-03-19 13:17:20 UTC (rev 5895)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml 2012-03-19 13:21:25 UTC (rev 5896)
@@ -43,10 +43,10 @@
<section>
<title>Access Context Action</title>
- <para>SetAccessContextAction implements Action and may be called by
+ <para>SetAccessControlContextAction implements Action and may be called by
SessionActionInterceptor as a reaction of some events - usually before
writing methods and after reading (getNode(), getProperty() etc). This
- SetAccessContextAction calls the
+ SetAccessControlContextAction calls the
AccessManager.setContext(InvocationContext context) method which sets the
ThreadLocal invocation context for the current call.</para>
@@ -56,7 +56,7 @@
<object type="org.exoplatform.services.jcr.impl.ext.action.ActionConfiguration">
<field name="eventTypes"><string>addNode,read</string></field>
<field name="workspace"><string>production</string></field >
- <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.SetAccessContextAction</string></field>
+ <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.access.SetAccessControlContextAction</string></field>
</object>
</value></programlisting>
</section>
@@ -124,11 +124,11 @@
<para>The sample CustomAccessManagerImpl below extends the default access
manager and uses some DecisionMakingService in the overloaded
hasPermission method to find out if a current user has permission to use
- current <emphasis role="bold">item, event type, userID</emphasis> and some
+ current <emphasis role="bold">item, event type, user</emphasis> and some
parameter of AccessManager. To make this Access manager work, it is
necessary to configure it in jcr configuration as mentioned in <emphasis
role="bold">Custom Extended Access Manager</emphasis> and
- SetAccessContextAction should be configured in the way mentioned in
+ SetAccessControlContextAction should be configured in the way mentioned in
<emphasis role="bold">Access Context Action.</emphasis></para>
<programlisting language="java">public class CustomAccessManagerImpl extends AccessManager {
@@ -137,23 +137,23 @@
private DecisionMakingService theService;
public CustomAccessManagerImpl (RepositoryEntry config, WorkspaceEntry wsConfig,
- OrganizationService orgService, DecisionMakingService someService) throws RepositoryException {
- super(config, wsConfig, orgService);
+ DecisionMakingService someService) throws RepositoryException, RepositoryConfigurationException {
+ super(config, wsConfig);
this.property = wsConfig.getAccessManager().getParameterValue("someParam");
- this.theService = someService;
+ this.theService = someService;
}
@Override
- public boolean hasPermission(AccessControlList acl, String[] permission, String userId) {
+ public boolean hasPermission(AccessControlList acl, String[] permission, Identity user) {
// call the default permission check
- if (super.hasPermission(acl, permission, userId)) {
+ if (super.hasPermission(acl, permission, user)) {
Item curItem = context().getCurrentItem();
int eventType = context().getEventType();
ExoContainer container = context().getContainer();
-// call some service's method
- return theService.makeDecision(curItem, eventType, userId, property);
+ // call some service's method
+ return theService.makeDecision(curItem, eventType, user, property);
} else {
return false;
}
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5895 - jcr/trunk.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-19 09:17:20 -0400 (Mon, 19 Mar 2012)
New Revision: 5895
Modified:
jcr/trunk/pom.xml
Log:
EXOJCR-1676: change dep to trunk
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2012-03-19 13:15:41 UTC (rev 5894)
+++ jcr/trunk/pom.xml 2012-03-19 13:17:20 UTC (rev 5895)
@@ -42,9 +42,9 @@
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.14</exo.product.specification>
- <org.exoplatform.kernel.version>2.3.7-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.4.7-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.2.7-GA</org.exoplatform.ws.version>
+ <org.exoplatform.kernel.version>2.3.8-GA-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.4.8-GA-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.2.8-GA-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>2</org.exoplatform.doc-style.version>
</properties>
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5894 - in jcr/branches/1.12.x/patch/1.12.13-GA: JCR-1716 and 1 other directory.
by do-not-reply＠jboss.org
Author: andrew.plotnikov
Date: 2012-03-19 09:15:41 -0400 (Mon, 19 Mar 2012)
New Revision: 5894
Added:
jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1716/
jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1716/JCR-1716.patch
Log:
JCR-1716: patch proposed
Added: jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1716/JCR-1716.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1716/JCR-1716.patch (rev 0)
+++ jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1716/JCR-1716.patch 2012-03-19 13:15:41 UTC (rev 5894)
@@ -0,0 +1,71 @@
+Index: exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml
+===================================================================
+--- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml (revision 5891)
++++ exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml (working copy)
+@@ -47,10 +47,10 @@
+ <section>
+ <title>Access Context Action</title>
+
+- <para>SetAccessContextAction implements Action and may be called by
++ <para>SetAccessControlContextAction implements Action and may be called by
+ SessionActionInterceptor as a reaction of some events - usually before
+ writing methods and after reading (getNode(), getProperty() etc). This
+- SetAccessContextAction calls the
++ SetAccessControlContextAction calls the
+ AccessManager.setContext(InvocationContext context) method which sets the
+ ThreadLocal invocation context for the current call.</para>
+
+@@ -60,7 +60,7 @@
+ <object type="org.exoplatform.services.jcr.impl.ext.action.ActionConfiguration">
+ <field name="eventTypes"><string>addNode,read</string></field>
+ <field name="workspace"><string>production</string></field >
+- <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.SetAccessContextAction</string></field>
++ <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.access.SetAccessControlContextAction</string></field>
+ </object>
+ </value></programlisting>
+ </section>
+@@ -128,11 +128,11 @@
+ <para>The sample CustomAccessManagerImpl below extends the default access
+ manager and uses some DecisionMakingService in the overloaded
+ hasPermission method to find out if a current user has permission to use
+- current <emphasis role="bold">item, event type, userID</emphasis> and some
++ current <emphasis role="bold">item, event type, user</emphasis> and some
+ parameter of AccessManager. To make this Access manager work, it is
+ necessary to configure it in jcr configuration as mentioned in <emphasis
+ role="bold">Custom Extended Access Manager</emphasis> and
+- SetAccessContextAction should be configured in the way mentioned in
++ SetAccessControlContextAction should be configured in the way mentioned in
+ <emphasis role="bold">Access Context Action.</emphasis></para>
+
+ <programlisting>public class CustomAccessManagerImpl extends AccessManager {
+@@ -141,23 +141,23 @@
+ private DecisionMakingService theService;
+
+ public CustomAccessManagerImpl (RepositoryEntry config, WorkspaceEntry wsConfig,
+- OrganizationService orgService, DecisionMakingService someService) throws RepositoryException {
+- super(config, wsConfig, orgService);
++ DecisionMakingService someService) throws RepositoryException, RepositoryConfigurationException {
++ super(config, wsConfig);
+ this.property = wsConfig.getAccessManager().getParameterValue("someParam");
+- this.theService = someService;
++ this.theService = someService;
+ }
+
+ @Override
+- public boolean hasPermission(AccessControlList acl, String[] permission, String userId) {
++ public boolean hasPermission(AccessControlList acl, String[] permission, Identity user) {
+ // call the default permission check
+- if (super.hasPermission(acl, permission, userId)) {
++ if (super.hasPermission(acl, permission, user)) {
+
+ Item curItem = context().getCurrentItem();
+ int eventType = context().getEventType();
+ ExoContainer container = context().getContainer();
+
+-// call some service's method
+- return theService.makeDecision(curItem, eventType, userId, property);
++ // call some service's method
++ return theService.makeDecision(curItem, eventType, user, property);
+ } else {
+ return false;
+ }
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5893 - dev-resources.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2012-03-19 09:13:30 -0400 (Mon, 19 Mar 2012)
New Revision: 5893
Added:
dev-resources/branches/
Log:
Added branches directory to the project dev-resources as it is mandatory for the git migration
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5892 - docs-style.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2012-03-19 09:08:26 -0400 (Mon, 19 Mar 2012)
New Revision: 5892
Added:
docs-style/branches/
Log:
Added branches directory to the project docs-style as it is mandatory for the git migration
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5891 - jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other.
by do-not-reply＠jboss.org
Author: andrew.plotnikov
Date: 2012-03-19 08:42:51 -0400 (Mon, 19 Mar 2012)
New Revision: 5891
Modified:
jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml
Log:
JCR-1716: fixed errors in doc about Access Manager
Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml 2012-03-19 12:06:10 UTC (rev 5890)
+++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/other/acl-ext.xml 2012-03-19 12:42:51 UTC (rev 5891)
@@ -43,10 +43,10 @@
<section>
<title>Access Context Action</title>
- <para>SetAccessContextAction implements Action and may be called by
+ <para>SetAccessControlContextAction implements Action and may be called by
SessionActionInterceptor as a reaction of some events - usually before
writing methods and after reading (getNode(), getProperty() etc). This
- SetAccessContextAction calls the
+ SetAccessControlContextAction calls the
AccessManager.setContext(InvocationContext context) method which sets the
ThreadLocal invocation context for the current call.</para>
@@ -56,7 +56,7 @@
<object type="org.exoplatform.services.jcr.impl.ext.action.ActionConfiguration">
<field name="eventTypes"><string>addNode,read</string></field>
<field name="workspace"><string>production</string></field >
- <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.SetAccessContextAction</string></field>
+ <field name="actionClassName"><string>org.exoplatform.services.jcr.ext.access.SetAccessControlContextAction</string></field>
</object>
</value></programlisting>
</section>
@@ -124,11 +124,11 @@
<para>The sample CustomAccessManagerImpl below extends the default access
manager and uses some DecisionMakingService in the overloaded
hasPermission method to find out if a current user has permission to use
- current <emphasis role="bold">item, event type, userID</emphasis> and some
+ current <emphasis role="bold">item, event type, user</emphasis> and some
parameter of AccessManager. To make this Access manager work, it is
necessary to configure it in jcr configuration as mentioned in <emphasis
role="bold">Custom Extended Access Manager</emphasis> and
- SetAccessContextAction should be configured in the way mentioned in
+ SetAccessControlContextAction should be configured in the way mentioned in
<emphasis role="bold">Access Context Action.</emphasis></para>
<programlisting language="java">public class CustomAccessManagerImpl extends AccessManager {
@@ -137,23 +137,23 @@
private DecisionMakingService theService;
public CustomAccessManagerImpl (RepositoryEntry config, WorkspaceEntry wsConfig,
- OrganizationService orgService, DecisionMakingService someService) throws RepositoryException {
- super(config, wsConfig, orgService);
+ DecisionMakingService someService) throws RepositoryException, RepositoryConfigurationException {
+ super(config, wsConfig);
this.property = wsConfig.getAccessManager().getParameterValue("someParam");
- this.theService = someService;
+ this.theService = someService;
}
@Override
- public boolean hasPermission(AccessControlList acl, String[] permission, String userId) {
+ public boolean hasPermission(AccessControlList acl, String[] permission, Identity user) {
// call the default permission check
- if (super.hasPermission(acl, permission, userId)) {
+ if (super.hasPermission(acl, permission, user)) {
Item curItem = context().getCurrentItem();
int eventType = context().getEventType();
ExoContainer container = context().getContainer();
-// call some service's method
- return theService.makeDecision(curItem, eventType, userId, property);
+ // call some service's method
+ return theService.makeDecision(curItem, eventType, user, property);
} else {
return false;
}
14 years, 1 month
- 1
- 0
exo-jcr SVN: r5890 - in jcr/trunk: applications and 26 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-19 08:06:10 -0400 (Mon, 19 Mar 2012)
New Revision: 5890
Modified:
jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml
jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/trunk/applications/exo.jcr.applications.browser/pom.xml
jcr/trunk/applications/exo.jcr.applications.config/pom.xml
jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
jcr/trunk/applications/exo.jcr.applications.rest/pom.xml
jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml
jcr/trunk/applications/exo.jcr.ear/pom.xml
jcr/trunk/applications/pom.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ftp/pom.xml
jcr/trunk/exo.jcr.component.statistics/pom.xml
jcr/trunk/exo.jcr.component.webdav/pom.xml
jcr/trunk/exo.jcr.connectors.jca/pom.xml
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/trunk/exo.jcr.docs/pom.xml
jcr/trunk/exo.jcr.framework.command/pom.xml
jcr/trunk/exo.jcr.framework.ftpclient/pom.xml
jcr/trunk/exo.jcr.framework.web/pom.xml
jcr/trunk/packaging/module/pom.xml
jcr/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole.dist</artifactId>
<name>eXo JCR :: Applications :: Backup Console Binary Distribution</name>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
Modified: jcr/trunk/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.browser/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.browser/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/trunk/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<relativePath>../exo.jcr.applications.config/pom.xml</relativePath>
</parent>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<relativePath>../exo.jcr.applications.config/pom.xml</relativePath>
</parent>
Modified: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<relativePath>../exo.jcr.applications.config/pom.xml</relativePath>
</parent>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.connectors.jca</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<type>rar</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.rest/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.rest/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<relativePath>../exo.jcr.applications.config/pom.xml</relativePath>
</parent>
Modified: jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/trunk/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.ear/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/exo.jcr.ear/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/trunk/applications/pom.xml
===================================================================
--- jcr/trunk/applications/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/applications/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core.impl.infinispan.v5</artifactId>
<name>eXo JCR :: Component :: Core Service based on ISPN 5</name>
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/trunk/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.component.ftp/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/trunk/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.statistics/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.component.statistics/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/trunk/exo.jcr.connectors.jca/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.connectors.jca/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.connectors.jca/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.jca</artifactId>
<packaging>rar</packaging>
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/trunk/exo.jcr.docs/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.docs/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/trunk/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.command/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.framework.command/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/trunk/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/trunk/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.web/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/exo.jcr.framework.web/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/trunk/packaging/module/pom.xml
===================================================================
--- jcr/trunk/packaging/module/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/packaging/module/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>jcr.packaging.module</artifactId>
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2012-03-19 12:05:46 UTC (rev 5889)
+++ jcr/trunk/pom.xml 2012-03-19 12:06:10 UTC (rev 5890)
@@ -29,14 +29,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.7-GA</version>
+ <version>1.14.8-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.14.7-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.14.7-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.14.7-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/trunk</url>
</scm>
<properties>
14 years, 1 month
- 1
- 0