[exo-jcr-commits] exo-jcr SVN: r3554 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2010-11-25 05:42:09 -0500 (Thu, 25 Nov 2010)
New Revision: 3554

Modified:
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java
Log:
EXOJCR-1075 : Changes for "The JCR backupset should be fully independent" was committed.

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java	2010-11-25 09:12:05 UTC (rev 3553)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java	2010-11-25 10:42:09 UTC (rev 3554)
@@ -834,8 +834,7 @@
          writer.writeEndElement();
 
          writer.writeStartElement("url");
-         writer.writeCharacters(info.getURL().toString().replace(
-                  PrivilegedFileHelper.getCanonicalPath(config.getBackupDir()) + File.separator, ""));
+         writer.writeCharacters(getRelativeUrl(info.getURL(), config.getBackupDir()));
          writer.writeEndElement();
 
          writer.writeStartElement("date");
@@ -847,6 +846,14 @@
          writer.flush();
       }
 
+      private String getRelativeUrl(URL url, File backupDir) throws IOException
+      {
+         String str = PrivilegedFileHelper.getCanonicalPath(new File(url.getFile()));
+
+         return url.getProtocol() + ":"
+                  + str.replace(PrivilegedFileHelper.getCanonicalPath(config.getBackupDir()) + File.separator, "");
+      }
+
       private boolean isRootBackupManagerDir(File log) throws IOException
       {
          return (PrivilegedFileHelper.getCanonicalPath(log.getParentFile()).equals(PrivilegedFileHelper