[exo-jcr-commits] exo-jcr SVN: r3562 - in jcr/trunk/applications: exo.jcr.applications.backupconsole.dist and 6 other directories.

Author: dkuleshov Date: 2010-11-25 09:41:22 -0500 (Thu, 25 Nov 2010) New Revision: 3562 Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/ 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.dist/bin/jcrbackup.cmd jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/jcrbackup.sh jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/binary-assembly.xml jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/zip-bundle-assembly.xml jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/readme.txt jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/resources/ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/resources/log4j.properties Modified: jcr/trunk/applications/pom.xml Log: EXOJCR-1076: Backup console binary distribution module added to applications, applications pom.xml modified for consistency Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.cmd 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1,56 @@ +echo off +if %1 NEQ "-u" goto :help +set user=%2 +set pass=%3 +set auth=%4 +set host=%5 +SHIFT +SHIFT +SHIFT +SHIFT +SHIFT +set comm=%* + +if %auth% == "-b" set newarg="http://%user%:%pass%@%host% %comm%" +if %auth% == "-f" set newarg="http://%host%/portal/rest form POST /portal/login?username=%user%&password=%pass% %comm%" + +jcrbackup.cmd %newarg% + +exit +:help +echo " -u <user> <password> <form_of_authentication> <host:port> <command> " +echo " " +echo " <form_of_authentication> : -b - is used for basic authentication " +echo " -f - is used for form authentication " +echo " " +echo " <command> : start <repo[/ws]> <backup_dir> [<incr>] " +echo " stop <backup_id> " +echo " status <backup_id> " +echo " restores <repo[/ws]> " +echo " restore <repo[/ws]> <backup_id> <pathToConfigFile> " +echo " list [completed] " +echo " info " +echo " drop [force-close-session] <repo[/ws]> " +echo " help " +echo " " +echo " start : start backup of repository or workspace " +echo " stop : stop backup " +echo " status : information about the current or completed backup by 'backup_id' " +echo " restores : information about the last restore on specific repository or workspace " +echo " restore : restore the repository or workspace from specific backup " +echo " list : information about the current backups (in progress) " +echo " list completed : information about the completed (ready to restore) backups " +echo " info : information about the service backup " +echo " drop : delete the repository or workspace " +echo " help : print help information about backup console " +echo " " +echo " <repo[/ws]> : /<repository-name>[/<workspace-name>] the repository or workspace " +echo " <backup_dir> : path to folder for backup on remote server " +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 " + + + + Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1,55 @@ +#!/bin/bash + +args=("$@") + +if [ "$1" != "-u" ] +then +echo " -u <user> <password> <form_of_authentication> <host:port> <command> " +echo " " +echo " <form_of_authentication> : -b - is used for basic authentication " +echo " -f - is used for form authentication " +echo " " +echo " <command> : start <repo[/ws]> <backup_dir> [<incr>] " +echo " stop <backup_id> " +echo " status <backup_id> " +echo " restores <repo[/ws]> " +echo " restore <repo[/ws]> <backup_id> <pathToConfigFile> " +echo " list [completed] " +echo " info " +echo " drop [force-close-session] <repo[/ws]> " +echo " help " +echo " " +echo " start : start backup of repository or workspace " +echo " stop : stop backup " +echo " status : information about the current or completed backup by 'backup_id' " +echo " restores : information about the last restore on specific repository or workspace " +echo " restore : restore the repository or workspace from specific backup " +echo " list : information about the current backups (in progress) " +echo " list completed : information about the completed (ready to restore) backups " +echo " info : information about the service backup " +echo " drop : delete the repository or workspace " +echo " help : print help information about backup console " +echo " " +echo " <repo[/ws]> : /<repository-name>[/<workspace-name>] the repository or workspace " +echo " <backup_dir> : path to folder for backup on remote server " +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 " +exit 1 +fi + +user="$2" +pass="$3" +host=${5#*"http://"} +if [ "$4" = "-f" ] +then + newargs="http://$host/portal/rest form POST /portal/login?username=$user&password=$pass ${args[@]:5}" +else + if [ "$4" = "-b" ] + then + newargs="http://$user:$pass@$host ${args[@]:5}" + fi +fi + +./jcrbackup.sh $newargs Property changes on: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/exobackup.sh ___________________________________________________________________ Name: svn:executable + * Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/jcrbackup.cmd =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/jcrbackup.cmd (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/jcrbackup.cmd 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1 @@ +java -jar exo.jcr.applications.backupconsole.dist-binary.jar %* Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/jcrbackup.sh =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/jcrbackup.sh (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/jcrbackup.sh 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1,3 @@ +#!/bin/sh + +java -jar exo.jcr.applications.backupconsole.dist-binary.jar $* Property changes on: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/bin/jcrbackup.sh ___________________________________________________________________ Name: svn:executable + * Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>jcr-applications-parent</artifactId> + <version>1.14.0-CR1-SNAPSHOT</version> + </parent> + <artifactId>exo.jcr.applications.backupconsole.dist</artifactId> + <name>eXo JCR :: Applications :: Backup Console Binary Distribution</name> + <properties> + <childDelegation>true</childDelegation> + <enforcer.skip>true</enforcer.skip> + </properties> + + <dependencies> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.applications.backupconsole</artifactId> + <version>1.14.0-CR1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> + <!-- dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency --> + </dependencies> + <build> + <outputDirectory>target</outputDirectory> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>jar-with-dependensies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <primaryArtifact>false</primaryArtifact> + <finalName>${project.artifactId}</finalName> + <descriptors> + <descriptor>${basedir}/src/main/assemblies/binary-assembly.xml</descriptor> + </descriptors> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>/</classpathPrefix> + <mainClass>org.exoplatform.jcr.backupconsole.BackupConsole</mainClass> + </manifest> + </archive> + </configuration> + </execution> + <execution> + <id>bundle</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>${basedir}/src/main/assemblies/zip-bundle-assembly.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/binary-assembly.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/binary-assembly.xml (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/binary-assembly.xml 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1,73 @@ +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>binary</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping> + <outputDirectory>/</outputDirectory> + <unpack>true</unpack> + <useProjectArtifact>false</useProjectArtifact> + <scope>compile</scope> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + <dependencySet> + <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping> + <outputDirectory>/</outputDirectory> + <unpack>true</unpack> + <scope>test</scope> + <includes> + <include>org.slf4j:slf4j-log4j12</include> + </includes> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + <dependencySet> + <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping> + <outputDirectory>/</outputDirectory> + <unpack>true</unpack> + <!-- useTransitiveDependencies>true</useTransitiveDependencies --> + <!-- useTransitiveFiltering>true</useTransitiveFiltering --> + <includes> + <!-- eXo Deserializer deps --> + <include>picocontainer:picocontainer</include> + <!-- eXo logging deps --> + <include>org.slf4j:*</include> + <include>log4j:log4j</include> + <include>commons-logging:commons-logging</include> + <!-- runtime deps of exo.ws.commons --> + <include>javax.xml.stream:stax-api</include> + <include>xpp3:xpp3</include> + </includes> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>${basedir}/src/main/resources</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly> Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/zip-bundle-assembly.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/zip-bundle-assembly.xml (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/assemblies/zip-bundle-assembly.xml 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1,49 @@ +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>bundle</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <files> + <file> + <source>target/${project.artifactId}-binary.jar</source> + <destName>${project.artifactId}-binary.jar</destName> + </file> + <file> + <source>${basedir}/src/main/doc/readme.txt</source> + <destName>readme.txt</destName> + </file> + </files> + <fileSets> + <fileSet> + <directory>${basedir}/bin</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.cmd</include> + <include>*.sh</include> + </includes> + </fileSet> + </fileSets> +</assembly> Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/readme.txt =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/readme.txt (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/doc/readme.txt 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1,76 @@ +jcrbackup.cmd and jcrbackup.sh - suitable for Standalone and flexible for various authentication ways shell scripts + + <url_basic_authentication> | <url_form_authentication> <command> + + <url_basic_authentication>: http(s)//login:password@host:port/<context> + <url_form_authentication> : http(s)//host:port/<context> <form_auth_parm> + + <form_auth_part> : form <method> <form_path> + <method> : POST or GET + <form_path> : /path/path?<paramName1>=<paramValue1>&<paramName2>=<paramValue2>... + + Example of <url_form_authentication> - http://127.0.0.1:8080/portal/rest form POST "/portal/login?username=root&password=gtn" + + <command> : start <repo[/ws]> <backup_dir> [<incr>] + stop <backup_id> + status <backup_id> + restores <repo[/ws]> + restore <repo[/ws]> <backup_id> <pathToConfigFile> + list [completed] + info + drop [force-close-session] <repo[/ws]> + help + + start : start backup of repository or workspace + stop : stop backup + status : information about the current or completed backup by 'backup_id' + restores : information about the last restore on specific repository or workspace + restore : restore the repository or workspace from specific backup + list : information about the current backups (in progress) + list completed : information about the completed (ready to restore) backups + info : information about the service backup + drop : delete the repository or workspace + help : print help information about backup console + + <repo[/ws]> : /<repository-name>[/<workspace-name>] the repository or workspace + <backup_dir> : path to folder for backup on remote server + <backup_id> : the identifier for backup + <incr> : incremental job period + <pathToConfigFile> : path (local) to repository or workspace configuration + force-close-session : close opened sessions on repository or workspace + + +exobackup.sh and exobackup.cmd - suitable for use with GateIn based products like Platform + + -u <user> <password> <form_of_authentication> <host:port> <command> + + <form_of_authentication> : -b - is used for basic authentication + -f - is used for form authentication + + <command> : start <repo[/ws]> <backup_dir> [<incr>] + stop <backup_id> + status <backup_id> + restores <repo[/ws]> + restore <repo[/ws]> <backup_id> <pathToConfigFile> + list [completed] + info + drop [force-close-session] <repo[/ws]> + help + + start : start backup of repository or workspace + stop : stop backup + status : information about the current or completed backup by 'backup_id' + restores : information about the last restore on specific repository or workspace + restore : restore the repository or workspace from specific backup + list : information about the current backups (in progress) + list completed : information about the completed (ready to restore) backups + info : information about the service backup + drop : delete the repository or workspace + help : print help information about backup console + + <repo[/ws]> : /<repository-name>[/<workspace-name>] the repository or workspace + <backup_dir> : path to folder for backup on remote server + <backup_id> : the identifier for backup + <incr> : incremental job period + <pathToConfigFile> : path (local) to repository or workspace configuration + force-close-session : close opened sessions on repository or workspace Added: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/resources/log4j.properties =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/resources/log4j.properties (rev 0) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/src/main/resources/log4j.properties 2010-11-25 14:41:22 UTC (rev 3562) @@ -0,0 +1,25 @@ +# Set root logger level to DEBUG and its only appender to A1. +#log4j.rootLogger=INFO, file +#log4j.rootLogger=DEBUG, file +#log4j.rootLogger=DEBUG, stdout, file +log4j.rootLogger=ERROR, stdout, file + +#log4j.logger.org.apache.jackrabbit.test=DEBUG +#log4j.logger.org.exoplatform=DEBUG +log4j.logger.org.hibernate=ERROR + +# 'stdout' is set to be a ConsoleAppender. +log4j.appender.stdout=org.apache.log4j.ConsoleAppender + +# 'stdout' uses PatternLayout +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L)\n + +# 'file' is set to be a FileAppender. +log4j.appender.file=org.apache.log4j.FileAppender +#log4j.appender.file.File=jcr.log +log4j.appender.file.File=nul + +# 'file' uses PatternLayout. +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L)\n Modified: jcr/trunk/applications/pom.xml =================================================================== --- jcr/trunk/applications/pom.xml 2010-11-25 14:33:17 UTC (rev 3561) +++ jcr/trunk/applications/pom.xml 2010-11-25 14:41:22 UTC (rev 3562) @@ -36,6 +36,7 @@ <modules> <module>exo.jcr.cluster.testclient</module> <module>exo.jcr.applications.backupconsole</module> + <module>exo.jcr.applications.backupconsole.dist</module> <module>exo.jcr.applications.browser</module> <module>exo.jcr.applications.config</module> <module>exo.jcr.applications.fckeditor</module>