Author: tolusha Date: 2010-12-22 05:57:44 -0500 (Wed, 22 Dec 2010) New Revision: 3705 Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml Log: EXOJCR-1078: small fixes Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java 2010-12-22 10:54:30 UTC (rev 3704) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java 2010-12-22 10:57:44 UTC (rev 3705) @@ -94,15 +94,15 @@ } catch (RepositoryConfigurationException e1) { - throw new RepositoryException("Can't rollback changes", e); + log.error("Can't rollback changes", e1); } catch (DBCleanerException e1) { - throw new RepositoryException("Can't rollback changes", e); + log.error("Can't rollback changes", e1); } catch (IOException e1) { - throw new RepositoryException("Can't rollback changes", e); + log.error("Can't rollback changes", e1); } throw new RepositoryException(e); } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2010-12-22 10:54:30 UTC (rev 3704) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2010-12-22 10:57:44 UTC (rev 3705) @@ -141,15 +141,15 @@ } catch (RepositoryConfigurationException e1) { - throw new RepositoryException("Can't rollback changes", e); + log.error("Can't rollback changes", e1); } catch (DBCleanerException e1) { - throw new RepositoryException("Can't rollback changes", e); + log.error("Can't rollback changes", e1); } catch (IOException e1) { - throw new RepositoryException("Can't rollback changes", e); + log.error("Can't rollback changes", e1); } throw new RepositoryException(e); } @@ -806,6 +806,7 @@ } } insertNode.addBatch(); + } insertNode.executeBatch(); Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java 2010-12-22 10:54:30 UTC (rev 3704) +++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java 2010-12-22 10:57:44 UTC (rev 3705) @@ -237,7 +237,7 @@ ArrayList qParams = new ArrayList(); // qParams.add(new SimpleParameterEntry("indexDir", "target" + File.separator+ "temp" + // File.separator +"index" + name)); - qParams.add(new SimpleParameterEntry(QueryHandlerParams.PARAM_INDEX_DIR, "target" + File.separator + name + qParams.add(new SimpleParameterEntry(QueryHandlerParams.PARAM_INDEX_DIR, "target/temp/index/" + name + System.currentTimeMillis())); QueryHandlerEntry qEntry = new QueryHandlerEntry("org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex", qParams); @@ -272,7 +272,7 @@ ValueStorageEntry valueStorageEntry = new ValueStorageEntry("org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage", vsparams); ArrayList<SimpleParameterEntry> spe = new ArrayList<SimpleParameterEntry>(); - spe.add(new SimpleParameterEntry("path", "target/temp/swap/" + name + "_" + System.currentTimeMillis())); + spe.add(new SimpleParameterEntry("path", "target/temp/values/" + name + "_" + System.currentTimeMillis())); valueStorageEntry.setId("draft"); valueStorageEntry.setParameters(spe); valueStorageEntry.setFilters(vsparams); Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2010-12-22 10:54:30 UTC (rev 3704) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2010-12-22 10:57:44 UTC (rev 3705) @@ -190,7 +190,7 @@ <property name="multi-db" value="true" /> <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp2/swap/ws" /> + <property name="swap-directory" value="target/temp/swap/db2_ws" /> </properties> </container> <cache enabled="true"> @@ -201,7 +201,7 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="target/temp2/index/ws" /> + <property name="index-dir" value="target/temp/index/db2_ws" /> </properties> </query-handler> </workspace>