[exo-jcr-commits] exo-jcr SVN: r4189 - in jcr/trunk: exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server and 1 other directory.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2011-03-29 10:53:18 -0400 (Tue, 29 Mar 2011)
New Revision: 4189

Modified:
   jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
Log:
EXOJCR-1257 : exobackup tool was simplified command-line interface.

Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java	2011-03-29 12:26:31 UTC (rev 4188)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java	2011-03-29 14:53:18 UTC (rev 4189)
@@ -268,12 +268,24 @@
             String repositoryName = getRepositoryName(pathToWS);
             String workspaceName = (pathToWS.split("/").length == 3 ? getWorkspaceName(pathToWS) : null);
 
+
+            String backupDir;
             if (curArg == args.length)
             {
-               System.out.println(INCORRECT_PARAM + "There is no path to backup dir parameter.");
-               return;
+               backupDir = null;
             }
-            String backupDir = args[curArg++];
+            else
+            {
+               //check is incremental job period
+               if (args[curArg].matches("[0-9]+"))
+               {
+                  backupDir = null;
+               }
+               else
+               {
+                  backupDir = args[curArg++];
+               }
+            }
 
             if (curArg == args.length)
             {

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java	2011-03-29 12:26:31 UTC (rev 4188)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java	2011-03-29 14:53:18 UTC (rev 4189)
@@ -327,11 +327,20 @@
 
       try
       {
-         File backupDir = new File(bConfigBeen.getBackupDir());
-         if (!PrivilegedFileHelper.exists(backupDir))
-            throw new BackupDirNotFoundException("The backup folder not exists :  "
-               + PrivilegedFileHelper.getAbsolutePath(backupDir));
+         File backupDir;
 
+         if (bConfigBeen.getBackupDir() == null)
+         {
+            backupDir = backupManager.getBackupDirectory();
+         }
+         else
+         {
+            backupDir = new File(bConfigBeen.getBackupDir());
+            if (!PrivilegedFileHelper.exists(backupDir))
+               throw new BackupDirNotFoundException("The backup folder not exists :  "
+                        + PrivilegedFileHelper.getAbsolutePath(backupDir));
+         }
+
          BackupConfig config = new BackupConfig();
          config.setBackupType(bConfigBeen.getBackupType());
          config.setRepository(repository);
@@ -427,12 +436,19 @@
 
       try
       {
-         File backupDir = new File(bConfigBeen.getBackupDir());
-         if (!PrivilegedFileHelper.exists(backupDir))
+         File backupDir;
+
+         if (bConfigBeen.getBackupDir() == null)
          {
-            throw new BackupDirNotFoundException("The backup folder not exists :  "
-               + PrivilegedFileHelper.getAbsolutePath(backupDir));
+            backupDir = backupManager.getBackupDirectory();
          }
+         else
+         {
+            backupDir = new File(bConfigBeen.getBackupDir());
+            if (!PrivilegedFileHelper.exists(backupDir))
+               throw new BackupDirNotFoundException("The backup folder not exists :  "
+                        + PrivilegedFileHelper.getAbsolutePath(backupDir));
+         }
 
          RepositoryBackupConfig config = new RepositoryBackupConfig();
          config.setBackupType(bConfigBeen.getBackupType());