Skip to content

Commit

Permalink
Merge pull request eXist-db#206 from shabanovd/develop
Browse files Browse the repository at this point in the history
API change
  • Loading branch information
wolfgangmm committed May 1, 2014
2 parents 2f93719 + 5d48d5f commit b478779
Show file tree
Hide file tree
Showing 556 changed files with 99,825 additions and 99,764 deletions.
36 changes: 18 additions & 18 deletions backup.properties
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# properties used for backup/restore

# XMLDB driver
driver=org.exist.xmldb.DatabaseImpl

# uncomment following line if you want to access a
# stand-alone server
#uri=xmldb:exist://localhost:8088/xmlrpc

# access eXist via XML-RPC provided by remote Tomcat
uri=xmldb:exist://localhost:8080/exist/xmlrpc

# access a local instance of the database
#uri=xmldb:exist://

# user settings for backup/restore
user=admin
password=
# properties used for backup/restore

# XMLDB driver
driver=org.exist.xmldb.DatabaseImpl

# uncomment following line if you want to access a
# stand-alone server
#uri=xmldb:exist://localhost:8088/xmlrpc

# access eXist via XML-RPC provided by remote Tomcat
uri=xmldb:exist://localhost:8080/exist/xmlrpc

# access a local instance of the database
#uri=xmldb:exist://

# user settings for backup/restore
user=admin
password=
128 changes: 64 additions & 64 deletions bin/backup.bat
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
@echo off

rem $Id$

rem Slurp the command line arguments. This loop allows for an unlimited number
rem of arguments (up to the command line limit, anyway).

set CMD_LINE_ARGS=%1
if ""%1""=="""" goto doneStart
shift
:setupArgs
if ""%1""=="""" goto doneStart
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
shift
goto setupArgs

rem This label provides a place for the argument list loop to break out
rem and for NT handling to skip to.

:doneStart

set JAVA_RUN="java"

if not "%JAVA_HOME%" == "" (
set JAVA_RUN="%JAVA_HOME%\bin\java"
goto gotJavaHome
)

rem @WINDOWS_INSTALLER_1@

echo WARNING: JAVA_HOME not found in your environment.
echo.
echo Please, set the JAVA_HOME variable in your enviroment to match the
echo location of the Java Virtual Machine you want to use in case of run fail.
echo.

:gotJavaHome
if not "%EXIST_HOME%" == "" goto gotExistHome

rem try to guess (will be overridden by the installer)
set EXIST_HOME=.

rem @WINDOWS_INSTALLER_2@

if exist "%EXIST_HOME%\start.jar" goto gotExistHome

set EXIST_HOME=..
if exist "%EXIST_HOME%\start.jar" goto gotExistHome

echo EXIST_HOME not found. Please set your
echo EXIST_HOME environment variable to the
echo home directory of eXist.
goto :eof

:gotExistHome
set MX=768
rem @WINDOWS_INSTALLER_3@

set JAVA_ENDORSED_DIRS="%EXIST_HOME%\lib\endorsed"
set JAVA_OPTS="-Xms128m -Xmx%MX%m -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%"

%JAVA_RUN% "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" backup %CMD_LINE_ARGS%
:eof

@echo off

rem $Id$

rem Slurp the command line arguments. This loop allows for an unlimited number
rem of arguments (up to the command line limit, anyway).

set CMD_LINE_ARGS=%1
if ""%1""=="""" goto doneStart
shift
:setupArgs
if ""%1""=="""" goto doneStart
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
shift
goto setupArgs

rem This label provides a place for the argument list loop to break out
rem and for NT handling to skip to.

:doneStart

set JAVA_RUN="java"

if not "%JAVA_HOME%" == "" (
set JAVA_RUN="%JAVA_HOME%\bin\java"
goto gotJavaHome
)

rem @WINDOWS_INSTALLER_1@

echo WARNING: JAVA_HOME not found in your environment.
echo.
echo Please, set the JAVA_HOME variable in your enviroment to match the
echo location of the Java Virtual Machine you want to use in case of run fail.
echo.

:gotJavaHome
if not "%EXIST_HOME%" == "" goto gotExistHome

rem try to guess (will be overridden by the installer)
set EXIST_HOME=.

rem @WINDOWS_INSTALLER_2@

if exist "%EXIST_HOME%\start.jar" goto gotExistHome

set EXIST_HOME=..
if exist "%EXIST_HOME%\start.jar" goto gotExistHome

echo EXIST_HOME not found. Please set your
echo EXIST_HOME environment variable to the
echo home directory of eXist.
goto :eof

:gotExistHome
set MX=768
rem @WINDOWS_INSTALLER_3@

set JAVA_ENDORSED_DIRS="%EXIST_HOME%\lib\endorsed"
set JAVA_OPTS="-Xms128m -Xmx%MX%m -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%"

%JAVA_RUN% "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" backup %CMD_LINE_ARGS%
:eof

114 changes: 57 additions & 57 deletions bin/client.bat
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
@echo off
rem $Id$
rem
rem In addition to the other parameter options for the interactive client
rem pass -j or --jmx to enable JMX agent. The port for it can be specified
rem with optional port number e.g. -j1099 or --jmx=1099.
rem

set JMX_ENABLED=0
set JMX_PORT=1099
set JAVA_ARGS=

set JAVA_RUN="java"

if not "%JAVA_HOME%" == "" (
set JAVA_RUN="%JAVA_HOME%\bin\java"
goto gotJavaHome
)

rem @WINDOWS_INSTALLER_1@

echo WARNING: JAVA_HOME not found in your environment.
echo.
echo Please, set the JAVA_HOME variable in your enviroment to match the
echo location of the Java Virtual Machine you want to use in case of run fail.
echo.

:gotJavaHome
rem @WINDOWS_INSTALLER_2@

if not "%EXIST_HOME%" == "" goto gotExistHome

rem try to guess (will be set by the installer)
set EXIST_HOME=.
if exist "%EXIST_HOME%\start.jar" goto gotExistHome

set EXIST_HOME=..
if exist "%EXIST_HOME%\start.jar" goto gotExistHome

echo EXIST_HOME not found. Please set your
echo EXIST_HOME environment variable to the
echo home directory of eXist.
goto :eof

:gotExistHome
set MX=1024
rem @WINDOWS_INSTALLER_3@

set JAVA_ENDORSED_DIRS="%EXIST_HOME%\lib\endorsed"
set JAVA_OPTS="-Xms128m -Xmx%MX%m -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%"

set BATCH.D="%EXIST_HOME%\bin\batch.d"
call %BATCH.D%\get_opts.bat %*
call %BATCH.D%\check_jmx_status.bat

%JAVA_RUN% "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" client %JAVA_ARGS%
:eof
@echo off
rem $Id$
rem
rem In addition to the other parameter options for the interactive client
rem pass -j or --jmx to enable JMX agent. The port for it can be specified
rem with optional port number e.g. -j1099 or --jmx=1099.
rem

set JMX_ENABLED=0
set JMX_PORT=1099
set JAVA_ARGS=

set JAVA_RUN="java"

if not "%JAVA_HOME%" == "" (
set JAVA_RUN="%JAVA_HOME%\bin\java"
goto gotJavaHome
)

rem @WINDOWS_INSTALLER_1@

echo WARNING: JAVA_HOME not found in your environment.
echo.
echo Please, set the JAVA_HOME variable in your enviroment to match the
echo location of the Java Virtual Machine you want to use in case of run fail.
echo.

:gotJavaHome
rem @WINDOWS_INSTALLER_2@

if not "%EXIST_HOME%" == "" goto gotExistHome

rem try to guess (will be set by the installer)
set EXIST_HOME=.
if exist "%EXIST_HOME%\start.jar" goto gotExistHome

set EXIST_HOME=..
if exist "%EXIST_HOME%\start.jar" goto gotExistHome

echo EXIST_HOME not found. Please set your
echo EXIST_HOME environment variable to the
echo home directory of eXist.
goto :eof

:gotExistHome
set MX=1024
rem @WINDOWS_INSTALLER_3@

set JAVA_ENDORSED_DIRS="%EXIST_HOME%\lib\endorsed"
set JAVA_OPTS="-Xms128m -Xmx%MX%m -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%"

set BATCH.D="%EXIST_HOME%\bin\batch.d"
call %BATCH.D%\get_opts.bat %*
call %BATCH.D%\check_jmx_status.bat

%JAVA_RUN% "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" client %JAVA_ARGS%
:eof
Loading

0 comments on commit b478779

Please sign in to comment.