[exo-jcr-commits] exo-jcr SVN: r5020 - in jcr/trunk/applications: exo.jcr.applications.backupconsole.dist/bin and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Oct 4 09:07:09 EDT 2011
Author: areshetnyak
Date: 2011-10-04 09:07:08 -0400 (Tue, 04 Oct 2011)
New Revision: 5020
Modified:
jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd
jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh
jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java
Log:
EXOJCR-1531 : Help information in backup client was extended and fixed.
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-10-04 11:52:31 UTC (rev 5019)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java 2011-10-04 13:07:08 UTC (rev 5020)
@@ -72,13 +72,13 @@
+ " stop <backup_id> \n"
+ " status <backup_id> \n"
+ " restores <repo[/ws]> \n"
- + " restore [remove-exists] [<repo[/ws]>] {<backup_id>|<backup_set_path>} [<pathToConfigFile>] \n"
+ + " restore [remove-exists] {{<backup_id>|<backup_set_path>} | {<repo[/ws]> {<backup_id>|<backup_set_path>} [<pathToConfigFile>]}} \n"
+ " list [completed] \n"
+ " info \n"
+ " drop [force-close-session] <repo[/ws]> \n"
+ " help \n\n"
- + " start - start backup of repositpry or workspace \n"
+ + " start - start backup of repository or workspace \n"
+ " stop - stop backup \n"
+ " status - information about the current or completed backup by 'backup_id' \n"
+ " restores - information about the last restore on specific repository or workspace \n"
@@ -96,7 +96,20 @@
+ " <incr> - incemental job period \n"
+ " <pathToConfigFile> - path (local) to repository or workspace configuration \n"
+ " remove-exists - remove fully (db, value storage, index) exists repository/workspace \n"
- + " force-close-session - close opened sessions on repositpry or workspace. \n\n";
+ + " force-close-session - close opened sessions on repository or workspace. \n\n"
+ + " All valid combination of parameters for command restore: \n"
+ + " 1. restore remove-exists <repo/ws> <backup_id> <pathToConfigFile> \n"
+ + " 2. restore remove-exists <repo> <backup_id> <pathToConfigFile> \n"
+ + " 3. restore remove-exists <repo/ws> <backup_set_path> <pathToConfigFile> \n"
+ + " 4. restore remove-exists <repo> <backup_set_path> <pathToConfigFile> \n"
+ + " 5. restore remove-exists <backup_id> \n"
+ + " 6. restore remove-exists <backup_set_path> \n"
+ + " 7. restore <repo/ws> <backup_id> <pathToConfigFile> \n"
+ + " 8. restore <repo> <backup_id> <pathToConfigFile> \n"
+ + " 9. restore <repo/ws> <backup_set_path> <pathToConfigFile> \n"
+ + " 10. restore <repo> <backup_set_path> <pathToConfigFile> \n"
+ + " 11. restore <backup_id> \n"
+ + " 12. restore <backup_set_path> \n";
/**
* Main.
@@ -445,7 +458,7 @@
{
/*
- All valid combination of paramter.
+ All valid combination of parameters for command restore.
1. restore remove-exists <repo/ws> <backup_id> <pathToConfigFile>
2. restore remove-exists <repo> <backup_id> <pathToConfigFile>
3. restore remove-exists <repo/ws> <backup_set_path> <pathToConfigFile>
@@ -551,7 +564,7 @@
if (curArg == args.length)
{
- System.out.println(INCORRECT_PARAM + "There is no path to config file parameter."); //NOSONAR
+ System.out.println(INCORRECT_PARAM + "The path to the configuration file is missing."); //NOSONAR
return;
}
String pathToConf = args[curArg++];
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd 2011-10-04 11:52:31 UTC (rev 5019)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd 2011-10-04 13:07:08 UTC (rev 5020)
@@ -71,7 +71,7 @@
echo stop ^<backup_id^>
echo status ^<backup_id^>
echo restores ^<repo[/ws]^>
-echo restore ^<repo[/ws]^> ^<backup_id^> ^<pathToConfigFile^>
+echo restore [remove-exists] {{^<backup_id^>|^<backup_set_path^>} | {^<repo[/ws]^> {^<backup_id^>|^<backup_set_path^>} [^<pathToConfigFile^>]}}
echo list [completed]
echo info
echo drop [force-close-session] ^<repo[/ws]^>
@@ -94,3 +94,18 @@
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
+echo
+echo All valid combination of parameters for command restore:
+echo 1. restore remove-exists ^<repo/ws^> ^<backup_id^> ^<pathToConfigFile^>
+echo 2. restore remove-exists ^<repo^> ^<backup_id^> ^<pathToConfigFile^>
+echo 3. restore remove-exists ^<repo/ws^> ^<backup_set_path^> ^<pathToConfigFile^>
+echo 4. restore remove-exists ^<repo^> ^<backup_set_path^> ^<pathToConfigFile^>
+echo 5. restore remove-exists ^<backup_id^>
+echo 6. restore remove-exists ^<backup_set_path^>
+echo 7. restore ^<repo/ws^> ^<backup_id^> ^<pathToConfigFile^>
+echo 8. restore ^<repo^> ^<backup_id^> ^<pathToConfigFile^>
+echo 9. restore ^<repo/ws^> ^<backup_set_path^> ^<pathToConfigFile^>
+echo 10. restore ^<repo^> ^<backup_set_path^> ^<pathToConfigFile^>
+echo 11. restore ^<backup_id^>
+echo 12. restore ^<backup_set_path^>
+
\ No newline at end of file
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh 2011-10-04 11:52:31 UTC (rev 5019)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh 2011-10-04 13:07:08 UTC (rev 5020)
@@ -14,7 +14,7 @@
echo " stop <backup_id> "
echo " status <backup_id> "
echo " restores <repo[/ws]> "
-echo " restore [remove-exists] [<repo[/ws]>] {<backup_id>|<backup_set_path>} [<pathToConfigFile>] "
+echo " restore [remove-exists] {{<backup_id>|<backup_set_path>} | {<repo[/ws]> {<backup_id>|<backup_set_path>} [<pathToConfigFile>]}} "
echo " list [completed] "
echo " info "
echo " drop [force-close-session] <repo[/ws]> "
@@ -38,7 +38,21 @@
echo " <pathToConfigFile> : path (local) to repository or workspace configuration "
echo " remove-exists : remove fully (db, value storage, index) exists repository/workspace "
echo " force-close-session : close opened sessions on repository or workspace "
-exit 1
+echo " "
+echo " All valid combination of parameters for command restore: "
+echo " 1. restore remove-exists <repo/ws> <backup_id> <pathToConfigFile> "
+echo " 2. restore remove-exists <repo> <backup_id> <pathToConfigFile> "
+echo " 3. restore remove-exists <repo/ws> <backup_set_path> <pathToConfigFile> "
+echo " 4. restore remove-exists <repo> <backup_set_path> <pathToConfigFile> "
+echo " 5. restore remove-exists <backup_id> "
+echo " 6. restore remove-exists <backup_set_path> "
+echo " 7. restore <repo/ws> <backup_id> <pathToConfigFile> "
+echo " 8. restore <repo> <backup_id> <pathToConfigFile> "
+echo " 9. restore <repo/ws> <backup_set_path> <pathToConfigFile> "
+echo " 10. restore <repo> <backup_set_path> <pathToConfigFile> "
+echo " 11. restore <backup_id> "
+echo " 12. restore <backup_set_path> "
+exit 1
fi
user="$2"
More information about the exo-jcr-commits
mailing list