[exo-jcr-commits] exo-jcr SVN: r3753 - in jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist: src/main/doc and 1 other directory.

[do-not-reply at jboss.org]

Author: dkuleshov
Date: 2010-12-30 04:26:25 -0500 (Thu, 30 Dec 2010)
New Revision: 3753

Modified:
   jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd
   jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh
   jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/readme.txt
Log:
JCR-1499: changes to scripts due to new requirements

Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd	2010-12-30 08:37:38 UTC (rev 3752)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd	2010-12-30 09:26:25 UTC (rev 3753)
@@ -1,14 +1,23 @@
 @echo off
 if NOT "%1" == "-u" goto :help
 shift
+if "%1" == "" goto :help
 set user=%1
 shift
 if NOT "%1" == "-p" goto :help
 shift
+if "%1" == "" goto :help
 set pass=%1
 shift
+if "%1" == "" goto :help
+if "%1" == "-f" (
 set auth=%1
 shift
+)
+if "%1" == "-b" (
+set auth=%1
+shift
+)
 set host=%1
 shift
 
@@ -32,7 +41,7 @@
 )
 
 if "%auth%" == "-b" (
-jcrbackup http://%user%:%pass%@%host% %comm%
+jcrbackup http://%user%:%pass%@%host%/rest/private %comm%
 )
 if "%auth%" == "-f" (
 jcrbackup http://%host%/portal/rest form POST /portal/login?username=%user%^^^&password=%pass% %comm%
@@ -72,4 +81,4 @@
 echo            ^<backup_id^>               :  the identifier for backup 
 echo            ^<incr^>                    :  incremental job period 
 echo            ^<pathToConfigFile^>        :  path (local) to  repository or workspace configuration 
-echo            force-close-session       :  close opened sessions on repository or workspace
\ No newline at end of file
+echo            force-close-session       :  close opened sessions on repository or workspace

Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh	2010-12-30 08:37:38 UTC (rev 3752)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh	2010-12-30 09:26:25 UTC (rev 3753)
@@ -42,15 +42,20 @@
 
 user="$2"
 pass="$4"
-host=${6#*"http://"}
+
 if [ "$5" = "-f" ]
 then
+  host=${6#*"http://"}
   newargs="http://$host/portal/rest form POST /portal/login?username=$user&password=$pass ${args[@]:6}"
 else
   if [ "$5" = "-b" ]
   then
-    newargs="http://$user:$pass@$host ${args[@]:6}"
+    host=${6#*"http://"}
+    newargs="http://$user:$pass@$host/rest/private ${args[@]:6}"
+  else
+    host=${5#*"http://"}
+    newargs="http://$user:$pass@$host/rest/private ${args[@]:5}"
   fi
 fi
 
-./jcrbackup.sh $newargs
\ No newline at end of file
+./jcrbackup.sh $newargs

Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/readme.txt
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/readme.txt	2010-12-30 08:37:38 UTC (rev 3752)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/readme.txt	2010-12-30 09:26:25 UTC (rev 3753)
@@ -43,10 +43,11 @@
 
 exobackup.sh and exobackup.cmd - suitable for use with GateIn based products like Platform
 
-           -u <user> -p <password> <form_of_authentication> <host:port> <command>
+           -u <user> -p <password> [form_of_authentication] <host:port> <command>
 
            <form_of_authentication>  :  -b - is used for basic authentication
                                         -f - is used for form authentication
+                                        if no authentication set basic authentication is used
 
            <command>                 :  start <repo[/ws]> <backup_dir> [<incr>] 
                                         stop <backup_id>