[exo-jcr-commits] exo-jcr SVN: r4171 - in jcr/trunk: exo.jcr.component.ext and 1 other directories.
Author: tolusha
Date: 2011-03-25 03:10:50 -0400 (Fri, 25 Mar 2011)
New Revision: 4171
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java
Log:
EXOJCR-1270: clean components before restoring
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java 2011-03-24
16:15:17 UTC (rev 4170)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java 2011-03-25
07:10:50 UTC (rev 4171)
@@ -101,11 +101,14 @@
try
{
File tmpDir = new File(tempDir, PREFIX + IdGenerator.generate());
- DirectoryHelper.copyDirectory(dataDir, tmpDir);
-
+ PrivilegedFileHelper.mkdirs(tmpDir);
tmpDirs.add(tmpDir);
- DirectoryHelper.removeDirectory(dataDir);
+ if (PrivilegedFileHelper.exists(dataDir))
+ {
+ DirectoryHelper.copyDirectory(dataDir, tmpDir);
+ DirectoryHelper.removeDirectory(dataDir);
+ }
}
catch (IOException e)
{
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2011-03-24 16:15:17 UTC (rev 4170)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2011-03-25 07:10:50 UTC (rev 4171)
@@ -141,7 +141,7 @@
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>8.3-606.jdbc3</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
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 2011-03-24
16:15:17 UTC (rev 4170)
+++
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2011-03-25
07:10:50 UTC (rev 4171)
@@ -140,6 +140,11 @@
for (DataRestor restorer : dataRestorers)
{
+ restorer.clean();
+ }
+
+ for (DataRestor restorer : dataRestorers)
+ {
restorer.restore();
}