diff --git a/rapla-source-1.8.2/.classpath b/rapla/.classpath
similarity index 97%
rename from rapla-source-1.8.2/.classpath
rename to rapla/.classpath
index 616d858..803985a 100644
--- a/rapla-source-1.8.2/.classpath
+++ b/rapla/.classpath
@@ -1,167 +1,167 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rapla-source-1.8.2/.gitignore b/rapla/.gitignore
similarity index 100%
rename from rapla-source-1.8.2/.gitignore
rename to rapla/.gitignore
diff --git a/rapla-source-1.8.2/.project b/rapla/.project
similarity index 95%
rename from rapla-source-1.8.2/.project
rename to rapla/.project
index 8292662..1038b45 100644
--- a/rapla-source-1.8.2/.project
+++ b/rapla/.project
@@ -1,17 +1,17 @@
-
-
- rapla
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
+
+
+ rapla
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/rapla-source-1.8.2/.settings/org.eclipse.jdt.core.prefs b/rapla/.settings/org.eclipse.jdt.core.prefs
similarity index 98%
rename from rapla-source-1.8.2/.settings/org.eclipse.jdt.core.prefs
rename to rapla/.settings/org.eclipse.jdt.core.prefs
index 838bd9d..7341ab1 100644
--- a/rapla-source-1.8.2/.settings/org.eclipse.jdt.core.prefs
+++ b/rapla/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/rapla-source-1.8.2/INSTALL.txt b/rapla/INSTALL.txt
similarity index 96%
rename from rapla-source-1.8.2/INSTALL.txt
rename to rapla/INSTALL.txt
index e743148..1ac28bd 100644
--- a/rapla-source-1.8.2/INSTALL.txt
+++ b/rapla/INSTALL.txt
@@ -1,49 +1,49 @@
-This is the INSTALLING-GUIDE for the Rapla-BINARY-DISTRIBUTION
-
-You will find more information on our documentation pages on
-http://code.google.com/p/rapla/
-
-if you have downloaded the SOURCE-DISTRIBUTION you have to
-!!! BUILD A BINARY-DISTRIBUTION first !!!
-For more information read README-BUILD.txt.
-
-Requirements:
-
-You need JAVA: JRE 1.6 at least (1.7 recommended).
-You can download it from java.com
-
-* The SDK works for the binary and source distribution but is very
- large
-
-* The JRE will only work for the binary distribution (Compiler
- missing) but is much smaller
-
-
-STARTING RAPLA:
-
-Start rapla.exe (rapla.sh under Unix).
-
-To start Rapla from the command-line, you may to set the java command
-in your PATH-Variable (if its not already there),
-
-Example:
-setenv PATH $PATH:/usr/local/java/bin (Unix)
-set PATH=%PATH%:c:\Programme\Java\jre\bin (Windows)
-
-Then type:
-
-rapla.sh (Unix)
-rapla.bat (XP/Vista/7/8).
-call rapla.bat (win NT/2000)
-
-
-For more information visit the documentation pages on
-
-http://code.google.com/p/rapla/
-
-
-Acknowledgment
----------------
-
-Rapla includes free software developed from other organizations and third parties.
-For a complete list of all external libraries, take a look at legal/readme.txt
+This is the INSTALLING-GUIDE for the Rapla-BINARY-DISTRIBUTION
+
+You will find more information on our documentation pages on
+http://code.google.com/p/rapla/
+
+if you have downloaded the SOURCE-DISTRIBUTION you have to
+!!! BUILD A BINARY-DISTRIBUTION first !!!
+For more information read README-BUILD.txt.
+
+Requirements:
+
+You need JAVA: JRE 1.6 at least (1.7 recommended).
+You can download it from java.com
+
+* The SDK works for the binary and source distribution but is very
+ large
+
+* The JRE will only work for the binary distribution (Compiler
+ missing) but is much smaller
+
+
+STARTING RAPLA:
+
+Start rapla.exe (rapla.sh under Unix).
+
+To start Rapla from the command-line, you may to set the java command
+in your PATH-Variable (if its not already there),
+
+Example:
+setenv PATH $PATH:/usr/local/java/bin (Unix)
+set PATH=%PATH%:c:\Programme\Java\jre\bin (Windows)
+
+Then type:
+
+rapla.sh (Unix)
+rapla.bat (XP/Vista/7/8).
+call rapla.bat (win NT/2000)
+
+
+For more information visit the documentation pages on
+
+http://code.google.com/p/rapla/
+
+
+Acknowledgment
+---------------
+
+Rapla includes free software developed from other organizations and third parties.
+For a complete list of all external libraries, take a look at legal/readme.txt
diff --git a/rapla-source-1.8.2/README-Build.txt b/rapla/README-Build.txt
similarity index 97%
rename from rapla-source-1.8.2/README-Build.txt
rename to rapla/README-Build.txt
index 9722155..1204372 100644
--- a/rapla-source-1.8.2/README-Build.txt
+++ b/rapla/README-Build.txt
@@ -1,37 +1,37 @@
-This README is for building rapla from source. You will find more information and the rapla sources on
-
-http://code.google.com/p/rapla/
-
-We recommend reading the faqs and the development documents under https://code.google.com/p/rapla/wiki/ for more information.
-especially the http://code.google.com/p/rapla/wiki/BuildGuide
-
-We use the ant tool for our build process. Ant is the java-equivalent to make
-Look at jakarta.apache.org/ant for more information. If you don't want
-to use Ant read the FAQS and developers doc for alternative building.
-
-
-Use the following batch files to start the ant.jar included with
-the rapla source distribution.
-
-build.sh (Linux/Unix)
-build.bat (Win)
-
-Calling build with no arguments will create a binary-distribution
-in the sub-folder dist. There you will find the scripts to start rapla. (SEE INSTALL.txt)
-
-
-You can call build with different arguments, e.g.:
-
- choose-target Executes the target specified in build.properties.
- (default) Default target is dist-bin.
-
- dist-bin Creates a new Binary-Distribution in the folder dist.
- build Builds a new rapla.war in the build sub-folder
- clean Deletes the build sub-folder
- clean-dist Deletes the dist sub-folder
- javadocs create the Javadoc in the build sub-folder
-
-Pass the target as a parameter to ant
-e.g. build.sh dist-bin
-
-For a complete list of all targets use the -projecthelp option
+This README is for building rapla from source. You will find more information and the rapla sources on
+
+http://code.google.com/p/rapla/
+
+We recommend reading the faqs and the development documents under https://code.google.com/p/rapla/wiki/ for more information.
+especially the http://code.google.com/p/rapla/wiki/BuildGuide
+
+We use the ant tool for our build process. Ant is the java-equivalent to make
+Look at jakarta.apache.org/ant for more information. If you don't want
+to use Ant read the FAQS and developers doc for alternative building.
+
+
+Use the following batch files to start the ant.jar included with
+the rapla source distribution.
+
+build.sh (Linux/Unix)
+build.bat (Win)
+
+Calling build with no arguments will create a binary-distribution
+in the sub-folder dist. There you will find the scripts to start rapla. (SEE INSTALL.txt)
+
+
+You can call build with different arguments, e.g.:
+
+ choose-target Executes the target specified in build.properties.
+ (default) Default target is dist-bin.
+
+ dist-bin Creates a new Binary-Distribution in the folder dist.
+ build Builds a new rapla.war in the build sub-folder
+ clean Deletes the build sub-folder
+ clean-dist Deletes the dist sub-folder
+ javadocs create the Javadoc in the build sub-folder
+
+Pass the target as a parameter to ant
+e.g. build.sh dist-bin
+
+For a complete list of all targets use the -projecthelp option
diff --git a/rapla-source-1.8.2/README-Server.txt b/rapla/README-Server.txt
similarity index 97%
rename from rapla-source-1.8.2/README-Server.txt
rename to rapla/README-Server.txt
index 41e3bc7..722e9b1 100644
--- a/rapla-source-1.8.2/README-Server.txt
+++ b/rapla/README-Server.txt
@@ -1,153 +1,153 @@
-This README is for running Rapla as server. You will find more information on our
-documentation pages on
-
-http://code.google.com/p/rapla/
-
-
-The Rapla server:
----------------------------
-
-Download the binary-distribution or build one with "build dist-bin"
-
-You can start it with:
-
-raplaserver.bat (Windows)
-raplaserver.sh run (Unix)
-
-If you want to install Rapla-Server as a SERVICE on Win NT/2000/XP/Vista/7 or linux
-use the scripts in the service/bin folder to test/install/uninstall rapla as a service.
-
-You can also try the script service/bin/TestWrapper instead of raplaserver if it fails
-because java command is not found.
-
-With a running server point your browser to
-http://localhost:8051
-
-You should see the rapla welcome screen. Click on start with webstart
-and the webstart client should launch. If not launched automatically,
-you should choose the webstart program from your
-java installation (e.g. C:\Program Files (x86)\Java\jre7\bin\javaws.exe under Windows).
-
-You can login with username "admin" and empty password
-
-Thats it.
-
-Installing into another servlet container
------------------------------------------
-
-If you want to use another servlet container (e.g. tomcat) you can
-copy the rapla.war in the webapps folder to the webapps folder of
-your servlet container.
-
-You need to set a jndi entry jdbc/rapladb in the servlet container if you are using a database
-or resource/raplafile if you are using the file, see contexts/rapla.xml for the setting in jetty.
-
-See the documentation of your servelt-container for more details about how to set both entries from contexts/rapla.xml
-in the container of your choice.
-
-Installing in Apache or IIS
-----------------------------
-
-You can install Jetty with apache or IIS by adding
-the AJP13 listener in etc/jetty.xml.
-
-See http://www.eclipse.org/jetty/ for more information
-
-Troubleshooting:
-----------------
-1. The most commen error will be long stacktrace with
- "Caused by: java.net.BindException: Could not bind to port 8051"
- somewhere hidden between the lines. This means that either another
- rapla server is running (so stop or kill this process) or that this
- port is blocked by another application. You need to configure
- another the port in etc/jetty.xml
-
-
-
-
-
-
-2. look in the troubleshooting faq under http://code.google.com/p/rapla/
-
-3. Post a question to rapla-developers@lists.sourceforge.net
-
-
-Running Multiple Rapla servers:
--------------------------------
-
-There is no Problem running multiple rapla servers on one computer. You just need to copy the contexts/rapla entry folder and rename it to another name and edit the entries
-
-Considering the original rapla.xml
- /
-
-
- raplafile
- /data/data.xml
- true
-
-
- jdbc/rapladb
-
-
- jdbc:hsqldb:data/rapla-hsqldb
- db_user
- your_pwd
-
-
-
-
-
-
- rapladatasource
-
- raplafile
- true
-
-
- If you want a second instance running on a different context. e.g. secondRapla.xml
-
- /secondRapla
-
-
- raplafile
- /data/secondRapla_data.xml
- true
-
-
- jdbc/rapladb
-
-
- jdbc:hsqldb:data/secondRapla-hsqldb
- db_user
- your_pwd
-
-
-
-
-
-
- rapladatasource
-
- raplafile
- true
-
-
-
-
-
-Now you should have two applications running
-http://localhost:8051/
-http://localhost:8051/secondRapla/
-
-
-Acknowledgment
----------------
-
-Rapla includes free software developed from other organizations and third parties.
-For a complete list of all external libraries, take a look at legal/readme.txt
-
-
+This README is for running Rapla as server. You will find more information on our
+documentation pages on
+
+http://code.google.com/p/rapla/
+
+
+The Rapla server:
+---------------------------
+
+Download the binary-distribution or build one with "build dist-bin"
+
+You can start it with:
+
+raplaserver.bat (Windows)
+raplaserver.sh run (Unix)
+
+If you want to install Rapla-Server as a SERVICE on Win NT/2000/XP/Vista/7 or linux
+use the scripts in the service/bin folder to test/install/uninstall rapla as a service.
+
+You can also try the script service/bin/TestWrapper instead of raplaserver if it fails
+because java command is not found.
+
+With a running server point your browser to
+http://localhost:8051
+
+You should see the rapla welcome screen. Click on start with webstart
+and the webstart client should launch. If not launched automatically,
+you should choose the webstart program from your
+java installation (e.g. C:\Program Files (x86)\Java\jre7\bin\javaws.exe under Windows).
+
+You can login with username "admin" and empty password
+
+Thats it.
+
+Installing into another servlet container
+-----------------------------------------
+
+If you want to use another servlet container (e.g. tomcat) you can
+copy the rapla.war in the webapps folder to the webapps folder of
+your servlet container.
+
+You need to set a jndi entry jdbc/rapladb in the servlet container if you are using a database
+or resource/raplafile if you are using the file, see contexts/rapla.xml for the setting in jetty.
+
+See the documentation of your servelt-container for more details about how to set both entries from contexts/rapla.xml
+in the container of your choice.
+
+Installing in Apache or IIS
+----------------------------
+
+You can install Jetty with apache or IIS by adding
+the AJP13 listener in etc/jetty.xml.
+
+See http://www.eclipse.org/jetty/ for more information
+
+Troubleshooting:
+----------------
+1. The most commen error will be long stacktrace with
+ "Caused by: java.net.BindException: Could not bind to port 8051"
+ somewhere hidden between the lines. This means that either another
+ rapla server is running (so stop or kill this process) or that this
+ port is blocked by another application. You need to configure
+ another the port in etc/jetty.xml
+
+
+
+
+
+
+2. look in the troubleshooting faq under http://code.google.com/p/rapla/
+
+3. Post a question to rapla-developers@lists.sourceforge.net
+
+
+Running Multiple Rapla servers:
+-------------------------------
+
+There is no Problem running multiple rapla servers on one computer. You just need to copy the contexts/rapla entry folder and rename it to another name and edit the entries
+
+Considering the original rapla.xml
+ /
+
+
+ raplafile
+ /data/data.xml
+ true
+
+
+ jdbc/rapladb
+
+
+ jdbc:hsqldb:data/rapla-hsqldb
+ db_user
+ your_pwd
+
+
+
+
+
+
+ rapladatasource
+
+ raplafile
+ true
+
+
+ If you want a second instance running on a different context. e.g. secondRapla.xml
+
+ /secondRapla
+
+
+ raplafile
+ /data/secondRapla_data.xml
+ true
+
+
+ jdbc/rapladb
+
+
+ jdbc:hsqldb:data/secondRapla-hsqldb
+ db_user
+ your_pwd
+
+
+
+
+
+
+ rapladatasource
+
+ raplafile
+ true
+
+
+
+
+
+Now you should have two applications running
+http://localhost:8051/
+http://localhost:8051/secondRapla/
+
+
+Acknowledgment
+---------------
+
+Rapla includes free software developed from other organizations and third parties.
+For a complete list of all external libraries, take a look at legal/readme.txt
+
+
diff --git a/rapla-source-1.8.2/RaplaStandaloneLoader.launch b/rapla/RaplaStandaloneLoader.launch
similarity index 98%
rename from rapla-source-1.8.2/RaplaStandaloneLoader.launch
rename to rapla/RaplaStandaloneLoader.launch
index d1011bf..9af70df 100644
--- a/rapla-source-1.8.2/RaplaStandaloneLoader.launch
+++ b/rapla/RaplaStandaloneLoader.launch
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rapla-source-1.8.2/bin/ant b/rapla/bin/ant
similarity index 100%
rename from rapla-source-1.8.2/bin/ant
rename to rapla/bin/ant
diff --git a/rapla-source-1.8.2/bin/ant.bat b/rapla/bin/ant.bat
similarity index 97%
rename from rapla-source-1.8.2/bin/ant.bat
rename to rapla/bin/ant.bat
index 7e2379a..57a958e 100644
--- a/rapla-source-1.8.2/bin/ant.bat
+++ b/rapla/bin/ant.bat
@@ -1,106 +1,106 @@
-@echo off
-
-REM Copyright 2001,2004 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-
-if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
-
-if "%OS%"=="Windows_NT" @setlocal
-
-rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_ANT_HOME=%~dp0..
-
-if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
-set DEFAULT_ANT_HOME=
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-set ANT_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set ANT_CMD_LINE_ARGS=%ANT_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
-rem find ANT_HOME if it does not exist due to either an invalid value passed
-rem by the user or the %0 problem on Windows 9x
-if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
-
-rem check for ant in Program Files
-if not exist "%ProgramFiles%\ant" goto checkSystemDrive
-set ANT_HOME=%ProgramFiles%\ant
-goto checkJava
-
-:checkSystemDrive
-rem check for ant in root directory of system drive
-if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
-set ANT_HOME=%SystemDrive%\ant
-goto checkJava
-
-:checkCDrive
-rem check for ant in C:\ant for Win9X users
-if not exist C:\ant\lib\ant.jar goto noAntHome
-set ANT_HOME=C:\ant
-goto checkJava
-
-:noAntHome
-echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
-goto end
-
-:checkJava
-set _JAVACMD=%JAVACMD%
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-goto checkJikes
-
-:noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=java.exe
-
-:checkJikes
-if not "%JIKESPATH%"=="" goto runAntWithJikes
-
-:runAnt
-if not "%CLASSPATH%"=="" goto runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntWithJikes
-if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-goto end
-
-:end
-set _JAVACMD=
-set ANT_CMD_LINE_ARGS=
-
-if "%OS%"=="Windows_NT" @endlocal
-
-:mainEnd
-if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
-
+@echo off
+
+REM Copyright 2001,2004 The Apache Software Foundation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
+
+if "%OS%"=="Windows_NT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set DEFAULT_ANT_HOME=%~dp0..
+
+if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
+set DEFAULT_ANT_HOME=
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+set ANT_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+set ANT_CMD_LINE_ARGS=%ANT_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
+rem find ANT_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
+
+rem check for ant in Program Files
+if not exist "%ProgramFiles%\ant" goto checkSystemDrive
+set ANT_HOME=%ProgramFiles%\ant
+goto checkJava
+
+:checkSystemDrive
+rem check for ant in root directory of system drive
+if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
+set ANT_HOME=%SystemDrive%\ant
+goto checkJava
+
+:checkCDrive
+rem check for ant in C:\ant for Win9X users
+if not exist C:\ant\lib\ant.jar goto noAntHome
+set ANT_HOME=C:\ant
+goto checkJava
+
+:noAntHome
+echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
+goto end
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto checkJikes
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+
+:checkJikes
+if not "%JIKESPATH%"=="" goto runAntWithJikes
+
+:runAnt
+if not "%CLASSPATH%"=="" goto runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+goto end
+
+:runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+goto end
+
+:runAntWithJikes
+if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+goto end
+
+:runAntWithJikesAndClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+goto end
+
+:end
+set _JAVACMD=
+set ANT_CMD_LINE_ARGS=
+
+if "%OS%"=="Windows_NT" @endlocal
+
+:mainEnd
+if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
+
diff --git a/rapla-source-1.8.2/bin/ant.cmd b/rapla/bin/ant.cmd
similarity index 96%
rename from rapla-source-1.8.2/bin/ant.cmd
rename to rapla/bin/ant.cmd
index 94b5a45..4bb903f 100644
--- a/rapla-source-1.8.2/bin/ant.cmd
+++ b/rapla/bin/ant.cmd
@@ -1,92 +1,92 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- Run ant
-*/
-
-'@echo off'
-parse arg mode envarg '::' antarg
-
-if mode\='.' & mode\='..' & mode\='/' then do
- envarg = mode envarg
- mode = ''
-end
-
-if antarg = '' then do
- antarg = envarg
- envarg = ''
-end
-
-x = setlocal()
-
-env="OS2ENVIRONMENT"
-antenv = _getenv_('antenv')
-if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
-
-if mode = '' then mode = _getenv_('ANT_MODE' '..')
-if mode \= '/' then do
- runrc = _getenv_('runrc')
- antrc = _getenv_('antrc' 'antrc.cmd')
- if mode = '..' then mode = '-r'
- else mode = ''
- interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
-end
-
-if _testenv_() = 0 then do
- say 'Ant environment is not set properly'
- x = endlocal()
- exit 16
-end
-
-settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
-
-java = _getenv_('javacmd' 'java')
-opts = value('ANT_OPTS',,env)
-args = value('ANT_ARGS',,env)
-lcp = value('LOCALCLASSPATH',,env)
-cp = value('CLASSPATH',,env)
-if value('ANT_USE_CP',,env) \= '' then do
- if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
- lcp = lcp || cp
- 'SET CLASSPATH='
-end
-if lcp\='' then lcp = '-classpath' lcp
-
-cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
-launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
-if launcher = '' then entry = 'org.apache.tools.ant.Main'
-else entry = 'org.apache.tools.ant.launch.Launcher'
-java opts lcp entry settings args antarg
-
-x = endlocal()
-
-return rc
-
-_testenv_: procedure expose env ANT_HOME JAVA_HOME
-ANT_HOME = value('ANT_HOME',,env)
-if ANT_HOME = '' then return 0
-JAVA_HOME = value('JAVA_HOME',,env)
-if JAVA_HOME = '' then return 0
-cp = translate(value('CLASSPATH',,env))
-if pos(translate(ANT_HOME), cp) = 0 then return 0
-if pos(translate(JAVA_HOME), cp) = 0 then return 0
-return 1
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
+/*
+ Copyright 2003-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Run ant
+*/
+
+'@echo off'
+parse arg mode envarg '::' antarg
+
+if mode\='.' & mode\='..' & mode\='/' then do
+ envarg = mode envarg
+ mode = ''
+end
+
+if antarg = '' then do
+ antarg = envarg
+ envarg = ''
+end
+
+x = setlocal()
+
+env="OS2ENVIRONMENT"
+antenv = _getenv_('antenv')
+if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
+
+if mode = '' then mode = _getenv_('ANT_MODE' '..')
+if mode \= '/' then do
+ runrc = _getenv_('runrc')
+ antrc = _getenv_('antrc' 'antrc.cmd')
+ if mode = '..' then mode = '-r'
+ else mode = ''
+ interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
+end
+
+if _testenv_() = 0 then do
+ say 'Ant environment is not set properly'
+ x = endlocal()
+ exit 16
+end
+
+settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
+
+java = _getenv_('javacmd' 'java')
+opts = value('ANT_OPTS',,env)
+args = value('ANT_ARGS',,env)
+lcp = value('LOCALCLASSPATH',,env)
+cp = value('CLASSPATH',,env)
+if value('ANT_USE_CP',,env) \= '' then do
+ if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
+ lcp = lcp || cp
+ 'SET CLASSPATH='
+end
+if lcp\='' then lcp = '-classpath' lcp
+
+cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
+launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
+if launcher = '' then entry = 'org.apache.tools.ant.Main'
+else entry = 'org.apache.tools.ant.launch.Launcher'
+java opts lcp entry settings args antarg
+
+x = endlocal()
+
+return rc
+
+_testenv_: procedure expose env ANT_HOME JAVA_HOME
+ANT_HOME = value('ANT_HOME',,env)
+if ANT_HOME = '' then return 0
+JAVA_HOME = value('JAVA_HOME',,env)
+if JAVA_HOME = '' then return 0
+cp = translate(value('CLASSPATH',,env))
+if pos(translate(ANT_HOME), cp) = 0 then return 0
+if pos(translate(JAVA_HOME), cp) = 0 then return 0
+return 1
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
diff --git a/rapla-source-1.8.2/bin/antRun b/rapla/bin/antRun
similarity index 100%
rename from rapla-source-1.8.2/bin/antRun
rename to rapla/bin/antRun
diff --git a/rapla-source-1.8.2/bin/antRun.bat b/rapla/bin/antRun.bat
similarity index 96%
rename from rapla-source-1.8.2/bin/antRun.bat
rename to rapla/bin/antRun.bat
index 204d9e3..cff480c 100644
--- a/rapla-source-1.8.2/bin/antRun.bat
+++ b/rapla/bin/antRun.bat
@@ -1,45 +1,45 @@
-@echo off
-
-REM
-REM Copyright 2001-2002,2004 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM
-REM
-
-if "%OS%"=="Windows_NT" @setlocal
-
-if ""%1""=="""" goto runCommand
-
-rem Change drive and directory to %1
-if "%OS%"=="Windows_NT" cd /d ""%1""
-if not "%OS%"=="Windows_NT" cd ""%1""
-shift
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of agruments (up to the command line limit, anyway).
-set ANT_RUN_CMD=%1
-if ""%1""=="""" goto runCommand
-shift
-:loop
-if ""%1""=="""" goto runCommand
-set ANT_RUN_CMD=%ANT_RUN_CMD% %1
-shift
-goto loop
-
-:runCommand
-rem echo %ANT_RUN_CMD%
-%ANT_RUN_CMD%
-
-if "%OS%"=="Windows_NT" @endlocal
-
+@echo off
+
+REM
+REM Copyright 2001-2002,2004 The Apache Software Foundation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM
+REM
+
+if "%OS%"=="Windows_NT" @setlocal
+
+if ""%1""=="""" goto runCommand
+
+rem Change drive and directory to %1
+if "%OS%"=="Windows_NT" cd /d ""%1""
+if not "%OS%"=="Windows_NT" cd ""%1""
+shift
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of agruments (up to the command line limit, anyway).
+set ANT_RUN_CMD=%1
+if ""%1""=="""" goto runCommand
+shift
+:loop
+if ""%1""=="""" goto runCommand
+set ANT_RUN_CMD=%ANT_RUN_CMD% %1
+shift
+goto loop
+
+:runCommand
+rem echo %ANT_RUN_CMD%
+%ANT_RUN_CMD%
+
+if "%OS%"=="Windows_NT" @endlocal
+
diff --git a/rapla-source-1.8.2/bin/antenv.cmd b/rapla/bin/antenv.cmd
similarity index 96%
rename from rapla-source-1.8.2/bin/antenv.cmd
rename to rapla/bin/antenv.cmd
index 05efa85..b9b0db4 100644
--- a/rapla-source-1.8.2/bin/antenv.cmd
+++ b/rapla/bin/antenv.cmd
@@ -1,99 +1,99 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- Ant environment
-*/
-
-'@echo off'
-call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
-call SysLoadFuncs
-
-/* Prepare the parameters for later use */
-parse arg argv
-mode = ''
-args = ''
-opts = ''
-cp = ''
-lcp = ''
-
-do i = 1 to words(argv)
- param = word(argv, i)
- select
- when param='-lcp' then mode = 'l'
- when param='-cp' | param='-classpath' then mode = 'c'
- when abbrev('-opts', param, 4) then mode = 'o'
- when abbrev('-args', param, 4) then mode = 'a'
- otherwise
- select
- when mode = 'a' then args = space(args param, 1)
- when mode = 'c' then cp = space(cp param, 1)
- when mode = 'l' then lcp = space(lcp param, 1)
- when mode = 'o' then opts = space(opts param, 1)
- otherwise
- say 'Option' param 'ignored'
- end
- end
-end
-
-env="OS2ENVIRONMENT"
-antconf = _getenv_('antconf' 'antconf.cmd')
-runrc = _getenv_('runrc')
-interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
-ANT_HOME = value('ANT_HOME',,env)
-JAVA_HOME = value('JAVA_HOME',,env)
-classpath = value('CLASSPATH',,env)
-classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
-if classes \= '' then classpath = prepend(classpath classes)
-classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
-if classes \= '' then classpath = prepend(classpath classes)
-
-classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
-'SET CLASSPATH=' || classpath
-
-/* Setting classpathes, options and arguments */
-envset = _getenv_('envset')
-if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
-if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
-if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
-if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
-
-exit 0
-
-addpath: procedure
-parse arg path elem
-if elem = '' then do
- if path\='' & right(path, 1)\=';' then path = path || ';'
- return path
-end
-if substr(path, length(path)) = ';' then glue = ''
-else glue = ';'
-if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
-return path
-
-prepend: procedure
-parse arg path elem
-if elem = '' then do
- if path\='' & right(path, 1)\=';' then path = path || ';'
- return path
-end
-if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
-return path
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
+/*
+ Copyright 2003-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Ant environment
+*/
+
+'@echo off'
+call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
+call SysLoadFuncs
+
+/* Prepare the parameters for later use */
+parse arg argv
+mode = ''
+args = ''
+opts = ''
+cp = ''
+lcp = ''
+
+do i = 1 to words(argv)
+ param = word(argv, i)
+ select
+ when param='-lcp' then mode = 'l'
+ when param='-cp' | param='-classpath' then mode = 'c'
+ when abbrev('-opts', param, 4) then mode = 'o'
+ when abbrev('-args', param, 4) then mode = 'a'
+ otherwise
+ select
+ when mode = 'a' then args = space(args param, 1)
+ when mode = 'c' then cp = space(cp param, 1)
+ when mode = 'l' then lcp = space(lcp param, 1)
+ when mode = 'o' then opts = space(opts param, 1)
+ otherwise
+ say 'Option' param 'ignored'
+ end
+ end
+end
+
+env="OS2ENVIRONMENT"
+antconf = _getenv_('antconf' 'antconf.cmd')
+runrc = _getenv_('runrc')
+interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
+ANT_HOME = value('ANT_HOME',,env)
+JAVA_HOME = value('JAVA_HOME',,env)
+classpath = value('CLASSPATH',,env)
+classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+
+classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
+'SET CLASSPATH=' || classpath
+
+/* Setting classpathes, options and arguments */
+envset = _getenv_('envset')
+if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
+if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
+if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
+if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
+
+exit 0
+
+addpath: procedure
+parse arg path elem
+if elem = '' then do
+ if path\='' & right(path, 1)\=';' then path = path || ';'
+ return path
+end
+if substr(path, length(path)) = ';' then glue = ''
+else glue = ';'
+if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
+return path
+
+prepend: procedure
+parse arg path elem
+if elem = '' then do
+ if path\='' & right(path, 1)\=';' then path = path || ';'
+ return path
+end
+if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
+return path
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
diff --git a/rapla-source-1.8.2/bin/envset.cmd b/rapla/bin/envset.cmd
similarity index 96%
rename from rapla-source-1.8.2/bin/envset.cmd
rename to rapla/bin/envset.cmd
index 8fbd4dd..cb91d87 100644
--- a/rapla-source-1.8.2/bin/envset.cmd
+++ b/rapla/bin/envset.cmd
@@ -1,130 +1,130 @@
-/*
-
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-SET environment variables
-First optional parameter:
- ; parameters are considered parts of a path variable, semicolons are
- appended to each element if not already present
- -D parameters are properties for Java or Makefile etc., -D will be
- prepended and the parameters will be separated by a space
- =D the same as above but equal sign is not required
- , parameters should be comma separated in the environment variable
- - parameters should be separated by the next parameter
- Other values mean that the first parameter is missing and the environment
- variable will be set to the space separated parameters
-
-Second parameter: name of the environment variable
-
-Next parameters: values
-; implies that the equal sign is considered a part of the parameter and is
-not interpreted
-
--D requires parameters in the form name=value. If the equal sign is not found,
-the parameters are changed to name=expanded_name
-
-Other options have optional equal sign. If it is found, only the part after
-the equal sign will be oprionally expanded.
-
-If the parameter is the minus sign, the next parameter will not be expanded.
-If the parameter is a single dot, it will be replaced with the value of the
-environment variable as it existed before envset was invoked.
-
-For other parameters the batch looks for the environment variable with the
-same name (in uppercase). If it is found, it forms the expanded_name. If
-the environment variable with such a name does not exist, the expanded_name
-will hold the parameter name without case conversion.
-*/
-
-parse arg mode envar args
-
-equal = 0
-sep = ' '
-
-/* Parse command line parameters */
-select
- when mode='-' then do
- sep = envar
- parse var args envar args
- end
- when mode=';' then do
- sep = ''
- equal = -1
- end
- when mode='-D' then equal = 1
- when mode='=D' then mode = '-D'
- when mode=',' then sep = ','
-otherwise
- args = envar args
- envar = mode
- mode = ''
-end
-
-env = 'OS2ENVIRONMENT'
-envar = translate(envar)
-orig = value(envar,,env)
-newval = ''
-expand = 1
-
-/* for each parameter... */
-do i = 1 to words(args)
- if expand > 0 & word(args, i) = '-' then expand = 0
- else call addval word(args, i)
-end
-
-/* Optionally enclose path variable by quotes */
-if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
-
-/* Set the new value, 'SET' cannot be used since it does not allow '=' */
-x = value(envar, newval, env)
-exit 0
-
-addval: procedure expose sep equal orig expand newval mode env
-parse arg var
-
-if var = '.' then expvar = orig
-else do
- if equal >= 0 then do
- parse var var name '=' val
- if val = '' then var = name
- else var = val
- end
- if expand = 0 then expvar = var
- else expvar = value(translate(var),,env)
- if expvar = '' then expvar = var
- if equal >= 0 then do
- if val = '' then do
- parse var expvar key '=' val
- if val <> '' then name = key
- else do
- if equal > 0 then val = key
- else name = key
- end
- end
- else val = expvar
- if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
- if val = '' then expvar = name
- else expvar = name || '=' || val
- end
- if mode = '-D' then expvar = '-D' || expvar
- if mode = ';' then do
- if right(expvar, 1) <> ';' then expvar = expvar || ';'
- end
-end
-
-if newval = '' then newval = expvar
-else newval = newval || sep || expvar
-expand = 1
-return
+/*
+
+ Copyright 2003-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+SET environment variables
+First optional parameter:
+ ; parameters are considered parts of a path variable, semicolons are
+ appended to each element if not already present
+ -D parameters are properties for Java or Makefile etc., -D will be
+ prepended and the parameters will be separated by a space
+ =D the same as above but equal sign is not required
+ , parameters should be comma separated in the environment variable
+ - parameters should be separated by the next parameter
+ Other values mean that the first parameter is missing and the environment
+ variable will be set to the space separated parameters
+
+Second parameter: name of the environment variable
+
+Next parameters: values
+; implies that the equal sign is considered a part of the parameter and is
+not interpreted
+
+-D requires parameters in the form name=value. If the equal sign is not found,
+the parameters are changed to name=expanded_name
+
+Other options have optional equal sign. If it is found, only the part after
+the equal sign will be oprionally expanded.
+
+If the parameter is the minus sign, the next parameter will not be expanded.
+If the parameter is a single dot, it will be replaced with the value of the
+environment variable as it existed before envset was invoked.
+
+For other parameters the batch looks for the environment variable with the
+same name (in uppercase). If it is found, it forms the expanded_name. If
+the environment variable with such a name does not exist, the expanded_name
+will hold the parameter name without case conversion.
+*/
+
+parse arg mode envar args
+
+equal = 0
+sep = ' '
+
+/* Parse command line parameters */
+select
+ when mode='-' then do
+ sep = envar
+ parse var args envar args
+ end
+ when mode=';' then do
+ sep = ''
+ equal = -1
+ end
+ when mode='-D' then equal = 1
+ when mode='=D' then mode = '-D'
+ when mode=',' then sep = ','
+otherwise
+ args = envar args
+ envar = mode
+ mode = ''
+end
+
+env = 'OS2ENVIRONMENT'
+envar = translate(envar)
+orig = value(envar,,env)
+newval = ''
+expand = 1
+
+/* for each parameter... */
+do i = 1 to words(args)
+ if expand > 0 & word(args, i) = '-' then expand = 0
+ else call addval word(args, i)
+end
+
+/* Optionally enclose path variable by quotes */
+if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
+
+/* Set the new value, 'SET' cannot be used since it does not allow '=' */
+x = value(envar, newval, env)
+exit 0
+
+addval: procedure expose sep equal orig expand newval mode env
+parse arg var
+
+if var = '.' then expvar = orig
+else do
+ if equal >= 0 then do
+ parse var var name '=' val
+ if val = '' then var = name
+ else var = val
+ end
+ if expand = 0 then expvar = var
+ else expvar = value(translate(var),,env)
+ if expvar = '' then expvar = var
+ if equal >= 0 then do
+ if val = '' then do
+ parse var expvar key '=' val
+ if val <> '' then name = key
+ else do
+ if equal > 0 then val = key
+ else name = key
+ end
+ end
+ else val = expvar
+ if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
+ if val = '' then expvar = name
+ else expvar = name || '=' || val
+ end
+ if mode = '-D' then expvar = '-D' || expvar
+ if mode = ';' then do
+ if right(expvar, 1) <> ';' then expvar = expvar || ';'
+ end
+end
+
+if newval = '' then newval = expvar
+else newval = newval || sep || expvar
+expand = 1
+return
diff --git a/rapla-source-1.8.2/bin/lcp.bat b/rapla/bin/lcp.bat
similarity index 96%
rename from rapla-source-1.8.2/bin/lcp.bat
rename to rapla/bin/lcp.bat
index 6a1f679..eed6a82 100644
--- a/rapla-source-1.8.2/bin/lcp.bat
+++ b/rapla/bin/lcp.bat
@@ -1,30 +1,30 @@
-REM
-REM Copyright 2001-2004 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM
-REM
-
-set _CLASSPATHCOMPONENT=%1
-if ""%1""=="""" goto gotAllArgs
-shift
-
-:argCheck
-if ""%1""=="""" goto gotAllArgs
-set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
-shift
-goto argCheck
-
-:gotAllArgs
-set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
-
+REM
+REM Copyright 2001-2004 The Apache Software Foundation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM
+REM
+
+set _CLASSPATHCOMPONENT=%1
+if ""%1""=="""" goto gotAllArgs
+shift
+
+:argCheck
+if ""%1""=="""" goto gotAllArgs
+set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
+shift
+goto argCheck
+
+:gotAllArgs
+set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
+
diff --git a/rapla-source-1.8.2/bin/runrc.cmd b/rapla/bin/runrc.cmd
similarity index 96%
rename from rapla-source-1.8.2/bin/runrc.cmd
rename to rapla/bin/runrc.cmd
index acdf724..0337a80 100644
--- a/rapla-source-1.8.2/bin/runrc.cmd
+++ b/rapla/bin/runrc.cmd
@@ -1,59 +1,59 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- Run RC file, name is in the first arg, second arg is either PATH
- ENV or -r or nothing
-*/
-
-parse arg name path rest
-
-if name = '' then do
- say 'RC file name is missing'
- exit 1
-end
-
-if rest \= '' then do
- say 'Too many parameters'
- exit 1
-end
-
-call runit name path
-exit 0
-
-runit: procedure
-parse arg name path dir
-
-if path \= '' & path \= '-r' then do
- dir = value(translate(path),,'OS2ENVIRONMENT')
- if dir = '' then return
- dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
-end
-
-if dir = '' then dir = directory()
-
-if path = '-r' then do /* recursive call */
- subdir = filespec('path', dir)
- if subdir \= '\' then do
- subdir = left(subdir, length(subdir)-1)
- call runit name path filespec('drive', dir) || subdir
- end
-end
-
-/* Look for the file and run it */
-if right(dir, 1) \= '\' then dir = dir || '\'
-rcfile = stream(dir || name, 'c', 'query exists')
-if rcfile \= '' then interpret 'call "' || rcfile || '"'
-
-return
+/*
+ Copyright 2003-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Run RC file, name is in the first arg, second arg is either PATH
+ ENV or -r or nothing
+*/
+
+parse arg name path rest
+
+if name = '' then do
+ say 'RC file name is missing'
+ exit 1
+end
+
+if rest \= '' then do
+ say 'Too many parameters'
+ exit 1
+end
+
+call runit name path
+exit 0
+
+runit: procedure
+parse arg name path dir
+
+if path \= '' & path \= '-r' then do
+ dir = value(translate(path),,'OS2ENVIRONMENT')
+ if dir = '' then return
+ dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
+end
+
+if dir = '' then dir = directory()
+
+if path = '-r' then do /* recursive call */
+ subdir = filespec('path', dir)
+ if subdir \= '\' then do
+ subdir = left(subdir, length(subdir)-1)
+ call runit name path filespec('drive', dir) || subdir
+ end
+end
+
+/* Look for the file and run it */
+if right(dir, 1) \= '\' then dir = dir || '\'
+rcfile = stream(dir || name, 'c', 'query exists')
+if rcfile \= '' then interpret 'call "' || rcfile || '"'
+
+return
diff --git a/rapla-source-1.8.2/build.bat b/rapla/build.bat
similarity index 96%
rename from rapla-source-1.8.2/build.bat
rename to rapla/build.bat
index 4174471..4f66801 100644
--- a/rapla-source-1.8.2/build.bat
+++ b/rapla/build.bat
@@ -1,13 +1,13 @@
-@echo off
-:: -------------------------------------------------------------------------
-:: build.bat Skript for Rapla
-::
-::
-:: Usage:
-:: for a list of all available build-targets type
-:: .\build.bat -projecthelp
-if not "%ANT_HOME%" =="" goto gotAntHome
-set ANT_HOME=.
-:gotAntHome
-call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6
-pause
+@echo off
+:: -------------------------------------------------------------------------
+:: build.bat Skript for Rapla
+::
+::
+:: Usage:
+:: for a list of all available build-targets type
+:: .\build.bat -projecthelp
+if not "%ANT_HOME%" =="" goto gotAntHome
+set ANT_HOME=.
+:gotAntHome
+call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6
+pause
diff --git a/rapla-source-1.8.2/build.properties.template b/rapla/build.properties.template
similarity index 96%
rename from rapla-source-1.8.2/build.properties.template
rename to rapla/build.properties.template
index 6d157b9..6c68261 100644
--- a/rapla-source-1.8.2/build.properties.template
+++ b/rapla/build.properties.template
@@ -1,22 +1,22 @@
-# You can modify this settings to configure the build
-
-#Set the target that will be run by default
-target=dist-bin
-
-#use this to perform a clean before each build
-#clean.everytime
-
-#The base folder where all plugin source projects are located
-plugin.base=${main.dir}/..
-#You can choose plugin directories to include in the build
-#plugin.includes=rapla.demo-p,rapla.periodwizard-p
-#plugin.includes=rapla.nothing-p
-plugin.includes=rapla.*
-
-#Class for testing rapla when using the "test" target
-#test.class=org.rapla.entities.PreferencesTest
-
-#Path and password to the keystore used for signing
-keystore.file=raplaselfsigned.ks
-keystore.password=raplaselfsigned
-#keystore.keypass=
+# You can modify this settings to configure the build
+
+#Set the target that will be run by default
+target=dist-bin
+
+#use this to perform a clean before each build
+#clean.everytime
+
+#The base folder where all plugin source projects are located
+plugin.base=${main.dir}/..
+#You can choose plugin directories to include in the build
+#plugin.includes=rapla.demo-p,rapla.periodwizard-p
+#plugin.includes=rapla.nothing-p
+plugin.includes=rapla.*
+
+#Class for testing rapla when using the "test" target
+#test.class=org.rapla.entities.PreferencesTest
+
+#Path and password to the keystore used for signing
+keystore.file=raplaselfsigned.ks
+keystore.password=raplaselfsigned
+#keystore.keypass=
diff --git a/rapla-source-1.8.2/build.sh b/rapla/build.sh
similarity index 100%
rename from rapla-source-1.8.2/build.sh
rename to rapla/build.sh
diff --git a/rapla-source-1.8.2/build.xml b/rapla/build.xml
similarity index 97%
rename from rapla-source-1.8.2/build.xml
rename to rapla/build.xml
index 1109f0d..0a69088 100644
--- a/rapla-source-1.8.2/build.xml
+++ b/rapla/build.xml
@@ -1,1066 +1,1066 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${prop.dist.contents}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${prop.dist.contents}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rapla-source-1.8.2/buildplugin.xml b/rapla/buildplugin.xml
similarity index 97%
rename from rapla-source-1.8.2/buildplugin.xml
rename to rapla/buildplugin.xml
index 3e3e314..22a3832 100644
--- a/rapla-source-1.8.2/buildplugin.xml
+++ b/rapla/buildplugin.xml
@@ -1,250 +1,250 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rapla-source-1.8.2/contexts/rapla-develop.xml b/rapla/contexts/rapla-develop.xml
similarity index 97%
rename from rapla-source-1.8.2/contexts/rapla-develop.xml
rename to rapla/contexts/rapla-develop.xml
index d589286..d7f624a 100644
--- a/rapla-source-1.8.2/contexts/rapla-develop.xml
+++ b/rapla/contexts/rapla-develop.xml
@@ -1,105 +1,105 @@
-
-
-
-
-
-
-
-
-
-
- /war
-
-
-
-
- /
-
-
- raplafile
- /data/data.xml
- true
-
-
-
- rapla_development
- true
- true
-
-
-
- jdbc/rapladb
-
-
-
-
- jdbc:hsqldb:/data/rapla-hsqldb
- db_user
- your_pwd
-
-
-
-
-
-
-
-
-
-
-
- rapladatasource
-
- raplafile
- true
-
-
-
-
-
- /etc/webdefault.xml
- 10000000
- true
- true
- true
-
-
-
- org.eclipse.jetty.webapp.WebInfConfiguration
- org.eclipse.jetty.webapp.WebXmlConfiguration
- org.eclipse.jetty.webapp.MetaInfConfiguration
- org.eclipse.jetty.webapp.FragmentConfiguration
- org.eclipse.jetty.plus.webapp.EnvConfiguration
- org.eclipse.jetty.webapp.JettyWebXmlConfiguration
- org.eclipse.jetty.webapp.TagLibConfiguration
- org.eclipse.jetty.plus.webapp.PlusConfiguration
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ /war
+
+
+
+
+ /
+
+
+ raplafile
+ /data/data.xml
+ true
+
+
+
+ rapla_development
+ true
+ true
+
+
+
+ jdbc/rapladb
+
+
+
+
+ jdbc:hsqldb:/data/rapla-hsqldb
+ db_user
+ your_pwd
+
+
+
+
+
+
+
+
+
+
+
+ rapladatasource
+
+ raplafile
+ true
+
+
+
+
+
+ /etc/webdefault.xml
+ 10000000
+ true
+ true
+ true
+
+
+
+ org.eclipse.jetty.webapp.WebInfConfiguration
+ org.eclipse.jetty.webapp.WebXmlConfiguration
+ org.eclipse.jetty.webapp.MetaInfConfiguration
+ org.eclipse.jetty.webapp.FragmentConfiguration
+ org.eclipse.jetty.plus.webapp.EnvConfiguration
+ org.eclipse.jetty.webapp.JettyWebXmlConfiguration
+ org.eclipse.jetty.webapp.TagLibConfiguration
+ org.eclipse.jetty.plus.webapp.PlusConfiguration
+
+
+
+
diff --git a/rapla-source-1.8.2/contexts/rapla.xml_ b/rapla/contexts/rapla.xml_
similarity index 97%
rename from rapla-source-1.8.2/contexts/rapla.xml_
rename to rapla/contexts/rapla.xml_
index a5ac1a4..fcd96ae 100644
--- a/rapla-source-1.8.2/contexts/rapla.xml_
+++ b/rapla/contexts/rapla.xml_
@@ -1,84 +1,84 @@
-
-
-
-
- /webapps/rapla.war
- /
-
-
-
-
- raplafile
- /data/data.xml
- true
-
-
-
-
- jdbc/rapladb
-
-
-
-
- jdbc:hsqldb:/data/rapla-hsqldb
- db_user
- your_pwd
-
-
-
-
-
-
-
-
-
-
-
-
- rapladatasource
-
- raplafile
- true
-
-
-
-
-
-
- /etc/webdefault.xml
-
- 10000000
- true
- true
- true
- false
-
-
-
- org.eclipse.jetty.webapp.WebInfConfiguration
- org.eclipse.jetty.webapp.WebXmlConfiguration
- org.eclipse.jetty.webapp.MetaInfConfiguration
- org.eclipse.jetty.webapp.FragmentConfiguration
- org.eclipse.jetty.plus.webapp.EnvConfiguration
- org.eclipse.jetty.webapp.JettyWebXmlConfiguration
- org.eclipse.jetty.webapp.TagLibConfiguration
- org.eclipse.jetty.plus.webapp.PlusConfiguration
-
-
-
-
+
+
+
+
+ /webapps/rapla.war
+ /
+
+
+
+
+ raplafile
+ /data/data.xml
+ true
+
+
+
+
+ jdbc/rapladb
+
+
+
+
+ jdbc:hsqldb:/data/rapla-hsqldb
+ db_user
+ your_pwd
+
+
+
+
+
+
+
+
+
+
+
+
+ rapladatasource
+
+ raplafile
+ true
+
+
+
+
+
+
+ /etc/webdefault.xml
+
+ 10000000
+ true
+ true
+ true
+ false
+
+
+
+ org.eclipse.jetty.webapp.WebInfConfiguration
+ org.eclipse.jetty.webapp.WebXmlConfiguration
+ org.eclipse.jetty.webapp.MetaInfConfiguration
+ org.eclipse.jetty.webapp.FragmentConfiguration
+ org.eclipse.jetty.plus.webapp.EnvConfiguration
+ org.eclipse.jetty.webapp.JettyWebXmlConfiguration
+ org.eclipse.jetty.webapp.TagLibConfiguration
+ org.eclipse.jetty.plus.webapp.PlusConfiguration
+
+
+
+
diff --git a/rapla-source-1.8.2/data/data.xml b/rapla/data/data.xml
similarity index 100%
rename from rapla-source-1.8.2/data/data.xml
rename to rapla/data/data.xml
diff --git a/rapla-source-1.8.2/doc.properties b/rapla/doc.properties
similarity index 97%
rename from rapla-source-1.8.2/doc.properties
rename to rapla/doc.properties
index 2da538f..444af87 100644
--- a/rapla-source-1.8.2/doc.properties
+++ b/rapla/doc.properties
@@ -1,8 +1,8 @@
-doc.name=rapla
-doc.version=1.8.2
-doc.date=${TODAY}
-doc.year=2000-2015
-doc.copyright=Rapla Team
-doc.developer-list-link=http://lists.sourceforge.net/lists/listinfo/rapla-developers
-doc.developer-list=rapla-developers@lists.sourceforge.net
-doc.homepage=http://code.google.com/p/rapla
+doc.name=rapla
+doc.version=1.8.2
+doc.date=${TODAY}
+doc.year=2000-2015
+doc.copyright=Rapla Team
+doc.developer-list-link=http://lists.sourceforge.net/lists/listinfo/rapla-developers
+doc.developer-list=rapla-developers@lists.sourceforge.net
+doc.homepage=http://code.google.com/p/rapla
diff --git a/rapla-source-1.8.2/etc/jetty.xml b/rapla/etc/jetty.xml
similarity index 97%
rename from rapla-source-1.8.2/etc/jetty.xml
rename to rapla/etc/jetty.xml
index d7bceb1..237c3b4 100644
--- a/rapla-source-1.8.2/etc/jetty.xml
+++ b/rapla/etc/jetty.xml
@@ -1,120 +1,120 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2
- 50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 30000
- 2
- 8443
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /resources/logback-access.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
- /contexts
- 1
-
-
-
-
-
-
-
-
-
-
- true
-
- true
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ 50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 30000
+ 2
+ 8443
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /resources/logback-access.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /contexts
+ 1
+
+
+
+
+
+
+
+
+
+
+ true
+
+ true
+
+
diff --git a/rapla-source-1.8.2/etc/webdefault.xml b/rapla/etc/webdefault.xml
similarity index 98%
rename from rapla-source-1.8.2/etc/webdefault.xml
rename to rapla/etc/webdefault.xml
index 4120faf..2144940 100644
--- a/rapla-source-1.8.2/etc/webdefault.xml
+++ b/rapla/etc/webdefault.xml
@@ -1,203 +1,203 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Default web.xml file.
- This file is applied to a Web application before it's own WEB_INF/web.xml file
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- default
- org.eclipse.jetty.servlet.DefaultServlet
-
- acceptRanges
- true
-
-
- dirAllowed
- true
-
-
- redirectWelcome
- false
-
-
- maxCacheSize
- 2000000
-
-
- maxCachedFileSize
- 254000
-
-
- maxCachedFiles
- 1000
-
-
- gzip
- false
-
-
- useFileMappedBuffer
- false
-
- 0
-
-
- default/
-
-
-
-
-
-
-
- 30
-
-
-
-
-
-
-
-
-
-
-
-
- index.html
- index.htm
- index.jsp
-
-
-
-
- arISO-8859-6
- beISO-8859-5
- bgISO-8859-5
- caISO-8859-1
- csISO-8859-2
- daISO-8859-1
- deISO-8859-1
- elISO-8859-7
- enISO-8859-1
- esISO-8859-1
- etISO-8859-1
- fiISO-8859-1
- frISO-8859-1
- hrISO-8859-2
- huISO-8859-2
- isISO-8859-1
- itISO-8859-1
- iwISO-8859-8
- jaShift_JIS
- koEUC-KR
- ltISO-8859-2
- lvISO-8859-2
- mkISO-8859-5
- nlISO-8859-1
- noISO-8859-1
- plISO-8859-2
- ptISO-8859-1
- roISO-8859-2
- ruISO-8859-5
- shISO-8859-5
- skISO-8859-2
- slISO-8859-2
- sqISO-8859-2
- srISO-8859-5
- svISO-8859-1
- trISO-8859-9
- ukISO-8859-5
- zhGB2312
- zh_TWBig5
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Default web.xml file.
+ This file is applied to a Web application before it's own WEB_INF/web.xml file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ default
+ org.eclipse.jetty.servlet.DefaultServlet
+
+ acceptRanges
+ true
+
+
+ dirAllowed
+ true
+
+
+ redirectWelcome
+ false
+
+
+ maxCacheSize
+ 2000000
+
+
+ maxCachedFileSize
+ 254000
+
+
+ maxCachedFiles
+ 1000
+
+
+ gzip
+ false
+
+
+ useFileMappedBuffer
+ false
+
+ 0
+
+
+ default/
+
+
+
+
+
+
+
+ 30
+
+
+
+
+
+
+
+
+
+
+
+
+ index.html
+ index.htm
+ index.jsp
+
+
+
+
+ arISO-8859-6
+ beISO-8859-5
+ bgISO-8859-5
+ caISO-8859-1
+ csISO-8859-2
+ daISO-8859-1
+ deISO-8859-1
+ elISO-8859-7
+ enISO-8859-1
+ esISO-8859-1
+ etISO-8859-1
+ fiISO-8859-1
+ frISO-8859-1
+ hrISO-8859-2
+ huISO-8859-2
+ isISO-8859-1
+ itISO-8859-1
+ iwISO-8859-8
+ jaShift_JIS
+ koEUC-KR
+ ltISO-8859-2
+ lvISO-8859-2
+ mkISO-8859-5
+ nlISO-8859-1
+ noISO-8859-1
+ plISO-8859-2
+ ptISO-8859-1
+ roISO-8859-2
+ ruISO-8859-5
+ shISO-8859-5
+ skISO-8859-2
+ slISO-8859-2
+ sqISO-8859-2
+ srISO-8859-5
+ svISO-8859-1
+ trISO-8859-9
+ ukISO-8859-5
+ zhGB2312
+ zh_TWBig5
+
+
+
+
+
+
diff --git a/rapla-source-1.8.2/legal/license.txt b/rapla/legal/license.txt
similarity index 98%
rename from rapla-source-1.8.2/legal/license.txt
rename to rapla/legal/license.txt
index e629796..3b6face 100644
--- a/rapla-source-1.8.2/legal/license.txt
+++ b/rapla/legal/license.txt
@@ -1,676 +1,676 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
-
-
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
+
+
diff --git a/rapla-source-1.8.2/legal/license_GPL2_with_classpath_exception.txt b/rapla/legal/license_GPL2_with_classpath_exception.txt
similarity index 98%
rename from rapla-source-1.8.2/legal/license_GPL2_with_classpath_exception.txt
rename to rapla/legal/license_GPL2_with_classpath_exception.txt
index 79c6b4e..1ad2a2a 100644
--- a/rapla-source-1.8.2/legal/license_GPL2_with_classpath_exception.txt
+++ b/rapla/legal/license_GPL2_with_classpath_exception.txt
@@ -1,363 +1,363 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C) 19yy
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-
-"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
-Certain source files distributed by Oracle are subject to the following clarification
-and special exception to the GPL Version 2, but only where Oracle has expressly included
-in the particular source file's header the words "Oracle designates this particular
-file as subject to the "Classpath" exception as provided by Oracle in the License
-file that accompanied this code."
-
-Linking this library statically or dynamically with other modules is making a combined
-work based on this library. Thus, the terms and conditions of the
-GNU General Public License Version 2 cover the whole combination.
-
-As a special exception, the copyright holders of this library give you permission
-to link this library with independent modules to produce an executable, regardless
-of the license terms of these independent modules, and to copy and distribute the
-resulting executable under terms of your choice, provided that you also meet,
-for each linked independent module, the terms and conditions of the license of that module.
-An independent module is a module which is not derived from or based on this library.
-If you modify this library, you may extend this exception to your version of the library,
-but you are not obligated to do so. If you do not wish to do so,
-delete this exception statement from your version.
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C) 19yy
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ , 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Oracle are subject to the following clarification
+and special exception to the GPL Version 2, but only where Oracle has expressly included
+in the particular source file's header the words "Oracle designates this particular
+file as subject to the "Classpath" exception as provided by Oracle in the License
+file that accompanied this code."
+
+Linking this library statically or dynamically with other modules is making a combined
+work based on this library. Thus, the terms and conditions of the
+GNU General Public License Version 2 cover the whole combination.
+
+As a special exception, the copyright holders of this library give you permission
+to link this library with independent modules to produce an executable, regardless
+of the license terms of these independent modules, and to copy and distribute the
+resulting executable under terms of your choice, provided that you also meet,
+for each linked independent module, the terms and conditions of the license of that module.
+An independent module is a module which is not derived from or based on this library.
+If you modify this library, you may extend this exception to your version of the library,
+but you are not obligated to do so. If you do not wish to do so,
+delete this exception statement from your version.
diff --git a/rapla-source-1.8.2/legal/license_LGPL.txt b/rapla/legal/license_LGPL.txt
similarity index 98%
rename from rapla-source-1.8.2/legal/license_LGPL.txt
rename to rapla/legal/license_LGPL.txt
index 89315f4..6a61e91 100644
--- a/rapla-source-1.8.2/legal/license_LGPL.txt
+++ b/rapla/legal/license_LGPL.txt
@@ -1,437 +1,437 @@
- GNU LIBRARY GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL. It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it. You can use it for
-your libraries, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
- Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library. If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-.
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software. To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
- Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs. This
-license, the GNU Library General Public License, applies to certain
-designated libraries. This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
- The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it. Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program. However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
- Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries. We
-concluded that weaker conditions might promote sharing better.
-
- However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves. This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them. (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.) The hope is that this
-will lead to faster development of free libraries.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, while the latter only
-works together with the library.
-
- Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-.
- GNU LIBRARY GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License"). Each licensee is
-addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-.
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-.
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-.
- 6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- c) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- d) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-.
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-.
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-.
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+.
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+.
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+.
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+.
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+.
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+.
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+.
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+.
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
diff --git a/rapla-source-1.8.2/legal/license_apache.txt b/rapla/legal/license_apache.txt
similarity index 98%
rename from rapla-source-1.8.2/legal/license_apache.txt
rename to rapla/legal/license_apache.txt
index d6b7856..2fab141 100644
--- a/rapla-source-1.8.2/legal/license_apache.txt
+++ b/rapla/legal/license_apache.txt
@@ -1,219 +1,219 @@
-Some files use code from different Apache projects.
-The source code of these files contains the appropriate copyright notices
-as described in the Appendix of http://www.apache.org/licenses/LICENSE-2.0
-This is a copy of the text that can be found at that specific URL:
-
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- * You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
- * You must cause any modified files to carry prominent notices
- stating that You changed the files; and
- * You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
- * If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Some files use code from different Apache projects.
+The source code of these files contains the appropriate copyright notices
+as described in the Appendix of http://www.apache.org/licenses/LICENSE-2.0
+This is a copy of the text that can be found at that specific URL:
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ * You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+ * You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+ * You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+ * If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/rapla-source-1.8.2/legal/license_iCal4j.txt b/rapla/legal/license_iCal4j.txt
similarity index 97%
rename from rapla-source-1.8.2/legal/license_iCal4j.txt
rename to rapla/legal/license_iCal4j.txt
index 527aecf..8beb847 100644
--- a/rapla-source-1.8.2/legal/license_iCal4j.txt
+++ b/rapla/legal/license_iCal4j.txt
@@ -1,33 +1,33 @@
-==================
- iCal4j - License
-==================
-
-Copyright (c) 2012, Ben Fortuna
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- o Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
- o Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
- o Neither the name of Ben Fortuna nor the names of any other contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+==================
+ iCal4j - License
+==================
+
+Copyright (c) 2012, Ben Fortuna
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ o Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+ o Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+ o Neither the name of Ben Fortuna nor the names of any other contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/rapla-source-1.8.2/legal/readme.txt b/rapla/legal/readme.txt
similarity index 98%
rename from rapla-source-1.8.2/legal/readme.txt
rename to rapla/legal/readme.txt
index a9668f6..8111e3a 100644
--- a/rapla-source-1.8.2/legal/readme.txt
+++ b/rapla/legal/readme.txt
@@ -1,22 +1,22 @@
-The Rapla project uses the following libraries from other software-projects:
-
-Library:----------from:----------------License------Get the source from:
-
-ant Apache Foundation Apache 2.0 ant.apache.org
-avalon-jars Apache Foundation Apache 2.0 avalon.apache.org
-commons-jars Apache Foundation Apache 2.0 commons.apache.org
-itext iText Software LGPL 2.0 github.com/ymasory/
-cl-leak-prevent mjiderhamn Apache 2.0 https://github.com/mjiderhamn/classloader-leak-prevention
-ical4j Micronode ical4j (BSD) build.mnode.org/projects/ical4j/
-jetty Eclipse Foundation Apache 2.0 www.eclipse.org/jetty/
-mailapi Oracle GPL 2.0 java.net/projects/javamail
-servlet-api Apache Apache 2.0 svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/java/javax/servlet/
-supercvs Kasper Apache 2.0 supercsv.sourceforge.net
-service wrapper tanukisoftware GPL 2.0 wrapper.tanukisoftware.com
-
-Most icons were taken from the eclipse project (www.eclipse.org) which are licensed under
-the eclipse public license 1.1
-Some icons were taken from
-- wm-icons.sourceforge.net (GPL LICENSE)
-
-Look for the full license texts in the legal folder of the rapla distribution.
+The Rapla project uses the following libraries from other software-projects:
+
+Library:----------from:----------------License------Get the source from:
+
+ant Apache Foundation Apache 2.0 ant.apache.org
+avalon-jars Apache Foundation Apache 2.0 avalon.apache.org
+commons-jars Apache Foundation Apache 2.0 commons.apache.org
+itext iText Software LGPL 2.0 github.com/ymasory/
+cl-leak-prevent mjiderhamn Apache 2.0 https://github.com/mjiderhamn/classloader-leak-prevention
+ical4j Micronode ical4j (BSD) build.mnode.org/projects/ical4j/
+jetty Eclipse Foundation Apache 2.0 www.eclipse.org/jetty/
+mailapi Oracle GPL 2.0 java.net/projects/javamail
+servlet-api Apache Apache 2.0 svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/java/javax/servlet/
+supercvs Kasper Apache 2.0 supercsv.sourceforge.net
+service wrapper tanukisoftware GPL 2.0 wrapper.tanukisoftware.com
+
+Most icons were taken from the eclipse project (www.eclipse.org) which are licensed under
+the eclipse public license 1.1
+Some icons were taken from
+- wm-icons.sourceforge.net (GPL LICENSE)
+
+Look for the full license texts in the legal folder of the rapla distribution.
diff --git a/rapla-source-1.8.2/legal/wrapper-community-license-1.1.txt b/rapla/legal/wrapper-community-license-1.1.txt
similarity index 98%
rename from rapla-source-1.8.2/legal/wrapper-community-license-1.1.txt
rename to rapla/legal/wrapper-community-license-1.1.txt
index dc02512..5765c5a 100644
--- a/rapla-source-1.8.2/legal/wrapper-community-license-1.1.txt
+++ b/rapla/legal/wrapper-community-license-1.1.txt
@@ -1,396 +1,396 @@
-----------------------------------------------------------------------
------------------ -----------------
- Tanuki Software, Ltd.
- Community Software License Agreement
- Version 1.1
-
-IMPORTANT-READ CAREFULLY: This license agreement is a legal agreement
-between you ("Licensee") and Tanuki Software, Ltd. ("TSI"), which
-includes computer software, associated media, printed materials, and
-may include online or electronic documentation ( Software ). PLEASE
-READ THIS AGREEMENT CAREFULLY BEFORE YOU INSTALL, COPY, DOWNLOAD OR
-USE THE SOFTWARE ACCOMPANYING THIS PACKAGE.
-
-Section 1 - Grant of License
-
-Community editions of the Software are made available on the GNU
-General Public License, Version 2 ("GPLv2"), included in Section 4 of
-this license document. All sections of the Community Software License
-Agreement must be complied with in addition to those of the GPLv2.
-
-
-Section 2 - Definitions
-
-2.1. "Community Edition" shall mean versions of the Software Program
-distributed in source form under this license agreement, and all new
-releases, corrections, enhancements and updates to the Software
-Program, which TSI makes generally available under this agreement.
-
-2.2. "Documentation" shall mean the contents of the website
-describing the functionality and use of the Software Program, located
-at http://wrapper.tanukisoftware.org
-
-2.3. "Product" shall mean the computer programs, that are provided by
-Licensee to Licensee customers or potential customers, and that
-contain both the Software Program as a component of the Product, and a
-component or components (other than the Software Program) that provide
-the material functionality of the Product. If the Product is released
-in source form, the Software Program or any of its components may only
-be included in executable form.
-
-2.4. "Software Program" shall mean the computer software and license
-file provided by TSI under this Agreement, including all new releases,
-corrections, enhancements and updates to such computer software, which
-TSI makes generally available and which Licensee receive pursuant to
-Licensee subscription to TSIMS. Some specific features or platforms
-may not be enabled if they do not fall under the feature set(s)
-covered by the specific license fees paid.
-
-2.5 "End User" shall mean the customers of the Licensee or any
-recipient of the Product whether or not any payment is made to use
-the Product.
-
-
-Section 3 - Licensee Obligations
-
-A copy of this license must be distributed in full with the Product
-in a location that is obvious to any End User.
-
-In accordance with Section 4, the full source code of all components
-of the Product must be made available to any and all End Users.
-
-Licensee may extend and/or modify the Software Program and distribute
-under the terms of this agreement provided that the copyright notice
-and license information displayed in the console and log files are
-not obfuscated or obstructed in any way.
-
-
-Section 4 - GPLv2 License Agreement
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
- Everyone is permitted to copy and distribute verbatim copies of
- this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
- freedom to share and change it. By contrast, the GNU General
- Public License is intended to guarantee your freedom to share and
- change free software--to make sure the software is free for all
- its users. This General Public License applies to most of the Free
- Software Foundation's software and to any other program whose
- authors commit to using it. (Some other Free Software Foundation
- software is covered by the GNU Library General Public License
- instead.) You can apply it to your programs, too.
-
- When we speak of free software, we are referring to freedom, not
- price. Our General Public Licenses are designed to make sure that
- you have the freedom to distribute copies of free software (and
- charge for this service if you wish), that you receive source code
- or can get it if you want it, that you can change the software or
- use pieces of it in new free programs; and that you know you can
- do these things.
-
- To protect your rights, we need to make restrictions that forbid
- anyone to deny you these rights or to ask you to surrender the
- rights. These restrictions translate to certain responsibilities
- for you if you distribute copies of the software, or if you modify
- it.
-
- For example, if you distribute copies of such a program, whether
- gratis or for a fee, you must give the recipients all the rights
- that you have. You must make sure that they, too, receive or can
- get the source code. And you must show them these terms so they
- know their rights.
-
- We protect your rights with two steps:
-
- (1) copyright the software, and
- (2) offer you this license which gives you legal permission to
- copy, distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make
- certain that everyone understands that there is no warranty for
- this free software. If the software is modified by someone else
- and passed on, we want its recipients to know that what they have
- is not the original, so that any problems introduced by others
- will not reflect on the original authors' reputations.
-
- Finally, any free program is threatened constantly by software
- patents. We wish to avoid the danger that redistributors of a free
- program will individually obtain patent licenses, in effect making
- the program proprietary. To prevent this, we have made it clear
- that any patent must be licensed for everyone's free use or not
- licensed at all.
-
- The precise terms and conditions for copying, distribution and
- modification follow.
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which
- contains a notice placed by the copyright holder saying it may be
- distributed under the terms of this General Public License. The
- "Program", below, refers to any such program or work, and a "work
- based on the Program" means either the Program or any derivative
- work under copyright law: that is to say, a work containing the
- Program or a portion of it, either verbatim or with modifications
- and/or translated into another language. (Hereinafter, translation
- is included without limitation in the term "modification".) Each
- licensee is addressed as "you".
-
- Activities other than copying, distribution and modification are
- not covered by this License; they are outside its scope. The act
- of running the Program is not restricted, and the output from the
- Program is covered only if its contents constitute a work based on
- the Program (independent of having been made by running the
- Program). Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
- source code as you receive it, in any medium, provided that you
- conspicuously and appropriately publish on each copy an
- appropriate copyright notice and disclaimer of warranty; keep
- intact all the notices that refer to this License and to the
- absence of any warranty; and give any other recipients of the
- Program a copy of this License along with the Program.
-
- You may charge a fee for the physical act of transferring a copy,
- and you may at your option offer warranty protection in exchange
- for a fee.
-
- 2. You may modify your copy or copies of the Program or any
- portion of it, thus forming a work based on the Program, and copy
- and distribute such modifications or work under the terms of
- Section 1 above, provided that you also meet all of these
- conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but does
- not normally print such an announcement, your work based on the
- Program is not required to print an announcement.)
-
- These requirements apply to the modified work as a whole. If
- identifiable sections of that work are not derived from the
- Program, and can be reasonably considered independent and separate
- works in themselves, then this License, and its terms, do not
- apply to those sections when you distribute them as separate works.
- But when you distribute the same sections as part of a whole which
- is a work based on the Program, the distribution of the whole must
- be on the terms of this License, whose permissions for other
- licensees extend to the entire whole, and thus to each and every
- part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or
- contest your rights to work written entirely by you; rather, the
- intent is to exercise the right to control the distribution of
- derivative or collective works based on the Program.
-
- In addition, mere aggregation of another work not based on the
- Program with the Program (or with a work based on the Program) on
- a volume of a storage or distribution medium does not bring the
- other work under the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
- under Section 2) in object code or executable form under the terms
- of Sections 1 and 2 above provided that you also do one of the
- following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software
- interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
- The source code for a work means the preferred form of the work
- for making modifications to it. For an executable work, complete
- source code means all the source code for all modules it contains,
- plus any associated interface definition files, plus the scripts
- used to control compilation and installation of the executable.
- However, as a special exception, the source code distributed need
- not include anything that is normally distributed (in either
- source or binary form) with the major components (compiler,
- kernel, and so on) of the operating system on which the executable
- runs, unless that component itself accompanies the executable.
-
- If distribution of executable or object code is made by offering
- access to copy from a designated place, then offering equivalent
- access to copy the source code from the same place counts as
- distribution of the source code, even though third parties are not
- compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
- except as expressly provided under this License. Any attempt
- otherwise to copy, modify, sublicense or distribute the Program is
- void, and will automatically terminate your rights under this
- License. However, parties who have received copies, or rights,
- from you under this License will not have their licenses
- terminated so long as such parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
- signed it. However, nothing else grants you permission to modify
- or distribute the Program or its derivative works. These actions
- are prohibited by law if you do not accept this License.
- Therefore, by modifying or distributing the Program (or any work
- based on the Program), you indicate your acceptance of this
- License to do so, and all its terms and conditions for copying,
- distributing or modifying the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on
- the Program), the recipient automatically receives a license from
- the original licensor to copy, distribute or modify the Program
- subject to these terms and conditions. You may not impose any
- further restrictions on the recipients' exercise of the rights
- granted herein. You are not responsible for enforcing compliance
- by third parties to this License.
-
- 7. If, as a consequence of a court judgment or allegation of
- patent infringement or for any other reason (not limited to
- patent issues), conditions are imposed on you (whether by court
- order, agreement or otherwise) that contradict the conditions of
- this License, they do not excuse you from the conditions of this
- License. If you cannot distribute so as to satisfy simultaneously
- your obligations under this License and any other pertinent
- obligations, then as a consequence you may not distribute the
- Program at all. For example, if a patent license would not permit
- royalty-free redistribution of the Program by all those who
- receive copies directly or indirectly through you, then the only
- way you could satisfy both it and this License would be to refrain
- entirely from distribution of the Program.
-
- If any portion of this section is held invalid or unenforceable
- under any particular circumstance, the balance of the section is
- intended to apply and the section as a whole is intended to apply
- in other circumstances.
-
- It is not the purpose of this section to induce you to infringe
- any patents or other property right claims or to contest validity
- of any such claims; this section has the sole purpose of
- protecting the integrity of the free software distribution system,
- which is implemented by public license practices. Many people have
- made generous contributions to the wide range of software
- distributed through that system in reliance on consistent
- application of that system; it is up to the author/donor to decide
- if he or she is willing to distribute software through any other
- system and a licensee cannot impose that choice.
-
- This section is intended to make thoroughly clear what is believed
- to be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
- certain countries either by patents or by copyrighted interfaces,
- the original copyright holder who places the Program under this
- License may add an explicit geographical distribution limitation
- excluding those countries, so that distribution is permitted only
- in or among countries not thus excluded. In such case, this
- License incorporates the limitation as if written in the body of
- this License.
-
- 9. The Free Software Foundation may publish revised and/or new
- versions of the General Public License from time to time. Such new
- versions will be similar in spirit to the present version, but may
- differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
- Program specifies a version number of this License which applies
- to it and "any later version", you have the option of following
- the terms and conditions either of that version or of any later
- version published by the Free Software Foundation. If the Program
- does not specify a version number of this License, you may choose
- any version ever published by the Free Software Foundation.
-
- 10. If you wish to incorporate parts of the Program into other
- free programs whose distribution conditions are different, write
- to the author to ask for permission. For software which is
- copyrighted by the Free Software Foundation, write to the Free
- Software Foundation; we sometimes make exceptions for this. Our
- decision will be guided by the two goals of preserving the free
- status of all derivatives of our free software and of promoting
- the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
- WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
- LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
- AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
- OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
- PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
- DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
- OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
- WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
- MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
- LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
- INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
- INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
- DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
- OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
- OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-
-Section 4 - 3rd Party Components
-
-(1) The Software Program includes software and documentation components
-developed in part by Silver Egg Technology, Inc.("SET") prior to 2001
-and released under the following license.
-
- Copyright (c) 2001 Silver Egg Technology
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sub-license, and/or
- sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
+----------------------------------------------------------------------
+----------------- -----------------
+ Tanuki Software, Ltd.
+ Community Software License Agreement
+ Version 1.1
+
+IMPORTANT-READ CAREFULLY: This license agreement is a legal agreement
+between you ("Licensee") and Tanuki Software, Ltd. ("TSI"), which
+includes computer software, associated media, printed materials, and
+may include online or electronic documentation ( Software ). PLEASE
+READ THIS AGREEMENT CAREFULLY BEFORE YOU INSTALL, COPY, DOWNLOAD OR
+USE THE SOFTWARE ACCOMPANYING THIS PACKAGE.
+
+Section 1 - Grant of License
+
+Community editions of the Software are made available on the GNU
+General Public License, Version 2 ("GPLv2"), included in Section 4 of
+this license document. All sections of the Community Software License
+Agreement must be complied with in addition to those of the GPLv2.
+
+
+Section 2 - Definitions
+
+2.1. "Community Edition" shall mean versions of the Software Program
+distributed in source form under this license agreement, and all new
+releases, corrections, enhancements and updates to the Software
+Program, which TSI makes generally available under this agreement.
+
+2.2. "Documentation" shall mean the contents of the website
+describing the functionality and use of the Software Program, located
+at http://wrapper.tanukisoftware.org
+
+2.3. "Product" shall mean the computer programs, that are provided by
+Licensee to Licensee customers or potential customers, and that
+contain both the Software Program as a component of the Product, and a
+component or components (other than the Software Program) that provide
+the material functionality of the Product. If the Product is released
+in source form, the Software Program or any of its components may only
+be included in executable form.
+
+2.4. "Software Program" shall mean the computer software and license
+file provided by TSI under this Agreement, including all new releases,
+corrections, enhancements and updates to such computer software, which
+TSI makes generally available and which Licensee receive pursuant to
+Licensee subscription to TSIMS. Some specific features or platforms
+may not be enabled if they do not fall under the feature set(s)
+covered by the specific license fees paid.
+
+2.5 "End User" shall mean the customers of the Licensee or any
+recipient of the Product whether or not any payment is made to use
+the Product.
+
+
+Section 3 - Licensee Obligations
+
+A copy of this license must be distributed in full with the Product
+in a location that is obvious to any End User.
+
+In accordance with Section 4, the full source code of all components
+of the Product must be made available to any and all End Users.
+
+Licensee may extend and/or modify the Software Program and distribute
+under the terms of this agreement provided that the copyright notice
+and license information displayed in the console and log files are
+not obfuscated or obstructed in any way.
+
+
+Section 4 - GPLv2 License Agreement
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+ Everyone is permitted to copy and distribute verbatim copies of
+ this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+ freedom to share and change it. By contrast, the GNU General
+ Public License is intended to guarantee your freedom to share and
+ change free software--to make sure the software is free for all
+ its users. This General Public License applies to most of the Free
+ Software Foundation's software and to any other program whose
+ authors commit to using it. (Some other Free Software Foundation
+ software is covered by the GNU Library General Public License
+ instead.) You can apply it to your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+ price. Our General Public Licenses are designed to make sure that
+ you have the freedom to distribute copies of free software (and
+ charge for this service if you wish), that you receive source code
+ or can get it if you want it, that you can change the software or
+ use pieces of it in new free programs; and that you know you can
+ do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+ anyone to deny you these rights or to ask you to surrender the
+ rights. These restrictions translate to certain responsibilities
+ for you if you distribute copies of the software, or if you modify
+ it.
+
+ For example, if you distribute copies of such a program, whether
+ gratis or for a fee, you must give the recipients all the rights
+ that you have. You must make sure that they, too, receive or can
+ get the source code. And you must show them these terms so they
+ know their rights.
+
+ We protect your rights with two steps:
+
+ (1) copyright the software, and
+ (2) offer you this license which gives you legal permission to
+ copy, distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make
+ certain that everyone understands that there is no warranty for
+ this free software. If the software is modified by someone else
+ and passed on, we want its recipients to know that what they have
+ is not the original, so that any problems introduced by others
+ will not reflect on the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+ patents. We wish to avoid the danger that redistributors of a free
+ program will individually obtain patent licenses, in effect making
+ the program proprietary. To prevent this, we have made it clear
+ that any patent must be licensed for everyone's free use or not
+ licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+ modification follow.
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which
+ contains a notice placed by the copyright holder saying it may be
+ distributed under the terms of this General Public License. The
+ "Program", below, refers to any such program or work, and a "work
+ based on the Program" means either the Program or any derivative
+ work under copyright law: that is to say, a work containing the
+ Program or a portion of it, either verbatim or with modifications
+ and/or translated into another language. (Hereinafter, translation
+ is included without limitation in the term "modification".) Each
+ licensee is addressed as "you".
+
+ Activities other than copying, distribution and modification are
+ not covered by this License; they are outside its scope. The act
+ of running the Program is not restricted, and the output from the
+ Program is covered only if its contents constitute a work based on
+ the Program (independent of having been made by running the
+ Program). Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+ source code as you receive it, in any medium, provided that you
+ conspicuously and appropriately publish on each copy an
+ appropriate copyright notice and disclaimer of warranty; keep
+ intact all the notices that refer to this License and to the
+ absence of any warranty; and give any other recipients of the
+ Program a copy of this License along with the Program.
+
+ You may charge a fee for the physical act of transferring a copy,
+ and you may at your option offer warranty protection in exchange
+ for a fee.
+
+ 2. You may modify your copy or copies of the Program or any
+ portion of it, thus forming a work based on the Program, and copy
+ and distribute such modifications or work under the terms of
+ Section 1 above, provided that you also meet all of these
+ conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but does
+ not normally print such an announcement, your work based on the
+ Program is not required to print an announcement.)
+
+ These requirements apply to the modified work as a whole. If
+ identifiable sections of that work are not derived from the
+ Program, and can be reasonably considered independent and separate
+ works in themselves, then this License, and its terms, do not
+ apply to those sections when you distribute them as separate works.
+ But when you distribute the same sections as part of a whole which
+ is a work based on the Program, the distribution of the whole must
+ be on the terms of this License, whose permissions for other
+ licensees extend to the entire whole, and thus to each and every
+ part regardless of who wrote it.
+
+ Thus, it is not the intent of this section to claim rights or
+ contest your rights to work written entirely by you; rather, the
+ intent is to exercise the right to control the distribution of
+ derivative or collective works based on the Program.
+
+ In addition, mere aggregation of another work not based on the
+ Program with the Program (or with a work based on the Program) on
+ a volume of a storage or distribution medium does not bring the
+ other work under the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+ under Section 2) in object code or executable form under the terms
+ of Sections 1 and 2 above provided that you also do one of the
+ following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software
+ interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+ The source code for a work means the preferred form of the work
+ for making modifications to it. For an executable work, complete
+ source code means all the source code for all modules it contains,
+ plus any associated interface definition files, plus the scripts
+ used to control compilation and installation of the executable.
+ However, as a special exception, the source code distributed need
+ not include anything that is normally distributed (in either
+ source or binary form) with the major components (compiler,
+ kernel, and so on) of the operating system on which the executable
+ runs, unless that component itself accompanies the executable.
+
+ If distribution of executable or object code is made by offering
+ access to copy from a designated place, then offering equivalent
+ access to copy the source code from the same place counts as
+ distribution of the source code, even though third parties are not
+ compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+ except as expressly provided under this License. Any attempt
+ otherwise to copy, modify, sublicense or distribute the Program is
+ void, and will automatically terminate your rights under this
+ License. However, parties who have received copies, or rights,
+ from you under this License will not have their licenses
+ terminated so long as such parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+ signed it. However, nothing else grants you permission to modify
+ or distribute the Program or its derivative works. These actions
+ are prohibited by law if you do not accept this License.
+ Therefore, by modifying or distributing the Program (or any work
+ based on the Program), you indicate your acceptance of this
+ License to do so, and all its terms and conditions for copying,
+ distributing or modifying the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on
+ the Program), the recipient automatically receives a license from
+ the original licensor to copy, distribute or modify the Program
+ subject to these terms and conditions. You may not impose any
+ further restrictions on the recipients' exercise of the rights
+ granted herein. You are not responsible for enforcing compliance
+ by third parties to this License.
+
+ 7. If, as a consequence of a court judgment or allegation of
+ patent infringement or for any other reason (not limited to
+ patent issues), conditions are imposed on you (whether by court
+ order, agreement or otherwise) that contradict the conditions of
+ this License, they do not excuse you from the conditions of this
+ License. If you cannot distribute so as to satisfy simultaneously
+ your obligations under this License and any other pertinent
+ obligations, then as a consequence you may not distribute the
+ Program at all. For example, if a patent license would not permit
+ royalty-free redistribution of the Program by all those who
+ receive copies directly or indirectly through you, then the only
+ way you could satisfy both it and this License would be to refrain
+ entirely from distribution of the Program.
+
+ If any portion of this section is held invalid or unenforceable
+ under any particular circumstance, the balance of the section is
+ intended to apply and the section as a whole is intended to apply
+ in other circumstances.
+
+ It is not the purpose of this section to induce you to infringe
+ any patents or other property right claims or to contest validity
+ of any such claims; this section has the sole purpose of
+ protecting the integrity of the free software distribution system,
+ which is implemented by public license practices. Many people have
+ made generous contributions to the wide range of software
+ distributed through that system in reliance on consistent
+ application of that system; it is up to the author/donor to decide
+ if he or she is willing to distribute software through any other
+ system and a licensee cannot impose that choice.
+
+ This section is intended to make thoroughly clear what is believed
+ to be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+ certain countries either by patents or by copyrighted interfaces,
+ the original copyright holder who places the Program under this
+ License may add an explicit geographical distribution limitation
+ excluding those countries, so that distribution is permitted only
+ in or among countries not thus excluded. In such case, this
+ License incorporates the limitation as if written in the body of
+ this License.
+
+ 9. The Free Software Foundation may publish revised and/or new
+ versions of the General Public License from time to time. Such new
+ versions will be similar in spirit to the present version, but may
+ differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+ Program specifies a version number of this License which applies
+ to it and "any later version", you have the option of following
+ the terms and conditions either of that version or of any later
+ version published by the Free Software Foundation. If the Program
+ does not specify a version number of this License, you may choose
+ any version ever published by the Free Software Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other
+ free programs whose distribution conditions are different, write
+ to the author to ask for permission. For software which is
+ copyrighted by the Free Software Foundation, write to the Free
+ Software Foundation; we sometimes make exceptions for this. Our
+ decision will be guided by the two goals of preserving the free
+ status of all derivatives of our free software and of promoting
+ the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+ WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+ LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
+ AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+ OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+ PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+ DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
+ OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
+ MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
+ LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+ INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+ INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+ DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+ OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
+ OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+
+Section 4 - 3rd Party Components
+
+(1) The Software Program includes software and documentation components
+developed in part by Silver Egg Technology, Inc.("SET") prior to 2001
+and released under the following license.
+
+ Copyright (c) 2001 Silver Egg Technology
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sub-license, and/or
+ sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/rapla-source-1.8.2/lib/ant-junit.jar b/rapla/lib/ant-junit.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/ant-junit.jar
rename to rapla/lib/ant-junit.jar
diff --git a/rapla-source-1.8.2/lib/ant-launcher.jar b/rapla/lib/ant-launcher.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/ant-launcher.jar
rename to rapla/lib/ant-launcher.jar
diff --git a/rapla-source-1.8.2/lib/ant.jar b/rapla/lib/ant.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/ant.jar
rename to rapla/lib/ant.jar
diff --git a/rapla-source-1.8.2/lib/common/COMMON-LIBRARIES.txt b/rapla/lib/common/COMMON-LIBRARIES.txt
similarity index 98%
rename from rapla-source-1.8.2/lib/common/COMMON-LIBRARIES.txt
rename to rapla/lib/common/COMMON-LIBRARIES.txt
index db90a2f..38aa710 100644
--- a/rapla-source-1.8.2/lib/common/COMMON-LIBRARIES.txt
+++ b/rapla/lib/common/COMMON-LIBRARIES.txt
@@ -1 +1 @@
-Place in this folder all jars that should be used by the client and the server application.
+Place in this folder all jars that should be used by the client and the server application.
diff --git a/rapla-source-1.8.2/lib/common/gson-2.3.1.jar b/rapla/lib/common/gson-2.3.1.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/common/gson-2.3.1.jar
rename to rapla/lib/common/gson-2.3.1.jar
diff --git a/rapla-source-1.8.2/lib/common/iText-4.2.0-com.itextpdf.jar b/rapla/lib/common/iText-4.2.0-com.itextpdf.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/common/iText-4.2.0-com.itextpdf.jar
rename to rapla/lib/common/iText-4.2.0-com.itextpdf.jar
diff --git a/rapla-source-1.8.2/lib/common/javax.inject.jar b/rapla/lib/common/javax.inject.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/common/javax.inject.jar
rename to rapla/lib/common/javax.inject.jar
diff --git a/rapla-source-1.8.2/lib/common/super-csv-2.0.1.jar b/rapla/lib/common/super-csv-2.0.1.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/common/super-csv-2.0.1.jar
rename to rapla/lib/common/super-csv-2.0.1.jar
diff --git a/rapla-source-1.8.2/lib/ext/hsqldb-2.3.2.jar b/rapla/lib/ext/hsqldb-2.3.2.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/ext/hsqldb-2.3.2.jar
rename to rapla/lib/ext/hsqldb-2.3.2.jar
diff --git a/rapla-source-1.8.2/lib/jetty-continuation-8.1.16.v20140903.jar b/rapla/lib/jetty-continuation-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-continuation-8.1.16.v20140903.jar
rename to rapla/lib/jetty-continuation-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-deploy-8.1.16.v20140903.jar b/rapla/lib/jetty-deploy-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-deploy-8.1.16.v20140903.jar
rename to rapla/lib/jetty-deploy-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-http-8.1.16.v20140903.jar b/rapla/lib/jetty-http-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-http-8.1.16.v20140903.jar
rename to rapla/lib/jetty-http-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-io-8.1.16.v20140903.jar b/rapla/lib/jetty-io-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-io-8.1.16.v20140903.jar
rename to rapla/lib/jetty-io-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-jndi-8.1.16.v20140903.jar b/rapla/lib/jetty-jndi-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-jndi-8.1.16.v20140903.jar
rename to rapla/lib/jetty-jndi-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-plus-8.1.16.v20140903.jar b/rapla/lib/jetty-plus-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-plus-8.1.16.v20140903.jar
rename to rapla/lib/jetty-plus-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-security-8.1.16.v20140903.jar b/rapla/lib/jetty-security-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-security-8.1.16.v20140903.jar
rename to rapla/lib/jetty-security-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-server-8.1.16.v20140903.jar b/rapla/lib/jetty-server-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-server-8.1.16.v20140903.jar
rename to rapla/lib/jetty-server-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-servlet-8.1.16.v20140903.jar b/rapla/lib/jetty-servlet-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-servlet-8.1.16.v20140903.jar
rename to rapla/lib/jetty-servlet-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-util-8.1.16.v20140903.jar b/rapla/lib/jetty-util-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-util-8.1.16.v20140903.jar
rename to rapla/lib/jetty-util-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-webapp-8.1.16.v20140903.jar b/rapla/lib/jetty-webapp-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-webapp-8.1.16.v20140903.jar
rename to rapla/lib/jetty-webapp-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/jetty-xml-8.1.16.v20140903.jar b/rapla/lib/jetty-xml-8.1.16.v20140903.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/jetty-xml-8.1.16.v20140903.jar
rename to rapla/lib/jetty-xml-8.1.16.v20140903.jar
diff --git a/rapla-source-1.8.2/lib/logging/commons-compiler-2.7.0.jar b/rapla/lib/logging/commons-compiler-2.7.0.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/logging/commons-compiler-2.7.0.jar
rename to rapla/lib/logging/commons-compiler-2.7.0.jar
diff --git a/rapla-source-1.8.2/lib/logging/janino-2.7.0.jar b/rapla/lib/logging/janino-2.7.0.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/logging/janino-2.7.0.jar
rename to rapla/lib/logging/janino-2.7.0.jar
diff --git a/rapla-source-1.8.2/lib/logging/jcl-over-slf4j-1.7.5.jar b/rapla/lib/logging/jcl-over-slf4j-1.7.5.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/logging/jcl-over-slf4j-1.7.5.jar
rename to rapla/lib/logging/jcl-over-slf4j-1.7.5.jar
diff --git a/rapla-source-1.8.2/lib/logging/jul-to-slf4j-1.7.5.jar b/rapla/lib/logging/jul-to-slf4j-1.7.5.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/logging/jul-to-slf4j-1.7.5.jar
rename to rapla/lib/logging/jul-to-slf4j-1.7.5.jar
diff --git a/rapla-source-1.8.2/lib/logging/logback-access-1.0.13.jar b/rapla/lib/logging/logback-access-1.0.13.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/logging/logback-access-1.0.13.jar
rename to rapla/lib/logging/logback-access-1.0.13.jar
diff --git a/rapla-source-1.8.2/lib/logging/logback-classic-1.0.13.jar b/rapla/lib/logging/logback-classic-1.0.13.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/logging/logback-classic-1.0.13.jar
rename to rapla/lib/logging/logback-classic-1.0.13.jar
diff --git a/rapla-source-1.8.2/lib/logging/logback-core-1.0.13.jar b/rapla/lib/logging/logback-core-1.0.13.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/logging/logback-core-1.0.13.jar
rename to rapla/lib/logging/logback-core-1.0.13.jar
diff --git a/rapla-source-1.8.2/lib/logging/slf4j-api-1.7.5.jar b/rapla/lib/logging/slf4j-api-1.7.5.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/logging/slf4j-api-1.7.5.jar
rename to rapla/lib/logging/slf4j-api-1.7.5.jar
diff --git a/rapla-source-1.8.2/lib/server/SERVER-LIBRARIES.txt b/rapla/lib/server/SERVER-LIBRARIES.txt
similarity index 98%
rename from rapla-source-1.8.2/lib/server/SERVER-LIBRARIES.txt
rename to rapla/lib/server/SERVER-LIBRARIES.txt
index d20de8f..19444b7 100644
--- a/rapla-source-1.8.2/lib/server/SERVER-LIBRARIES.txt
+++ b/rapla/lib/server/SERVER-LIBRARIES.txt
@@ -1 +1 @@
-Place in this folder all jars that should only be used by the server application.
+Place in this folder all jars that should only be used by the server application.
diff --git a/rapla-source-1.8.2/lib/server/backport-util-concurrent-3.1.jar b/rapla/lib/server/backport-util-concurrent-3.1.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/server/backport-util-concurrent-3.1.jar
rename to rapla/lib/server/backport-util-concurrent-3.1.jar
diff --git a/rapla-source-1.8.2/lib/server/commons-codec-1.8.jar b/rapla/lib/server/commons-codec-1.8.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/server/commons-codec-1.8.jar
rename to rapla/lib/server/commons-codec-1.8.jar
diff --git a/rapla-source-1.8.2/lib/server/commons-collections4-4.0.jar b/rapla/lib/server/commons-collections4-4.0.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/server/commons-collections4-4.0.jar
rename to rapla/lib/server/commons-collections4-4.0.jar
diff --git a/rapla-source-1.8.2/lib/server/commons-lang-2.6.jar b/rapla/lib/server/commons-lang-2.6.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/server/commons-lang-2.6.jar
rename to rapla/lib/server/commons-lang-2.6.jar
diff --git a/rapla-source-1.8.2/lib/server/commons-logging-1.1.3.jar b/rapla/lib/server/commons-logging-1.1.3.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/server/commons-logging-1.1.3.jar
rename to rapla/lib/server/commons-logging-1.1.3.jar
diff --git a/rapla-source-1.8.2/lib/server/ical4j-1.0.6.jar b/rapla/lib/server/ical4j-1.0.6.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/server/ical4j-1.0.6.jar
rename to rapla/lib/server/ical4j-1.0.6.jar
diff --git a/rapla-source-1.8.2/lib/server/mailapi-1.4.7.jar b/rapla/lib/server/mailapi-1.4.7.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/server/mailapi-1.4.7.jar
rename to rapla/lib/server/mailapi-1.4.7.jar
diff --git a/rapla-source-1.8.2/lib/server/smtp-1.4.7.jar b/rapla/lib/server/smtp-1.4.7.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/server/smtp-1.4.7.jar
rename to rapla/lib/server/smtp-1.4.7.jar
diff --git a/rapla-source-1.8.2/lib/servlet-api-3.0.jar b/rapla/lib/servlet-api-3.0.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/servlet-api-3.0.jar
rename to rapla/lib/servlet-api-3.0.jar
diff --git a/rapla-source-1.8.2/lib/test-only/junit-3.8.jar b/rapla/lib/test-only/junit-3.8.jar
similarity index 100%
rename from rapla-source-1.8.2/lib/test-only/junit-3.8.jar
rename to rapla/lib/test-only/junit-3.8.jar
diff --git a/rapla-source-1.8.2/logs/rapla.log b/rapla/logs/rapla.log
similarity index 61%
rename from rapla-source-1.8.2/logs/rapla.log
rename to rapla/logs/rapla.log
index 90aa3d0..8ff26ef 100644
--- a/rapla-source-1.8.2/logs/rapla.log
+++ b/rapla/logs/rapla.log
@@ -1,110 +1,176 @@
-15:58:33.785 266 [main] INFO org.eclipse.jetty.server.Server - jetty-8.1.16.v20140903
-15:58:33.825 306 [main] INFO o.e.j.d.p.ScanningAppProvider - Deployment monitor C:\Users\kcs11006\Downloads\rapla-source-1.8.2\contexts at interval 1
-15:58:33.829 310 [main] INFO o.e.jetty.deploy.DeploymentManager - Deployable added: C:\Users\kcs11006\Downloads\rapla-source-1.8.2\contexts\rapla-develop.xml
-15:58:34.030 511 [main] INFO rapla - Init RaplaServlet
-15:58:34.032 513 [main] INFO rapla - Passed JNDI Environment rapladatasource=raplafile env_rapladb=org.hsqldb.jdbc.JDBCDataSource@29626d54 env_raplafile=C:\Users\kcs11006\Downloads\rapla-source-1.8.2/data/data.xml
-15:58:34.036 517 [main] INFO rapla - Logging via SLF4J API.
-15:58:34.061 542 [main] INFO rapla - Configured Locale= en_US
-15:58:34.170 651 [main] INFO rapla - Config=file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/war/WEB-INF/raplaserver.xconf
-15:58:34.170 651 [main] INFO rapla - Rapla.Version=@doc.version@
-15:58:34.171 652 [main] INFO rapla - Rapla.Build=@doc.buildtime@
-15:58:34.171 652 [main] INFO rapla - Timezone America/New_York
-15:58:34.176 657 [main] INFO rapla - Java.Version=1.8.0_51
-15:58:34.226 707 [main] INFO rapla.server.serverfacade - Using rapladatasource raplafile
-15:58:34.242 723 [main] INFO rapla.raplafile - Connecting: file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/data/data.xml
-15:58:34.261 742 [main] WARN rapla.raplafile - Data file not found file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/data/data.xml creating default system.
-15:58:39.276 5757 [main] INFO rapla.raplafile - Conflict initialization found 0 conflicts and took 0ms.
-15:58:39.278 5759 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.weekview.server.WeekViewServerPlugin
-15:58:39.279 5760 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.urlencryption.server.UrlEncryptionServerPlugin
-15:58:39.279 5760 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.timeslot.server.TimeslotServerPlugin
-15:58:39.279 5760 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.tableview.internal.server.TableViewServerPlugin
-15:58:39.280 5761 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.notification.server.NotificationServerPlugin
-15:58:39.280 5761 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.monthview.server.MonthViewServerPlugin
-15:58:39.280 5761 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.mail.server.MailServerPlugin
-15:58:39.280 5761 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.jndi.server.JNDIServerPlugin
-15:58:39.281 5762 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.ical.server.ImportFromICalServerPlugin
-15:58:39.281 5762 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.export2ical.server.Export2iCalServerPlugin
-15:58:39.281 5762 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.eventtimecalculator.server.EventTimeCalculatorServerPlugin
-15:58:39.281 5762 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.dayresource.server.DayResourceViewServerPlugin
-15:58:39.282 5763 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.compactweekview.server.CompactWeekViewServerPlugin
-15:58:39.282 5763 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.autoexport.server.AutoExportServerPlugin
-15:58:39.282 5763 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.archiver.server.ArchiverServerPlugin
-15:58:39.286 5767 [main] INFO rapla.server - Generating new root key. This can take a while.
-15:58:39.855 6336 [main] INFO rapla.server - Root key generated
-15:58:39.869 6350 [main] INFO rapla.raplafile - Creating directory C:\Users\kcs11006\Downloads\rapla-source-1.8.2\data
-15:58:40.082 6563 [main] INFO rapla - Rapla server started
-15:58:40.092 6573 [main] INFO rapla.client - Starting gui
-15:58:40.114 6595 [main] INFO rapla.client.facade - Using rapladatasource remotestore
-15:58:40.124 6605 [main] INFO rapla.remotestore - Connecting to server and starting login..
-15:58:40.125 6606 [main] INFO rapla.remotestore - login successfull
-15:58:40.126 6607 [main] INFO rapla.client.facade - Login admin
-15:58:40.129 6610 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.weekview.WeekViewPlugin
-15:58:40.129 6610 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.urlencryption.UrlEncryptionPlugin
-15:58:40.129 6610 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.timeslot.TimeslotPlugin
-15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.tempatewizard.TempateWizardPlugin
-15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.tableview.internal.TableViewPlugin
-15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.setowner.SetOwnerPlugin
-15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.rightsreport.RightsReportPlugin
-15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.periodcopy.PeriodCopyPlugin
-15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.notification.NotificationPlugin
-15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.monthview.MonthViewPlugin
-15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.mail.MailPlugin
-15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.jndi.JNDIPlugin
-15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.ical.ImportFromICalPlugin
-15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.export2ical.Export2iCalPlugin
-15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.eventtimecalculator.EventTimeCalculatorPlugin
-15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.defaultwizard.DefaultWizardPlugin
-15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.dayresource.DayResourceViewPlugin
-15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.compactweekview.CompactWeekViewPlugin
-15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.autoexport.AutoExportPlugin
-15:58:40.133 6614 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.archiver.ArchiverPlugin
-15:58:40.133 6614 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.appointmentcounter.AppointmentCounterPlugin
-15:58:53.188 19669 [AWT-EventQueue-0] INFO rapla.client.facade - Logout u405db03-812f-4ff7-b52c-5423a7951cf4
-15:58:53.189 19670 [AWT-EventQueue-0] INFO rapla.remotestore - Disconnecting from server
-15:58:53.189 19670 [AWT-EventQueue-0] INFO rapla.server.session.login - Request Logout admin
-15:58:53.194 19675 [main] INFO rapla - Shutting down rapla-container
-15:58:53.194 19675 [main] INFO rapla - Stopping scheduler thread.
-15:58:53.195 19676 [main] INFO rapla - Stopped scheduler thread.
-15:58:53.245 19726 [main] INFO rapla.raplafile - Disconnecting: file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/data/data.xml
-15:58:53.245 19726 [main] INFO rapla.server - Storage service stopped
-15:58:58.327 24808 [main] INFO o.e.j.server.handler.ContextHandler - stopped o.e.j.w.WebAppContext{/,[file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/war/]}
-15:58:58.328 24809 [SeedGenerator Thread] ERROR rapla.client - uncaught exception
-java.lang.ThreadDeath: null
- at java.lang.Thread.stop(Unknown Source) ~[na:1.8.0_51]
- at se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventor.stopThreads(ClassLoaderLeakPreventor.java:915) ~[eclipse-build/:na]
- at se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventor.contextDestroyed(ClassLoaderLeakPreventor.java:426) ~[eclipse-build/:na]
- at org.eclipse.jetty.server.handler.ContextHandler.doStop(ContextHandler.java:823) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.servlet.ServletContextHandler.doStop(ServletContextHandler.java:160) ~[jetty-servlet-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.webapp.WebAppContext.doStop(WebAppContext.java:518) ~[jetty-webapp-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.server.handler.HandlerCollection.doStop(HandlerCollection.java:250) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.server.handler.HandlerCollection.doStop(HandlerCollection.java:250) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.server.handler.HandlerWrapper.doStop(HandlerWrapper.java:107) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.server.Server.doStop(Server.java:343) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_51]
- at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
- at java.lang.reflect.Method.invoke(Unknown Source) ~[na:1.8.0_51]
- at org.rapla.bootstrap.CustomJettyStarter$2$1.invoke(CustomJettyStarter.java:278) ~[eclipse-build/:na]
- at com.sun.proxy.$Proxy0.lifeCycleStarted(Unknown Source) ~[na:na]
- at org.eclipse.jetty.util.component.AbstractLifeCycle.setStarted(AbstractLifeCycle.java:174) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
- at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:65) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_51]
- at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
- at java.lang.reflect.Method.invoke(Unknown Source) ~[na:1.8.0_51]
- at org.rapla.bootstrap.CustomJettyStarter$2.run(CustomJettyStarter.java:339) ~[eclipse-build/:na]
- at java.security.AccessController.doPrivileged(Native Method) ~[na:1.8.0_51]
- at org.rapla.bootstrap.CustomJettyStarter.start(CustomJettyStarter.java:193) ~[eclipse-build/:na]
- at org.rapla.bootstrap.CustomJettyStarter.main(CustomJettyStarter.java:53) ~[eclipse-build/:na]
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_51]
- at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
- at java.lang.reflect.Method.invoke(Unknown Source) ~[na:1.8.0_51]
- at org.rapla.bootstrap.RaplaLoader.startMain(RaplaLoader.java:135) ~[eclipse-build/:na]
- at org.rapla.bootstrap.RaplaLoader.start(RaplaLoader.java:99) ~[eclipse-build/:na]
- at org.rapla.bootstrap.RaplaJettyLoader.main(RaplaJettyLoader.java:30) ~[eclipse-build/:na]
- at org.rapla.bootstrap.RaplaStandaloneLoader.main(RaplaStandaloneLoader.java:17) ~[eclipse-build/:na]
+15:58:33.785 266 [main] INFO org.eclipse.jetty.server.Server - jetty-8.1.16.v20140903
+15:58:33.825 306 [main] INFO o.e.j.d.p.ScanningAppProvider - Deployment monitor C:\Users\kcs11006\Downloads\rapla-source-1.8.2\contexts at interval 1
+15:58:33.829 310 [main] INFO o.e.jetty.deploy.DeploymentManager - Deployable added: C:\Users\kcs11006\Downloads\rapla-source-1.8.2\contexts\rapla-develop.xml
+15:58:34.030 511 [main] INFO rapla - Init RaplaServlet
+15:58:34.032 513 [main] INFO rapla - Passed JNDI Environment rapladatasource=raplafile env_rapladb=org.hsqldb.jdbc.JDBCDataSource@29626d54 env_raplafile=C:\Users\kcs11006\Downloads\rapla-source-1.8.2/data/data.xml
+15:58:34.036 517 [main] INFO rapla - Logging via SLF4J API.
+15:58:34.061 542 [main] INFO rapla - Configured Locale= en_US
+15:58:34.170 651 [main] INFO rapla - Config=file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/war/WEB-INF/raplaserver.xconf
+15:58:34.170 651 [main] INFO rapla - Rapla.Version=@doc.version@
+15:58:34.171 652 [main] INFO rapla - Rapla.Build=@doc.buildtime@
+15:58:34.171 652 [main] INFO rapla - Timezone America/New_York
+15:58:34.176 657 [main] INFO rapla - Java.Version=1.8.0_51
+15:58:34.226 707 [main] INFO rapla.server.serverfacade - Using rapladatasource raplafile
+15:58:34.242 723 [main] INFO rapla.raplafile - Connecting: file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/data/data.xml
+15:58:34.261 742 [main] WARN rapla.raplafile - Data file not found file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/data/data.xml creating default system.
+15:58:39.276 5757 [main] INFO rapla.raplafile - Conflict initialization found 0 conflicts and took 0ms.
+15:58:39.278 5759 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.weekview.server.WeekViewServerPlugin
+15:58:39.279 5760 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.urlencryption.server.UrlEncryptionServerPlugin
+15:58:39.279 5760 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.timeslot.server.TimeslotServerPlugin
+15:58:39.279 5760 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.tableview.internal.server.TableViewServerPlugin
+15:58:39.280 5761 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.notification.server.NotificationServerPlugin
+15:58:39.280 5761 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.monthview.server.MonthViewServerPlugin
+15:58:39.280 5761 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.mail.server.MailServerPlugin
+15:58:39.280 5761 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.jndi.server.JNDIServerPlugin
+15:58:39.281 5762 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.ical.server.ImportFromICalServerPlugin
+15:58:39.281 5762 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.export2ical.server.Export2iCalServerPlugin
+15:58:39.281 5762 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.eventtimecalculator.server.EventTimeCalculatorServerPlugin
+15:58:39.281 5762 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.dayresource.server.DayResourceViewServerPlugin
+15:58:39.282 5763 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.compactweekview.server.CompactWeekViewServerPlugin
+15:58:39.282 5763 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.autoexport.server.AutoExportServerPlugin
+15:58:39.282 5763 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.archiver.server.ArchiverServerPlugin
+15:58:39.286 5767 [main] INFO rapla.server - Generating new root key. This can take a while.
+15:58:39.855 6336 [main] INFO rapla.server - Root key generated
+15:58:39.869 6350 [main] INFO rapla.raplafile - Creating directory C:\Users\kcs11006\Downloads\rapla-source-1.8.2\data
+15:58:40.082 6563 [main] INFO rapla - Rapla server started
+15:58:40.092 6573 [main] INFO rapla.client - Starting gui
+15:58:40.114 6595 [main] INFO rapla.client.facade - Using rapladatasource remotestore
+15:58:40.124 6605 [main] INFO rapla.remotestore - Connecting to server and starting login..
+15:58:40.125 6606 [main] INFO rapla.remotestore - login successfull
+15:58:40.126 6607 [main] INFO rapla.client.facade - Login admin
+15:58:40.129 6610 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.weekview.WeekViewPlugin
+15:58:40.129 6610 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.urlencryption.UrlEncryptionPlugin
+15:58:40.129 6610 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.timeslot.TimeslotPlugin
+15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.tempatewizard.TempateWizardPlugin
+15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.tableview.internal.TableViewPlugin
+15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.setowner.SetOwnerPlugin
+15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.rightsreport.RightsReportPlugin
+15:58:40.130 6611 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.periodcopy.PeriodCopyPlugin
+15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.notification.NotificationPlugin
+15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.monthview.MonthViewPlugin
+15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.mail.MailPlugin
+15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.jndi.JNDIPlugin
+15:58:40.131 6612 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.ical.ImportFromICalPlugin
+15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.export2ical.Export2iCalPlugin
+15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.eventtimecalculator.EventTimeCalculatorPlugin
+15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.defaultwizard.DefaultWizardPlugin
+15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.dayresource.DayResourceViewPlugin
+15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.compactweekview.CompactWeekViewPlugin
+15:58:40.132 6613 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.autoexport.AutoExportPlugin
+15:58:40.133 6614 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.archiver.ArchiverPlugin
+15:58:40.133 6614 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.appointmentcounter.AppointmentCounterPlugin
+15:58:53.188 19669 [AWT-EventQueue-0] INFO rapla.client.facade - Logout u405db03-812f-4ff7-b52c-5423a7951cf4
+15:58:53.189 19670 [AWT-EventQueue-0] INFO rapla.remotestore - Disconnecting from server
+15:58:53.189 19670 [AWT-EventQueue-0] INFO rapla.server.session.login - Request Logout admin
+15:58:53.194 19675 [main] INFO rapla - Shutting down rapla-container
+15:58:53.194 19675 [main] INFO rapla - Stopping scheduler thread.
+15:58:53.195 19676 [main] INFO rapla - Stopped scheduler thread.
+15:58:53.245 19726 [main] INFO rapla.raplafile - Disconnecting: file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/data/data.xml
+15:58:53.245 19726 [main] INFO rapla.server - Storage service stopped
+15:58:58.327 24808 [main] INFO o.e.j.server.handler.ContextHandler - stopped o.e.j.w.WebAppContext{/,[file:/C:/Users/kcs11006/Downloads/rapla-source-1.8.2/war/]}
+15:58:58.328 24809 [SeedGenerator Thread] ERROR rapla.client - uncaught exception
+java.lang.ThreadDeath: null
+ at java.lang.Thread.stop(Unknown Source) ~[na:1.8.0_51]
+ at se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventor.stopThreads(ClassLoaderLeakPreventor.java:915) ~[eclipse-build/:na]
+ at se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventor.contextDestroyed(ClassLoaderLeakPreventor.java:426) ~[eclipse-build/:na]
+ at org.eclipse.jetty.server.handler.ContextHandler.doStop(ContextHandler.java:823) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.servlet.ServletContextHandler.doStop(ServletContextHandler.java:160) ~[jetty-servlet-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.webapp.WebAppContext.doStop(WebAppContext.java:518) ~[jetty-webapp-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.server.handler.HandlerCollection.doStop(HandlerCollection.java:250) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.server.handler.HandlerCollection.doStop(HandlerCollection.java:250) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.server.handler.HandlerWrapper.doStop(HandlerWrapper.java:107) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.server.Server.doStop(Server.java:343) ~[jetty-server-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_51]
+ at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
+ at java.lang.reflect.Method.invoke(Unknown Source) ~[na:1.8.0_51]
+ at org.rapla.bootstrap.CustomJettyStarter$2$1.invoke(CustomJettyStarter.java:278) ~[eclipse-build/:na]
+ at com.sun.proxy.$Proxy0.lifeCycleStarted(Unknown Source) ~[na:na]
+ at org.eclipse.jetty.util.component.AbstractLifeCycle.setStarted(AbstractLifeCycle.java:174) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:65) ~[jetty-util-8.1.16.v20140903.jar:8.1.16.v20140903]
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_51]
+ at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
+ at java.lang.reflect.Method.invoke(Unknown Source) ~[na:1.8.0_51]
+ at org.rapla.bootstrap.CustomJettyStarter$2.run(CustomJettyStarter.java:339) ~[eclipse-build/:na]
+ at java.security.AccessController.doPrivileged(Native Method) ~[na:1.8.0_51]
+ at org.rapla.bootstrap.CustomJettyStarter.start(CustomJettyStarter.java:193) ~[eclipse-build/:na]
+ at org.rapla.bootstrap.CustomJettyStarter.main(CustomJettyStarter.java:53) ~[eclipse-build/:na]
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_51]
+ at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) ~[na:1.8.0_51]
+ at java.lang.reflect.Method.invoke(Unknown Source) ~[na:1.8.0_51]
+ at org.rapla.bootstrap.RaplaLoader.startMain(RaplaLoader.java:135) ~[eclipse-build/:na]
+ at org.rapla.bootstrap.RaplaLoader.start(RaplaLoader.java:99) ~[eclipse-build/:na]
+ at org.rapla.bootstrap.RaplaJettyLoader.main(RaplaJettyLoader.java:30) ~[eclipse-build/:na]
+ at org.rapla.bootstrap.RaplaStandaloneLoader.main(RaplaStandaloneLoader.java:17) ~[eclipse-build/:na]
+15:49:06.025 681 [main] INFO org.eclipse.jetty.server.Server - jetty-8.1.16.v20140903
+15:49:06.083 739 [main] INFO o.e.j.d.p.ScanningAppProvider - Deployment monitor C:\Users\las12010\Downloads\Test\2015rapla\rapla-source-1.8.2\contexts at interval 1
+15:49:06.090 746 [main] INFO o.e.jetty.deploy.DeploymentManager - Deployable added: C:\Users\las12010\Downloads\Test\2015rapla\rapla-source-1.8.2\contexts\rapla-develop.xml
+15:49:06.526 1182 [main] INFO rapla - Init RaplaServlet
+15:49:06.528 1184 [main] INFO rapla - Passed JNDI Environment rapladatasource=raplafile env_rapladb=org.hsqldb.jdbc.JDBCDataSource@110a6bf3 env_raplafile=C:\Users\las12010\Downloads\Test\2015rapla\rapla-source-1.8.2/data/data.xml
+15:49:06.537 1193 [main] INFO rapla - Logging via SLF4J API.
+15:49:06.583 1239 [main] INFO rapla - Configured Locale= en_US
+15:49:07.017 1673 [main] INFO rapla - Config=file:/C:/Users/las12010/Downloads/Test/2015rapla/rapla-source-1.8.2/war/WEB-INF/raplaserver.xconf
+15:49:07.018 1674 [main] INFO rapla - Rapla.Version=@doc.version@
+15:49:07.018 1674 [main] INFO rapla - Rapla.Build=@doc.buildtime@
+15:49:07.018 1674 [main] INFO rapla - Timezone America/New_York
+15:49:07.029 1685 [main] INFO rapla - Java.Version=1.7.0_45
+15:49:07.148 1804 [main] INFO rapla.server.serverfacade - Using rapladatasource raplafile
+15:49:07.180 1836 [main] INFO rapla.raplafile - Connecting: file:/C:/Users/las12010/Downloads/Test/2015rapla/rapla-source-1.8.2/data/data.xml
+15:49:07.258 1914 [main] INFO rapla.raplafile - Conflict initialization found 0 conflicts and took 1ms.
+15:49:07.262 1918 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.weekview.server.WeekViewServerPlugin
+15:49:07.263 1919 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.urlencryption.server.UrlEncryptionServerPlugin
+15:49:07.263 1919 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.timeslot.server.TimeslotServerPlugin
+15:49:07.264 1920 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.tableview.internal.server.TableViewServerPlugin
+15:49:07.264 1920 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.notification.server.NotificationServerPlugin
+15:49:07.265 1921 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.monthview.server.MonthViewServerPlugin
+15:49:07.265 1921 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.mail.server.MailServerPlugin
+15:49:07.266 1922 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.jndi.server.JNDIServerPlugin
+15:49:07.266 1922 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.ical.server.ImportFromICalServerPlugin
+15:49:07.267 1923 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.export2ical.server.Export2iCalServerPlugin
+15:49:07.267 1923 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.eventtimecalculator.server.EventTimeCalculatorServerPlugin
+15:49:07.268 1924 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.dayresource.server.DayResourceViewServerPlugin
+15:49:07.268 1924 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.compactweekview.server.CompactWeekViewServerPlugin
+15:49:07.269 1925 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.autoexport.server.AutoExportServerPlugin
+15:49:07.269 1925 [main] INFO rapla.server.plugin - Installed plugin org.rapla.plugin.archiver.server.ArchiverServerPlugin
+15:49:07.689 2345 [main] INFO rapla - Rapla server started
+15:49:07.707 2363 [main] INFO rapla.client - Starting gui
+15:49:07.750 2406 [main] INFO rapla.client.facade - Using rapladatasource remotestore
+15:49:07.776 2432 [main] INFO rapla.remotestore - Connecting to server and starting login..
+15:49:07.777 2433 [main] INFO rapla.remotestore - login successfull
+15:49:07.796 2452 [main] INFO rapla.client.facade - Login admin
+15:49:07.802 2458 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.weekview.WeekViewPlugin
+15:49:07.802 2458 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.urlencryption.UrlEncryptionPlugin
+15:49:07.803 2459 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.timeslot.TimeslotPlugin
+15:49:07.803 2459 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.tempatewizard.TempateWizardPlugin
+15:49:07.803 2459 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.tableview.internal.TableViewPlugin
+15:49:07.804 2460 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.setowner.SetOwnerPlugin
+15:49:07.804 2460 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.rightsreport.RightsReportPlugin
+15:49:07.804 2460 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.periodcopy.PeriodCopyPlugin
+15:49:07.805 2461 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.notification.NotificationPlugin
+15:49:07.805 2461 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.monthview.MonthViewPlugin
+15:49:07.805 2461 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.mail.MailPlugin
+15:49:07.806 2462 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.jndi.JNDIPlugin
+15:49:07.806 2462 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.ical.ImportFromICalPlugin
+15:49:07.806 2462 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.export2ical.Export2iCalPlugin
+15:49:07.807 2463 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.eventtimecalculator.EventTimeCalculatorPlugin
+15:49:07.807 2463 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.defaultwizard.DefaultWizardPlugin
+15:49:07.807 2463 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.dayresource.DayResourceViewPlugin
+15:49:07.807 2463 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.compactweekview.CompactWeekViewPlugin
+15:49:07.808 2464 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.autoexport.AutoExportPlugin
+15:49:07.808 2464 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.archiver.ArchiverPlugin
+15:49:07.808 2464 [main] INFO rapla.client.plugin - Installed plugin org.rapla.plugin.appointmentcounter.AppointmentCounterPlugin
+15:49:20.665 15321 [AWT-EventQueue-0] INFO rapla.client.facade - Logout u405db03-812f-4ff7-b52c-5423a7951cf4
+15:49:20.665 15321 [AWT-EventQueue-0] INFO rapla.remotestore - Disconnecting from server
+15:49:20.666 15322 [AWT-EventQueue-0] INFO rapla.server.session.login - Request Logout admin
+15:49:20.669 15325 [AWT-EventQueue-0] INFO rapla - Shutting down rapla-container
+15:49:20.669 15325 [AWT-EventQueue-0] INFO rapla - Stopping scheduler thread.
+15:49:20.670 15326 [AWT-EventQueue-0] INFO rapla - Stopped scheduler thread.
+15:49:20.722 15378 [AWT-EventQueue-0] INFO rapla.raplafile - Disconnecting: file:/C:/Users/las12010/Downloads/Test/2015rapla/rapla-source-1.8.2/data/data.xml
+15:49:20.722 15378 [AWT-EventQueue-0] INFO rapla.server - Storage service stopped
+15:49:20.804 15460 [AWT-EventQueue-0] INFO o.e.j.server.handler.ContextHandler - stopped o.e.j.w.WebAppContext{/,[file:/C:/Users/las12010/Downloads/Test/2015rapla/rapla-source-1.8.2/war/]}
diff --git a/rapla-source-1.8.2/logs/rapla_calls.log b/rapla/logs/rapla_calls.log
similarity index 100%
rename from rapla-source-1.8.2/logs/rapla_calls.log
rename to rapla/logs/rapla_calls.log
diff --git a/rapla-source-1.8.2/logs/rapla_client.csv b/rapla/logs/rapla_client.csv
similarity index 100%
rename from rapla-source-1.8.2/logs/rapla_client.csv
rename to rapla/logs/rapla_client.csv
diff --git a/rapla-source-1.8.2/logs/request.log b/rapla/logs/request.log
similarity index 100%
rename from rapla-source-1.8.2/logs/request.log
rename to rapla/logs/request.log
diff --git a/rapla-source-1.8.2/raplaselfsigned.ks b/rapla/raplaselfsigned.ks
similarity index 100%
rename from rapla-source-1.8.2/raplaselfsigned.ks
rename to rapla/raplaselfsigned.ks
diff --git a/rapla-source-1.8.2/resources/logback-access.xml b/rapla/resources/logback-access.xml
similarity index 97%
rename from rapla-source-1.8.2/resources/logback-access.xml
rename to rapla/resources/logback-access.xml
index 582855f..0979063 100644
--- a/rapla-source-1.8.2/resources/logback-access.xml
+++ b/rapla/resources/logback-access.xml
@@ -1,18 +1,18 @@
-
-
- ${jetty.home}/logs/request.log
-
-
- ${jetty.home}/logs/request_%d{yyyy-MM-dd}.log
- 5
- true
-
-
-
- %h %l %u %user %date "%r" %s %b
-
-
-
-
-
-
+
+
+ ${jetty.home}/logs/request.log
+
+
+ ${jetty.home}/logs/request_%d{yyyy-MM-dd}.log
+ 5
+ true
+
+
+
+ %h %l %u %user %date "%r" %s %b
+
+
+
+
+
+
diff --git a/rapla-source-1.8.2/resources/logback.xml b/rapla/resources/logback.xml
similarity index 97%
rename from rapla-source-1.8.2/resources/logback.xml
rename to rapla/resources/logback.xml
index 0a16f10..6062a98 100644
--- a/rapla-source-1.8.2/resources/logback.xml
+++ b/rapla/resources/logback.xml
@@ -1,129 +1,129 @@
-
-
-
-
- System.out
-
- DEBUG
- ACCEPT
-
-
- INFO
- ACCEPT
- DENY
-
-
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %class{0}.%method %logger{36} - %msg%n
-
-
-
-
- System.err
-
- WARN
-
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %class{0}.%method %logger{36} - %msg%n
-
-
-
-
- ${jetty.home}/logs/rapla.log
-
-
- ${jetty.home}/logs/rapla_%d{yyyy-MM-dd}.log
- 30
- true
-
-
-
- %d{HH:mm:ss.SSS} %-4relative [%thread] %-5level %logger{35} - %msg%n
-
-
-
-
-
-
-
- ${jetty.home}/logs/rapla_calls.log
-
-
- ${jetty.home}/logs/rapla_calls%d{yyyy-MM-dd}.log
- 2
- true
-
-
-
- %d{HH:mm:ss.SSS} %-4relative [%thread] %-5level %logger{35} - %msg%n
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${jetty.home}/logs/rapla_client.csv
-
-
- ${jetty.home}/logs/rapla_client%d{yyyy-MM-dd}.csv
- 30
- true
-
-
- %d{HH:mm:ss.SSS};%msg%n
-
-
-
-
-
-
-
+
+
+
+
+ System.out
+
+ DEBUG
+ ACCEPT
+
+
+ INFO
+ ACCEPT
+ DENY
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %class{0}.%method %logger{36} - %msg%n
+
+
+
+
+ System.err
+
+ WARN
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %class{0}.%method %logger{36} - %msg%n
+
+
+
+
+ ${jetty.home}/logs/rapla.log
+
+
+ ${jetty.home}/logs/rapla_%d{yyyy-MM-dd}.log
+ 30
+ true
+
+
+
+ %d{HH:mm:ss.SSS} %-4relative [%thread] %-5level %logger{35} - %msg%n
+
+
+
+
+
+
+
+ ${jetty.home}/logs/rapla_calls.log
+
+
+ ${jetty.home}/logs/rapla_calls%d{yyyy-MM-dd}.log
+ 2
+ true
+
+
+
+ %d{HH:mm:ss.SSS} %-4relative [%thread] %-5level %logger{35} - %msg%n
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${jetty.home}/logs/rapla_client.csv
+
+
+ ${jetty.home}/logs/rapla_client%d{yyyy-MM-dd}.csv
+ 30
+ true
+
+
+ %d{HH:mm:ss.SSS};%msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rapla-source-1.8.2/service/bin/InstallTestWrapper-NT.bat b/rapla/service/bin/InstallTestWrapper-NT.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/InstallTestWrapper-NT.bat
rename to rapla/service/bin/InstallTestWrapper-NT.bat
index fbdd3a6..db2b427 100644
--- a/rapla-source-1.8.2/service/bin/InstallTestWrapper-NT.bat
+++ b/rapla/service/bin/InstallTestWrapper-NT.bat
@@ -1,113 +1,113 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper general passthrough startup script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file. This will be used
-rem if the user does not specify a configuration file as the first parameter to
-rem this script. It will not be possible to specify a configuration file on the
-rem command line if _PASS_THROUGH is set.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
-
-rem Makes it possible to override the Wrapper configuration file by specifying it
-rem as the first parameter.
-rem set _WRAPPER_CONF_OVERRIDE=true
-
-rem _PASS_THROUGH tells the script to pass all parameters through to the JVM as
-rem is.
-set _PASS_THROUGH=true
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
- set _WRAPPER_CONF="%~f1"
- if not [%_WRAPPER_CONF%]==[""] (
- shift
- goto :startup
- )
-)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-
-rem Collect an parameters
-:parameters
-set _PARAMETERS=%_PARAMETERS% %1
-shift
-if not [%1]==[] goto :parameters
-
-if [%_PASS_THROUGH%]==[] (
- "%_WRAPPER_EXE%" -i %_WRAPPER_CONF%
-) else (
- "%_WRAPPER_EXE%" -i %_WRAPPER_CONF% -- %_PARAMETERS%
-)
-if not errorlevel 1 goto :eof
-pause
-
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general passthrough startup script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script. It will not be possible to specify a configuration file on the
+rem command line if _PASS_THROUGH is set.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem Makes it possible to override the Wrapper configuration file by specifying it
+rem as the first parameter.
+rem set _WRAPPER_CONF_OVERRIDE=true
+
+rem _PASS_THROUGH tells the script to pass all parameters through to the JVM as
+rem is.
+set _PASS_THROUGH=true
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
+ set _WRAPPER_CONF="%~f1"
+ if not [%_WRAPPER_CONF%]==[""] (
+ shift
+ goto :startup
+ )
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+
+rem Collect an parameters
+:parameters
+set _PARAMETERS=%_PARAMETERS% %1
+shift
+if not [%1]==[] goto :parameters
+
+if [%_PASS_THROUGH%]==[] (
+ "%_WRAPPER_EXE%" -i %_WRAPPER_CONF%
+) else (
+ "%_WRAPPER_EXE%" -i %_WRAPPER_CONF% -- %_PARAMETERS%
+)
+if not errorlevel 1 goto :eof
+pause
+
diff --git a/rapla-source-1.8.2/service/bin/PauseTestWrapper-NT.bat b/rapla/service/bin/PauseTestWrapper-NT.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/PauseTestWrapper-NT.bat
rename to rapla/service/bin/PauseTestWrapper-NT.bat
index 64b403d..1638b94 100644
--- a/rapla-source-1.8.2/service/bin/PauseTestWrapper-NT.bat
+++ b/rapla/service/bin/PauseTestWrapper-NT.bat
@@ -1,100 +1,100 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper general startup script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file. This will be used
-rem if the user does not specify a configuration file as the first parameter to
-rem this script.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
-
-rem Makes it possible to override the Wrapper configuration file by specifying it
-rem as the first parameter.
-rem set _WRAPPER_CONF_OVERRIDE=true
-
-rem Note that it is only possible to pass parameters through to the JVM when
-rem installing the service, or when running in a console.
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
- set _WRAPPER_CONF="%~f1"
- if not [%_WRAPPER_CONF%]==[""] (
- shift
- goto :startup
- )
-)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-"%_WRAPPER_EXE%" -a %_WRAPPER_CONF%
-if not errorlevel 1 goto :eof
-pause
-
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general startup script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem Makes it possible to override the Wrapper configuration file by specifying it
+rem as the first parameter.
+rem set _WRAPPER_CONF_OVERRIDE=true
+
+rem Note that it is only possible to pass parameters through to the JVM when
+rem installing the service, or when running in a console.
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
+ set _WRAPPER_CONF="%~f1"
+ if not [%_WRAPPER_CONF%]==[""] (
+ shift
+ goto :startup
+ )
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -a %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
diff --git a/rapla-source-1.8.2/service/bin/QueryTestWrapper-NT.bat b/rapla/service/bin/QueryTestWrapper-NT.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/QueryTestWrapper-NT.bat
rename to rapla/service/bin/QueryTestWrapper-NT.bat
index ffb7191..ace8223 100644
--- a/rapla-source-1.8.2/service/bin/QueryTestWrapper-NT.bat
+++ b/rapla/service/bin/QueryTestWrapper-NT.bat
@@ -1,98 +1,98 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper general startup script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file. This will be used
-rem if the user does not specify a configuration file as the first parameter to
-rem this script.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
-
-rem Makes it possible to override the Wrapper configuration file by specifying it
-rem as the first parameter.
-rem set _WRAPPER_CONF_OVERRIDE=true
-
-rem Note that it is only possible to pass parameters through to the JVM when
-rem installing the service, or when running in a console.
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
- set _WRAPPER_CONF="%~f1"
- if not [%_WRAPPER_CONF%]==[""] (
- shift
- goto :startup
- )
-)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-"%_WRAPPER_EXE%" -q %_WRAPPER_CONF%
-pause
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general startup script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem Makes it possible to override the Wrapper configuration file by specifying it
+rem as the first parameter.
+rem set _WRAPPER_CONF_OVERRIDE=true
+
+rem Note that it is only possible to pass parameters through to the JVM when
+rem installing the service, or when running in a console.
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
+ set _WRAPPER_CONF="%~f1"
+ if not [%_WRAPPER_CONF%]==[""] (
+ shift
+ goto :startup
+ )
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -q %_WRAPPER_CONF%
+pause
diff --git a/rapla-source-1.8.2/service/bin/ResumeTestWrapper-NT.bat b/rapla/service/bin/ResumeTestWrapper-NT.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/ResumeTestWrapper-NT.bat
rename to rapla/service/bin/ResumeTestWrapper-NT.bat
index 41abe5c..65f0e12 100644
--- a/rapla-source-1.8.2/service/bin/ResumeTestWrapper-NT.bat
+++ b/rapla/service/bin/ResumeTestWrapper-NT.bat
@@ -1,100 +1,100 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper general startup script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file. This will be used
-rem if the user does not specify a configuration file as the first parameter to
-rem this script.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
-
-rem Makes it possible to override the Wrapper configuration file by specifying it
-rem as the first parameter.
-rem set _WRAPPER_CONF_OVERRIDE=true
-
-rem Note that it is only possible to pass parameters through to the JVM when
-rem installing the service, or when running in a console.
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
- set _WRAPPER_CONF="%~f1"
- if not [%_WRAPPER_CONF%]==[""] (
- shift
- goto :startup
- )
-)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-"%_WRAPPER_EXE%" -e %_WRAPPER_CONF%
-if not errorlevel 1 goto :eof
-pause
-
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general startup script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem Makes it possible to override the Wrapper configuration file by specifying it
+rem as the first parameter.
+rem set _WRAPPER_CONF_OVERRIDE=true
+
+rem Note that it is only possible to pass parameters through to the JVM when
+rem installing the service, or when running in a console.
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
+ set _WRAPPER_CONF="%~f1"
+ if not [%_WRAPPER_CONF%]==[""] (
+ shift
+ goto :startup
+ )
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -e %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
diff --git a/rapla-source-1.8.2/service/bin/StartTestWrapper-NT.bat b/rapla/service/bin/StartTestWrapper-NT.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/StartTestWrapper-NT.bat
rename to rapla/service/bin/StartTestWrapper-NT.bat
index 330d48a..bb23c0f 100644
--- a/rapla-source-1.8.2/service/bin/StartTestWrapper-NT.bat
+++ b/rapla/service/bin/StartTestWrapper-NT.bat
@@ -1,100 +1,100 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper general startup script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file. This will be used
-rem if the user does not specify a configuration file as the first parameter to
-rem this script.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
-
-rem Makes it possible to override the Wrapper configuration file by specifying it
-rem as the first parameter.
-rem set _WRAPPER_CONF_OVERRIDE=true
-
-rem Note that it is only possible to pass parameters through to the JVM when
-rem installing the service, or when running in a console.
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
- set _WRAPPER_CONF="%~f1"
- if not [%_WRAPPER_CONF%]==[""] (
- shift
- goto :startup
- )
-)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-"%_WRAPPER_EXE%" -t %_WRAPPER_CONF%
-if not errorlevel 1 goto :eof
-pause
-
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general startup script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem Makes it possible to override the Wrapper configuration file by specifying it
+rem as the first parameter.
+rem set _WRAPPER_CONF_OVERRIDE=true
+
+rem Note that it is only possible to pass parameters through to the JVM when
+rem installing the service, or when running in a console.
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
+ set _WRAPPER_CONF="%~f1"
+ if not [%_WRAPPER_CONF%]==[""] (
+ shift
+ goto :startup
+ )
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -t %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
diff --git a/rapla-source-1.8.2/service/bin/StopTestWrapper-NT.bat b/rapla/service/bin/StopTestWrapper-NT.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/StopTestWrapper-NT.bat
rename to rapla/service/bin/StopTestWrapper-NT.bat
index 7395fe0..91c5c84 100644
--- a/rapla-source-1.8.2/service/bin/StopTestWrapper-NT.bat
+++ b/rapla/service/bin/StopTestWrapper-NT.bat
@@ -1,100 +1,100 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper general startup script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file. This will be used
-rem if the user does not specify a configuration file as the first parameter to
-rem this script.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
-
-rem Makes it possible to override the Wrapper configuration file by specifying it
-rem as the first parameter.
-rem set _WRAPPER_CONF_OVERRIDE=true
-
-rem Note that it is only possible to pass parameters through to the JVM when
-rem installing the service, or when running in a console.
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
- set _WRAPPER_CONF="%~f1"
- if not [%_WRAPPER_CONF%]==[""] (
- shift
- goto :startup
- )
-)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-"%_WRAPPER_EXE%" -p %_WRAPPER_CONF%
-if not errorlevel 1 goto :eof
-pause
-
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general startup script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem Makes it possible to override the Wrapper configuration file by specifying it
+rem as the first parameter.
+rem set _WRAPPER_CONF_OVERRIDE=true
+
+rem Note that it is only possible to pass parameters through to the JVM when
+rem installing the service, or when running in a console.
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
+ set _WRAPPER_CONF="%~f1"
+ if not [%_WRAPPER_CONF%]==[""] (
+ shift
+ goto :startup
+ )
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -p %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
diff --git a/rapla-source-1.8.2/service/bin/TestWrapper.bat b/rapla/service/bin/TestWrapper.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/TestWrapper.bat
rename to rapla/service/bin/TestWrapper.bat
index 8b0e230..07db395 100644
--- a/rapla-source-1.8.2/service/bin/TestWrapper.bat
+++ b/rapla/service/bin/TestWrapper.bat
@@ -1,121 +1,121 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper general passthrough startup script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-rem
-rem ********************************************************************
-rem NOTE - This script has been modified to run the TestWrapper sample
-rem application and should NOT be used as a base for your own
-rem applications. All of the documentation assumes that you are
-rem working from the default source script:
-rem WRAPPER_HOME/src/bin/App.bat.in
-rem ********************************************************************
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file. This will be used
-rem if the user does not specify a configuration file as the first parameter to
-rem this script. It will not be possible to specify a configuration file on the
-rem command line if _PASS_THROUGH is set.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
-
-rem Makes it possible to override the Wrapper configuration file by specifying it
-rem as the first parameter.
-rem set _WRAPPER_CONF_OVERRIDE=true
-
-rem _PASS_THROUGH tells the script to pass all parameters through to the JVM as
-rem is.
-set _PASS_THROUGH=true
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
- set _WRAPPER_CONF="%~f1"
- if not [%_WRAPPER_CONF%]==[""] (
- shift
- goto :startup
- )
-)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-
-rem Collect an parameters
-:parameters
-set _PARAMETERS=%_PARAMETERS% %1
-shift
-if not [%1]==[] goto :parameters
-
-if [%_PASS_THROUGH%]==[] (
- "%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
-) else (
- "%_WRAPPER_EXE%" -c %_WRAPPER_CONF% -- %_PARAMETERS%
-)
-if not errorlevel 1 goto :eof
-pause
-
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general passthrough startup script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+rem
+rem ********************************************************************
+rem NOTE - This script has been modified to run the TestWrapper sample
+rem application and should NOT be used as a base for your own
+rem applications. All of the documentation assumes that you are
+rem working from the default source script:
+rem WRAPPER_HOME/src/bin/App.bat.in
+rem ********************************************************************
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script. It will not be possible to specify a configuration file on the
+rem command line if _PASS_THROUGH is set.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem Makes it possible to override the Wrapper configuration file by specifying it
+rem as the first parameter.
+rem set _WRAPPER_CONF_OVERRIDE=true
+
+rem _PASS_THROUGH tells the script to pass all parameters through to the JVM as
+rem is.
+set _PASS_THROUGH=true
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
+ set _WRAPPER_CONF="%~f1"
+ if not [%_WRAPPER_CONF%]==[""] (
+ shift
+ goto :startup
+ )
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+
+rem Collect an parameters
+:parameters
+set _PARAMETERS=%_PARAMETERS% %1
+shift
+if not [%1]==[] goto :parameters
+
+if [%_PASS_THROUGH%]==[] (
+ "%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
+) else (
+ "%_WRAPPER_EXE%" -c %_WRAPPER_CONF% -- %_PARAMETERS%
+)
+if not errorlevel 1 goto :eof
+pause
+
diff --git a/rapla-source-1.8.2/service/bin/TestWrapperCommand.bat b/rapla/service/bin/TestWrapperCommand.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/TestWrapperCommand.bat
rename to rapla/service/bin/TestWrapperCommand.bat
index 0903866..42ea782 100644
--- a/rapla-source-1.8.2/service/bin/TestWrapperCommand.bat
+++ b/rapla/service/bin/TestWrapperCommand.bat
@@ -1,153 +1,153 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper command based script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file.
-rem (Do not remove quotes.)
-set _WRAPPER_CONF="../conf/wrapper.conf"
-
-rem _FIXED_COMMAND tells the script to use a hard coded command rather than
-rem expecting the first parameter of the command line to be the command.
-rem By default the command will will be expected to be the first parameter.
-rem set _FIXED_COMMAND=console
-
-rem _PASS_THROUGH tells the script to pass all parameters through to the JVM
-rem as is. If _FIXED_COMMAND is specified then all parameters will be passed.
-rem If not set then all parameters starting with the second will be passed.
-set _PASS_THROUGH=true
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem Find the application home.
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-:conf
-if not [%_FIXED_COMMAND%]==[] (
- set _COMMAND=%_FIXED_COMMAND%
-) else (
- set _COMMAND=%1
- shift
-)
-
-rem Collect all parameters
-:parameters
-set _PARAMETERS=%_PARAMETERS% %1
-shift
-if not [%1]==[] goto parameters
-
-:callcommand
-rem
-rem Run the application.
-rem At runtime, the current directory will be that of wrapper.exe
-rem
-set _MATCHED=true
-if [%_COMMAND%]==[console] (
- if [%_PASS_THROUGH%]==[] (
- "%_WRAPPER_EXE%" -c "%_WRAPPER_CONF%" %_PARAMETERS%
- ) else (
- "%_WRAPPER_EXE%" -c "%_WRAPPER_CONF%" -- %_PARAMETERS%
- )
-) else if [%_COMMAND%]==[start] (
- call :start
-) else if [%_COMMAND%]==[stop] (
- call :stop
-) else if [%_COMMAND%]==[install] (
- if [%_PASS_THROUGH%]==[] (
- "%_WRAPPER_EXE%" -i "%_WRAPPER_CONF%" %_PARAMETERS%
- ) else (
- "%_WRAPPER_EXE%" -i "%_WRAPPER_CONF%" -- %_PARAMETERS%
- )
-) else if [%_COMMAND%]==[pause] (
- "%_WRAPPER_EXE%" -a "%_WRAPPER_CONF%"
-) else if [%_COMMAND%]==[resume] (
- "%_WRAPPER_EXE%" -e "%_WRAPPER_CONF%"
-) else if [%_COMMAND%]==[status] (
- "%_WRAPPER_EXE%" -q "%_WRAPPER_CONF%"
-) else if [%_COMMAND%]==[remove] (
- "%_WRAPPER_EXE%" -r "%_WRAPPER_CONF%"
-) else if [%_COMMAND%]==[restart] (
- call :stop
- call :start
-) else (
- set _MATCHED=
- goto showusage
-)
-
-if errorlevel 1 (
- if [%_MATCHED%]==[] goto showusage
-)
-goto :eof
-
-:showusage
-rem A command was not specified, or it was now known.
-if not [%_COMMAND%]==[] (
- echo Unknown command: %_COMMAND%
- echo.
-)
-if [%_PASS_THROUGH%]==[] (
- echo Usage: %0 [ console : start : pause : resume : stop : restart : install : remove : status ]
-) else (
- echo Usage: %0 [ console {JavaAppArgs} : start : pause : resume : stop : restart : install {JavaAppArgs} : remove : status ]
-)
-pause
-goto :eof
-
-
-:start
- "%_WRAPPER_EXE%" -t "%_WRAPPER_CONF%"
- goto :eof
-:stop
- "%_WRAPPER_EXE%" -p "%_WRAPPER_CONF%"
- goto :eof
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper command based script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file.
+rem (Do not remove quotes.)
+set _WRAPPER_CONF="../conf/wrapper.conf"
+
+rem _FIXED_COMMAND tells the script to use a hard coded command rather than
+rem expecting the first parameter of the command line to be the command.
+rem By default the command will will be expected to be the first parameter.
+rem set _FIXED_COMMAND=console
+
+rem _PASS_THROUGH tells the script to pass all parameters through to the JVM
+rem as is. If _FIXED_COMMAND is specified then all parameters will be passed.
+rem If not set then all parameters starting with the second will be passed.
+set _PASS_THROUGH=true
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem Find the application home.
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+:conf
+if not [%_FIXED_COMMAND%]==[] (
+ set _COMMAND=%_FIXED_COMMAND%
+) else (
+ set _COMMAND=%1
+ shift
+)
+
+rem Collect all parameters
+:parameters
+set _PARAMETERS=%_PARAMETERS% %1
+shift
+if not [%1]==[] goto parameters
+
+:callcommand
+rem
+rem Run the application.
+rem At runtime, the current directory will be that of wrapper.exe
+rem
+set _MATCHED=true
+if [%_COMMAND%]==[console] (
+ if [%_PASS_THROUGH%]==[] (
+ "%_WRAPPER_EXE%" -c "%_WRAPPER_CONF%" %_PARAMETERS%
+ ) else (
+ "%_WRAPPER_EXE%" -c "%_WRAPPER_CONF%" -- %_PARAMETERS%
+ )
+) else if [%_COMMAND%]==[start] (
+ call :start
+) else if [%_COMMAND%]==[stop] (
+ call :stop
+) else if [%_COMMAND%]==[install] (
+ if [%_PASS_THROUGH%]==[] (
+ "%_WRAPPER_EXE%" -i "%_WRAPPER_CONF%" %_PARAMETERS%
+ ) else (
+ "%_WRAPPER_EXE%" -i "%_WRAPPER_CONF%" -- %_PARAMETERS%
+ )
+) else if [%_COMMAND%]==[pause] (
+ "%_WRAPPER_EXE%" -a "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[resume] (
+ "%_WRAPPER_EXE%" -e "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[status] (
+ "%_WRAPPER_EXE%" -q "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[remove] (
+ "%_WRAPPER_EXE%" -r "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[restart] (
+ call :stop
+ call :start
+) else (
+ set _MATCHED=
+ goto showusage
+)
+
+if errorlevel 1 (
+ if [%_MATCHED%]==[] goto showusage
+)
+goto :eof
+
+:showusage
+rem A command was not specified, or it was now known.
+if not [%_COMMAND%]==[] (
+ echo Unknown command: %_COMMAND%
+ echo.
+)
+if [%_PASS_THROUGH%]==[] (
+ echo Usage: %0 [ console : start : pause : resume : stop : restart : install : remove : status ]
+) else (
+ echo Usage: %0 [ console {JavaAppArgs} : start : pause : resume : stop : restart : install {JavaAppArgs} : remove : status ]
+)
+pause
+goto :eof
+
+
+:start
+ "%_WRAPPER_EXE%" -t "%_WRAPPER_CONF%"
+ goto :eof
+:stop
+ "%_WRAPPER_EXE%" -p "%_WRAPPER_CONF%"
+ goto :eof
diff --git a/rapla-source-1.8.2/service/bin/UninstallTestWrapper-NT.bat b/rapla/service/bin/UninstallTestWrapper-NT.bat
similarity index 96%
rename from rapla-source-1.8.2/service/bin/UninstallTestWrapper-NT.bat
rename to rapla/service/bin/UninstallTestWrapper-NT.bat
index f6ae553..901b05b 100644
--- a/rapla-source-1.8.2/service/bin/UninstallTestWrapper-NT.bat
+++ b/rapla/service/bin/UninstallTestWrapper-NT.bat
@@ -1,100 +1,100 @@
-@echo off
-setlocal
-
-rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-rem http://www.tanukisoftware.com
-rem All rights reserved.
-rem
-rem This software is the proprietary information of Tanuki Software.
-rem You shall use it only in accordance with the terms of the
-rem license agreement you entered into with Tanuki Software.
-rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-rem
-rem Java Service Wrapper general startup script.
-rem
-
-rem -----------------------------------------------------------------------------
-rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
-
-rem The base name for the Wrapper binary.
-set _WRAPPER_BASE=wrapper
-
-rem The name and location of the Wrapper configuration file. This will be used
-rem if the user does not specify a configuration file as the first parameter to
-rem this script.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
-
-rem Makes it possible to override the Wrapper configuration file by specifying it
-rem as the first parameter.
-rem set _WRAPPER_CONF_OVERRIDE=true
-
-rem Note that it is only possible to pass parameters through to the JVM when
-rem installing the service, or when running in a console.
-
-rem Do not modify anything beyond this point
-rem -----------------------------------------------------------------------------
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
-rem
-rem Decide on the specific Wrapper binary to use (See delta-pack)
-rem
-if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
-if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-goto search
-:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-goto search
-:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
-goto search
-:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_WRAPPER_L_EXE%
-echo %_WRAPPER_EXE%
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
- set _WRAPPER_CONF="%~f1"
- if not [%_WRAPPER_CONF%]==[""] (
- shift
- goto :startup
- )
-)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-"%_WRAPPER_EXE%" -r %_WRAPPER_CONF%
-if not errorlevel 1 goto :eof
-pause
-
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general startup script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.17 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem Makes it possible to override the Wrapper configuration file by specifying it
+rem as the first parameter.
+rem set _WRAPPER_CONF_OVERRIDE=true
+
+rem Note that it is only possible to pass parameters through to the JVM when
+rem installing the service, or when running in a console.
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
+ set _WRAPPER_CONF="%~f1"
+ if not [%_WRAPPER_CONF%]==[""] (
+ shift
+ goto :startup
+ )
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -r %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
diff --git a/rapla-source-1.8.2/service/bin/testwrapper b/rapla/service/bin/testwrapper
similarity index 97%
rename from rapla-source-1.8.2/service/bin/testwrapper
rename to rapla/service/bin/testwrapper
index a612859..ac62529 100644
--- a/rapla-source-1.8.2/service/bin/testwrapper
+++ b/rapla/service/bin/testwrapper
@@ -1,1629 +1,1629 @@
-#! /bin/sh
-
-#
-# Copyright (c) 1999, 2012 Tanuki Software, Ltd.
-# http://www.tanukisoftware.com
-# All rights reserved.
-#
-# This software is the proprietary information of Tanuki Software.
-# You shall use it only in accordance with the terms of the
-# license agreement you entered into with Tanuki Software.
-# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-#
-# Java Service Wrapper sh script. Suitable for starting and stopping
-# wrapped Java applications on UNIX platforms.
-#
-
-#-----------------------------------------------------------------------------
-# These settings can be modified to fit the needs of your application
-# Optimized for use with version 3.5.17 of the Wrapper.
-
-#********************************************************************
-# NOTE - This script has been modified to run the TestWrapper sample
-# application and should NOT be used as a base for your own
-# applications. All of the documentation assumes that you are
-# working from the default source script:
-# WRAPPER_HOME/src/bin/sh.script.in
-#********************************************************************
-
-# Application
-APP_NAME="testwrapper"
-APP_LONG_NAME="Test Wrapper Sample Application"
-
-# Wrapper
-WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../conf/wrapper.conf"
-
-# Priority at which to run the wrapper. See "man nice" for valid priorities.
-# nice is only used if a priority is specified.
-PRIORITY=
-
-# Location of the pid file.
-PIDDIR="."
-
-# FIXED_COMMAND tells the script to use a hard coded action rather than
-# expecting the first parameter of the command line to be the command.
-# By default the command will will be expected to be the first parameter.
-#FIXED_COMMAND=console
-
-# PASS_THROUGH tells the script to pass all arguments through to the JVM
-# as is. If FIXED_COMMAND is specified then all arguments will be passed.
-# If not set then all arguments starting with the second will be passed.
-PASS_THROUGH=true
-
-# If uncommented, causes the Wrapper to be shutdown using an anchor file.
-# When launched with the 'start' command, it will also ignore all INT and
-# TERM signals.
-#IGNORE_SIGNALS=true
-
-# Wrapper will start the JVM asynchronously. Your application may have some
-# initialization tasks and it may be desirable to wait a few seconds
-# before returning. For example, to delay the invocation of following
-# startup scripts. Setting WAIT_AFTER_STARTUP to a positive number will
-# cause the start command to delay for the indicated period of time
-# (in seconds).
-#
-WAIT_AFTER_STARTUP=0
-
-# If set, wait for the wrapper to report that the daemon has started
-WAIT_FOR_STARTED_STATUS=true
-WAIT_FOR_STARTED_TIMEOUT=120
-
-# If set, the status, start_msg and stop_msg commands will print out detailed
-# state information on the Wrapper and Java processes.
-#DETAIL_STATUS=true
-
-# If set, the 'pause' and 'resume' commands will be enabled. These make it
-# possible to pause the JVM or Java application without completely stopping
-# the Wrapper. See the wrapper.pausable and wrapper.pausable.stop_jvm
-# properties for more information.
-#PAUSABLE=true
-
-# If specified, the Wrapper will be run as the specified user.
-# IMPORTANT - Make sure that the user has the required privileges to write
-# the PID file and wrapper.log files. Failure to be able to write the log
-# file will cause the Wrapper to exit without any way to write out an error
-# message.
-# NOTE - This will set the user which is used to run the Wrapper as well as
-# the JVM and is not useful in situations where a privileged resource or
-# port needs to be allocated prior to the user being changed.
-#RUN_AS_USER=
-
-# By default we show a detailed usage block. Uncomment to show brief usage.
-#BRIEF_USAGE=true
-
-# flag for using upstart when installing (rather than init.d rc.d)
-USE_UPSTART=
-
-# When installing on On Mac OSX platforms, the following domain will be used to
-# prefix the plist file name.
-PLIST_DOMAIN=org.tanukisoftware.wrapper
-
-# The following two lines are used by the chkconfig command. Change as is
-# appropriate for your application. They should remain commented.
-# chkconfig: 2345 20 80
-# description: Test Wrapper Sample Application
-
-# Initialization block for the install_initd and remove_initd scripts used by
-# SUSE linux distributions.
-### BEGIN INIT INFO
-# Provides: testwrapper
-# Required-Start: $local_fs $network $syslog
-# Should-Start:
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Test Wrapper Sample Application
-# Description: Test Wrapper Sample Application Description
-### END INIT INFO
-
-# Do not modify anything beyond this point
-#-----------------------------------------------------------------------------
-
-if [ -n "$FIXED_COMMAND" ]
-then
- COMMAND="$FIXED_COMMAND"
-else
- COMMAND="$1"
-fi
-
-
-# Required for HP-UX Startup
-if [ `uname -s` = "HP-UX" -o `uname -s` = "HP-UX64" ] ; then
- PATH=$PATH:/usr/bin
-fi
-
-# Get the fully qualified path to the script
-case $0 in
- /*)
- SCRIPT="$0"
- ;;
- *)
- PWD=`pwd`
- SCRIPT="$PWD/$0"
- ;;
-esac
-
-# Resolve the true real path without any sym links.
-CHANGED=true
-while [ "X$CHANGED" != "X" ]
-do
- # Change spaces to ":" so the tokens can be parsed.
- SAFESCRIPT=`echo $SCRIPT | sed -e 's; ;:;g'`
- # Get the real path to this script, resolving any symbolic links
- TOKENS=`echo $SAFESCRIPT | sed -e 's;/; ;g'`
- REALPATH=
- for C in $TOKENS; do
- # Change any ":" in the token back to a space.
- C=`echo $C | sed -e 's;:; ;g'`
- REALPATH="$REALPATH/$C"
- # If REALPATH is a sym link, resolve it. Loop for nested links.
- while [ -h "$REALPATH" ] ; do
- LS="`ls -ld "$REALPATH"`"
- LINK="`expr "$LS" : '.*-> \(.*\)$'`"
- if expr "$LINK" : '/.*' > /dev/null; then
- # LINK is absolute.
- REALPATH="$LINK"
- else
- # LINK is relative.
- REALPATH="`dirname "$REALPATH"`""/$LINK"
- fi
- done
- done
-
- if [ "$REALPATH" = "$SCRIPT" ]
- then
- CHANGED=""
- else
- SCRIPT="$REALPATH"
- fi
-done
-
-# Get the location of the script.
-REALDIR=`dirname "$REALPATH"`
-# Normalize the path
-REALDIR=`cd "${REALDIR}"; pwd`
-
-# If the PIDDIR is relative, set its value relative to the full REALPATH to avoid problems if
-# the working directory is later changed.
-FIRST_CHAR=`echo $PIDDIR | cut -c1,1`
-if [ "$FIRST_CHAR" != "/" ]
-then
- PIDDIR=$REALDIR/$PIDDIR
-fi
-# Same test for WRAPPER_CMD
-FIRST_CHAR=`echo $WRAPPER_CMD | cut -c1,1`
-if [ "$FIRST_CHAR" != "/" ]
-then
- WRAPPER_CMD=$REALDIR/$WRAPPER_CMD
-fi
-# Same test for WRAPPER_CONF
-FIRST_CHAR=`echo $WRAPPER_CONF | cut -c1,1`
-if [ "$FIRST_CHAR" != "/" ]
-then
- WRAPPER_CONF=$REALDIR/$WRAPPER_CONF
-fi
-
-# Process ID
-ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
-COMMANDFILE="$PIDDIR/$APP_NAME.command"
-STATUSFILE="$PIDDIR/$APP_NAME.status"
-JAVASTATUSFILE="$PIDDIR/$APP_NAME.java.status"
-PIDFILE="$PIDDIR/$APP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="$LOCKDIR/$APP_NAME"
-pid=""
-
-# Resolve the location of the 'ps' command
-PSEXE="/usr/ucb/ps"
- if [ ! -x "$PSEXE" ]
- then
- PSEXE="/usr/bin/ps"
- if [ ! -x "$PSEXE" ]
- then
- PSEXE="/bin/ps"
- if [ ! -x "$PSEXE" ]
- then
- eval echo `gettext 'Unable to locate "ps".'`
- eval echo `gettext 'Please report this message along with the location of the command on your system.'`
- exit 1
- fi
- fi
- fi
-
-TREXE="/usr/bin/tr"
-if [ ! -x "$TREXE" ]
-then
- TREXE="/bin/tr"
- if [ ! -x "$TREXE" ]
- then
- eval echo `gettext 'Unable to locate "tr".'`
- eval echo `gettext 'Please report this message along with the location of the command on your system.'`
- exit 1
- fi
-fi
-# Resolve the os
-DIST_OS=`uname -s | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
-case "$DIST_OS" in
- 'sunos')
- DIST_OS="solaris"
- ;;
- 'hp-ux' | 'hp-ux64')
- # HP-UX needs the XPG4 version of ps (for -o args)
- DIST_OS="hpux"
- UNIX95=""
- export UNIX95
- ;;
- 'darwin')
- DIST_OS="macosx"
- ;;
- 'unix_sv')
- DIST_OS="unixware"
- ;;
- 'os/390')
- DIST_OS="zos"
- ;;
-esac
-
-# Resolve the architecture
-if [ "$DIST_OS" = "macosx" ]
-then
- OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'`
- DIST_ARCH="universal"
- if [[ "$OS_VER" < "10.5.0" ]]
- then
- DIST_BITS="32"
- else
- if [ "X`sysctl -n hw.cpu64bit_capable`" == "X1" ]
- then
- DIST_BITS="64"
- else
- DIST_BITS="32"
- fi
- fi
- APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME}
- APP_PLIST=${APP_PLIST_BASE}.plist
-else
- DIST_ARCH=
- DIST_ARCH=`uname -p 2>/dev/null | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
- if [ "X$DIST_ARCH" = "X" ]
- then
- DIST_ARCH="unknown"
- fi
- if [ "$DIST_ARCH" = "unknown" ]
- then
- DIST_ARCH=`uname -m 2>/dev/null | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
- fi
- case "$DIST_ARCH" in
- 'athlon' | 'i386' | 'i486' | 'i586' | 'i686')
- DIST_ARCH="x86"
- if [ "${DIST_OS}" = "solaris" ] ; then
- DIST_BITS=`isainfo -b`
- else
- DIST_BITS="32"
- fi
- ;;
- 'amd64' | 'x86_64')
- DIST_ARCH="x86"
- DIST_BITS="64"
- ;;
- 'ia32')
- DIST_ARCH="ia"
- DIST_BITS="32"
- ;;
- 'ia64' | 'ia64n' | 'ia64w')
- DIST_ARCH="ia"
- DIST_BITS="64"
- ;;
- 'ip27')
- DIST_ARCH="mips"
- DIST_BITS="32"
- ;;
- 'power' | 'powerpc' | 'power_pc' | 'ppc64')
- if [ "${DIST_ARCH}" = "ppc64" ] ; then
- DIST_BITS="64"
- else
- DIST_BITS="32"
- fi
- DIST_ARCH="ppc"
- if [ "${DIST_OS}" = "aix" ] ; then
- if [ `getconf KERNEL_BITMODE` -eq 64 ]; then
- DIST_BITS="64"
- else
- DIST_BITS="32"
- fi
- fi
- ;;
- 'pa_risc' | 'pa-risc')
- DIST_ARCH="parisc"
- if [ `getconf KERNEL_BITS` -eq 64 ]; then
- DIST_BITS="64"
- else
- DIST_BITS="32"
- fi
- ;;
- 'sun4u' | 'sparcv9' | 'sparc')
- DIST_ARCH="sparc"
- DIST_BITS=`isainfo -b`
- ;;
- '9000/800' | '9000/785')
- DIST_ARCH="parisc"
- if [ `getconf KERNEL_BITS` -eq 64 ]; then
- DIST_BITS="64"
- else
- DIST_BITS="32"
- fi
- ;;
- '2064' | '2066' | '2084' | '2086' | '2094' | '2096' | '2097' | '2098' | '2817')
- DIST_ARCH="390"
- DIST_BITS="64"
- ;;
- armv*)
- if [ -z "`readelf -A /proc/self/exe | grep Tag_ABI_VFP_args`" ] ; then
- DIST_ARCH="armel"
- DIST_BITS="32"
- else
- DIST_ARCH="armhf"
- DIST_BITS="32"
- fi
- ;;
- esac
-fi
-
-# OSX always places Java in the same location so we can reliably set JAVA_HOME
-if [ "$DIST_OS" = "macosx" ]
-then
- if [ -z "$JAVA_HOME" ]; then
- JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
- fi
-fi
-
-# Test Echo
-ECHOTEST=`echo -n "x"`
-if [ "$ECHOTEST" = "x" ]
-then
- ECHOOPT="-n "
-else
- ECHOOPT=""
-fi
-
-
-gettext() {
- "$WRAPPER_CMD" --translate "$1" "$WRAPPER_CONF" 2>/dev/null
- if [ $? != 0 ] ; then
- echo "$1"
- fi
-}
-
-outputFile() {
- if [ -f "$1" ]
- then
- eval echo `gettext ' $1 Found but not executable.'`;
- else
- echo " $1"
- fi
-}
-
-# Decide on the wrapper binary to use.
-# If the bits of the OS could be detected, we will try to look for the
-# binary with the correct bits value. If it doesn't exist, fall back
-# and look for the 32-bit binary. If that doesn't exist either then
-# look for the default.
-WRAPPER_TEST_CMD=""
-if [ -f "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-$DIST_BITS" ]
-then
- WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-$DIST_BITS"
- if [ ! -x "$WRAPPER_TEST_CMD" ]
- then
- chmod +x "$WRAPPER_TEST_CMD" 2>/dev/null
- fi
- if [ -x "$WRAPPER_TEST_CMD" ]
- then
- WRAPPER_CMD="$WRAPPER_TEST_CMD"
- else
- outputFile "$WRAPPER_TEST_CMD"
- WRAPPER_TEST_CMD=""
- fi
-fi
-if [ -f "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32" -a -z "$WRAPPER_TEST_CMD" ]
-then
- WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
- if [ ! -x "$WRAPPER_TEST_CMD" ]
- then
- chmod +x "$WRAPPER_TEST_CMD" 2>/dev/null
- fi
- if [ -x "$WRAPPER_TEST_CMD" ]
- then
- WRAPPER_CMD="$WRAPPER_TEST_CMD"
- else
- outputFile "$WRAPPER_TEST_CMD"
- WRAPPER_TEST_CMD=""
- fi
-fi
-if [ -f "$WRAPPER_CMD" -a -z "$WRAPPER_TEST_CMD" ]
-then
- WRAPPER_TEST_CMD="$WRAPPER_CMD"
- if [ ! -x "$WRAPPER_TEST_CMD" ]
- then
- chmod +x "$WRAPPER_TEST_CMD" 2>/dev/null
- fi
- if [ -x "$WRAPPER_TEST_CMD" ]
- then
- WRAPPER_CMD="$WRAPPER_TEST_CMD"
- else
- outputFile "$WRAPPER_TEST_CMD"
- WRAPPER_TEST_CMD=""
- fi
-fi
-if [ -z "$WRAPPER_TEST_CMD" ]
-then
- eval echo `gettext 'Unable to locate any of the following binaries:'`
- outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-$DIST_BITS"
- if [ ! "$DIST_BITS" = "32" ]
- then
- outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
- fi
- outputFile "$WRAPPER_CMD"
-
- exit 1
-fi
-
-
-# Build the nice clause
-if [ "X$PRIORITY" = "X" ]
-then
- CMDNICE=""
-else
- CMDNICE="nice -$PRIORITY"
-fi
-
-# Build the anchor file clause.
-if [ "X$IGNORE_SIGNALS" = "X" ]
-then
- ANCHORPROP=
- IGNOREPROP=
-else
- ANCHORPROP=wrapper.anchorfile=\"$ANCHORFILE\"
- IGNOREPROP=wrapper.ignore_signals=TRUE
-fi
-
-# Build the status file clause.
-if [ "X$DETAIL_STATUS$WAIT_FOR_STARTED_STATUS" = "X" ]
-then
- STATUSPROP=
-else
- STATUSPROP="wrapper.statusfile=\"$STATUSFILE\" wrapper.java.statusfile=\"$JAVASTATUSFILE\""
-fi
-
-# Build the command file clause.
-if [ -n "$PAUSABLE" ]
-then
- COMMANDPROP="wrapper.commandfile=\"$COMMANDFILE\" wrapper.pausable=TRUE"
-else
- COMMANDPROP=
-fi
-
-if [ ! -n "$WAIT_FOR_STARTED_STATUS" ]
-then
- WAIT_FOR_STARTED_STATUS=true
-fi
-
-if [ $WAIT_FOR_STARTED_STATUS = true ] ; then
- DETAIL_STATUS=true
-fi
-
-
-# Build the lock file clause. Only create a lock file if the lock directory exists on this platform.
-LOCKPROP=
-if [ -d $LOCKDIR ]
-then
- if [ -w $LOCKDIR ]
- then
- LOCKPROP=wrapper.lockfile=\"$LOCKFILE\"
- fi
-fi
-
-prepAdditionalParams() {
- ADDITIONAL_PARA=""
- if [ -n "$PASS_THROUGH" ] ; then
- ADDITIONAL_PARA="--"
- fi
- while [ -n "$1" ] ; do
- ADDITIONAL_PARA="$ADDITIONAL_PARA \"$1\""
- shift
- done
-}
-
-checkUser() {
- # $1 touchLock flag
- # $2.. [command] args
-
- # Check the configured user. If necessary rerun this script as the desired user.
- if [ "X$RUN_AS_USER" != "X" ]
- then
- # Resolve the location of the 'id' command
- IDEXE="/usr/xpg4/bin/id"
- if [ ! -x "$IDEXE" ]
- then
- IDEXE="/usr/bin/id"
- if [ ! -x "$IDEXE" ]
- then
- eval echo `gettext 'Unable to locate "id".'`
- eval echo `gettext 'Please report this message along with the location of the command on your system.'`
- exit 1
- fi
- fi
-
- if [ "`$IDEXE -u -n`" = "$RUN_AS_USER" ]
- then
- # Already running as the configured user. Avoid password prompts by not calling su.
- RUN_AS_USER=""
- fi
- fi
- if [ "X$RUN_AS_USER" != "X" ]
- then
- if [ "`$IDEXE -u -n "$RUN_AS_USER" 2>/dev/null`" != "$RUN_AS_USER" ]
- then
- eval echo `gettext 'User $RUN_AS_USER does not exist.'`
- exit 1
- fi
-
- # If LOCKPROP and $RUN_AS_USER are defined then the new user will most likely not be
- # able to create the lock file. The Wrapper will be able to update this file once it
- # is created but will not be able to delete it on shutdown. If $1 is set then
- # the lock file should be created for the current command
- if [ "X$LOCKPROP" != "X" ]
- then
- if [ "X$1" != "X" ]
- then
- # Resolve the primary group
- RUN_AS_GROUP=`groups $RUN_AS_USER | awk '{print $3}' | tail -1`
- if [ "X$RUN_AS_GROUP" = "X" ]
- then
- RUN_AS_GROUP=$RUN_AS_USER
- fi
- touch $LOCKFILE
- chown $RUN_AS_USER:$RUN_AS_GROUP $LOCKFILE
- fi
- fi
-
- # Still want to change users, recurse. This means that the user will only be
- # prompted for a password once. Variables shifted by 1
- shift
-
- # Wrap the parameters so they can be passed.
- ADDITIONAL_PARA=""
- while [ -n "$1" ] ; do
- ADDITIONAL_PARA="$ADDITIONAL_PARA \"$1\""
- shift
- done
-
- # Use "runuser" if this exists. runuser should be used on RedHat in preference to su.
- #
- if test -f "/sbin/runuser"
- then
- /sbin/runuser - $RUN_AS_USER -c "\"$REALPATH\" $ADDITIONAL_PARA"
- else
- su - $RUN_AS_USER -c "\"$REALPATH\" $ADDITIONAL_PARA"
- fi
- RUN_AS_USER_EXITCODE=$?
- # Now that we are the original user again, we may need to clean up the lock file.
- if [ "X$LOCKPROP" != "X" ]
- then
- getpid
- if [ "X$pid" = "X" ]
- then
- # Wrapper is not running so make sure the lock file is deleted.
- if [ -f "$LOCKFILE" ]
- then
- rm "$LOCKFILE"
- fi
- fi
- fi
-
- exit $RUN_AS_USER_EXITCODE
- fi
-}
-
-getpid() {
- pid=""
- if [ -f "$PIDFILE" ]
- then
- if [ -r "$PIDFILE" ]
- then
- pid=`cat "$PIDFILE"`
- if [ "X$pid" != "X" ]
- then
- # It is possible that 'a' process with the pid exists but that it is not the
- # correct process. This can happen in a number of cases, but the most
- # common is during system startup after an unclean shutdown.
- # The ps statement below looks for the specific wrapper command running as
- # the pid. If it is not found then the pid file is considered to be stale.
- case "$DIST_OS" in
- 'freebsd')
- pidtest=`$PSEXE -p $pid -o args | tail -1`
- if [ "X$pidtest" = "XCOMMAND" ]
- then
- pidtest=""
- fi
- ;;
- 'macosx')
- pidtest=`$PSEXE -ww -p $pid -o command | grep -F "$WRAPPER_CMD" | tail -1`
- ;;
- 'solaris')
- if [ -f "/usr/bin/pargs" ]
- then
- pidtest=`pargs $pid | fgrep "$WRAPPER_CMD" | tail -1`
- else
- case "$PSEXE" in
- '/usr/ucb/ps')
- pidtest=`$PSEXE -auxww $pid | fgrep "$WRAPPER_CMD" | tail -1`
- ;;
- '/usr/bin/ps')
- TRUNCATED_CMD=`$PSEXE -o comm -p $pid | tail -1`
- COUNT=`echo $TRUNCATED_CMD | wc -m`
- COUNT=`echo ${COUNT}`
- COUNT=`expr $COUNT - 1`
- TRUNCATED_CMD=`echo $WRAPPER_CMD | cut -c1-$COUNT`
- pidtest=`$PSEXE -o comm -p $pid | fgrep "$TRUNCATED_CMD" | tail -1`
- ;;
- '/bin/ps')
- TRUNCATED_CMD=`$PSEXE -o comm -p $pid | tail -1`
- COUNT=`echo $TRUNCATED_CMD | wc -m`
- COUNT=`echo ${COUNT}`
- COUNT=`expr $COUNT - 1`
- TRUNCATED_CMD=`echo $WRAPPER_CMD | cut -c1-$COUNT`
- pidtest=`$PSEXE -o comm -p $pid | fgrep "$TRUNCATED_CMD" | tail -1`
- ;;
- *)
- echo "Unsupported ps command $PSEXE"
- exit 1
- ;;
- esac
- fi
- ;;
- 'hpux')
- pidtest=`$PSEXE -p $pid -x -o args | grep -F "$WRAPPER_CMD" | tail -1`
- ;;
- *)
- pidtest=`$PSEXE -p $pid -o args | grep -F "$WRAPPER_CMD" | tail -1`
- ;;
- esac
-
- if [ "X$pidtest" = "X" ]
- then
- # This is a stale pid file.
- rm -f "$PIDFILE"
- eval echo `gettext 'Removed stale pid file: $PIDFILE'`
- pid=""
- fi
- fi
- else
- eval echo `gettext 'Cannot read $PIDFILE.'`
- exit 1
- fi
- fi
-}
-
-getstatus() {
- STATUS=
- if [ -f "$STATUSFILE" ]
- then
- if [ -r "$STATUSFILE" ]
- then
- STATUS=`cat "$STATUSFILE"`
- fi
- fi
- if [ "X$STATUS" = "X" ]
- then
- STATUS="Unknown"
- fi
-
- JAVASTATUS=
- if [ -f "$JAVASTATUSFILE" ]
- then
- if [ -r "$JAVASTATUSFILE" ]
- then
- JAVASTATUS=`cat "$JAVASTATUSFILE"`
- fi
- fi
- if [ "X$JAVASTATUS" = "X" ]
- then
- JAVASTATUS="Unknown"
- fi
-}
-
-testpid() {
- case "$DIST_OS" in
- 'solaris')
- case "$PSEXE" in
- '/usr/ucb/ps')
- pid=`$PSEXE $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
- ;;
- '/usr/bin/ps')
- pid=`$PSEXE -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
- ;;
- '/bin/ps')
- pid=`$PSEXE -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
- ;;
- *)
- echo "Unsupported ps command $PSEXE"
- exit 1
- ;;
- esac
- ;;
- *)
- pid=`$PSEXE -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1` 2>/dev/null
- ;;
- esac
- if [ "X$pid" = "X" ]
- then
- # Process is gone so remove the pid file.
- rm -f "$PIDFILE"
- pid=""
- fi
-}
-
-launchdtrap() {
- stopit
- exit
-}
-
-waitforwrapperstop() {
- getpid
- while [ "X$pid" != "X" ] ; do
- sleep 1
- getpid
- done
-}
-
-launchinternal() {
- getpid
- trap launchdtrap TERM
- if [ "X$pid" = "X" ]
- then
- prepAdditionalParams "$@"
-
- # The string passed to eval must handles spaces in paths correctly.
- COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
- eval $COMMAND_LINE
- else
- eval echo `gettext '$APP_LONG_NAME is already running.'`
- exit 1
- fi
- # launchd expects that this script stay up and running so we need to do our own monitoring of the Wrapper process.
- if [ $WAIT_FOR_STARTED_STATUS = true ]
- then
- waitforwrapperstop
- fi
-}
-
-console() {
- eval echo `gettext 'Running $APP_LONG_NAME...'`
- getpid
- if [ "X$pid" = "X" ]
- then
- trap '' 3
-
- prepAdditionalParams "$@"
-
- # The string passed to eval must handles spaces in paths correctly.
- COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
- eval $COMMAND_LINE
- else
- eval echo `gettext '$APP_LONG_NAME is already running.'`
- exit 1
- fi
-}
-
-waitforjavastartup() {
- getstatus
- eval echo $ECHOOPT `gettext 'Waiting for $APP_LONG_NAME...'`
-
- # Wait until the timeout or we have something besides Unknown.
- counter=15
- while [ "$JAVASTATUS" = "Unknown" -a $counter -gt 0 -a -n "$JAVASTATUS" ] ; do
- echo $ECHOOPT"."
- sleep 1
- getstatus
- counter=`expr $counter - 1`
- done
-
- if [ -n "$WAIT_FOR_STARTED_TIMEOUT" ] ; then
- counter=$WAIT_FOR_STARTED_TIMEOUT
- else
- counter=120
- fi
- while [ "$JAVASTATUS" != "STARTED" -a "$JAVASTATUS" != "Unknown" -a $counter -gt 0 -a -n "$JAVASTATUS" ] ; do
- echo $ECHOOPT"."
- sleep 1
- getstatus
- counter=`expr $counter - 1`
- done
- if [ "X$ECHOOPT" != "X" ] ; then
- echo ""
- fi
-}
-
-startwait() {
- if [ $WAIT_FOR_STARTED_STATUS = true ]
- then
- waitforjavastartup
- fi
- # Sleep for a few seconds to allow for intialization if required
- # then test to make sure we're still running.
- #
- i=0
- while [ $i -lt $WAIT_AFTER_STARTUP ]
- do
- sleep 1
- echo $ECHOOPT"."
- i=`expr $i + 1`
- done
- if [ $WAIT_AFTER_STARTUP -gt 0 -o $WAIT_FOR_STARTED_STATUS = true ]
- then
- getpid
- if [ "X$pid" = "X" ]
- then
- eval echo `gettext ' WARNING: $APP_LONG_NAME may have failed to start.'`
- exit 1
- else
- eval echo `gettext ' running: PID:$pid'`
- fi
- else
- echo ""
- fi
-}
-
-macosxstart() {
- # The daemon has been installed.
- eval echo `gettext 'Starting $APP_LONG_NAME. Detected Mac OSX and installed launchd daemon.'`
- if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
- eval echo `gettext 'Must be root to perform this action.'`
- exit 1
- fi
-
- getpid
- if [ "X$pid" != "X" ] ; then
- eval echo `gettext '$APP_LONG_NAME is already running.'`
- exit 1
- fi
-
- # If the daemon was just installed, it may not be loaded.
- LOADED_PLIST=`launchctl list | grep ${APP_PLIST_BASE}`
- if [ "X${LOADED_PLIST}" = "X" ] ; then
- launchctl load /Library/LaunchDaemons/${APP_PLIST}
- fi
- # If launchd is set to run the daemon already at Load, we don't need to call start
- getpid
- if [ "X$pid" == "X" ] ; then
- launchctl start ${APP_PLIST_BASE}
- fi
-
- startwait
-}
-
-upstartstart() {
- # The daemon has been installed.
- eval echo `gettext 'Starting $APP_LONG_NAME. Detected Linux and installed upstart.'`
- if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
- eval echo `gettext 'Must be root to perform this action.'`
- exit 1
- fi
-
- getpid
- if [ "X$pid" != "X" ] ; then
- eval echo `gettext '$APP_LONG_NAME is already running.'`
- exit 1
- fi
-
- /sbin/start ${APP_NAME}
-
- startwait
-}
-
-start() {
- eval echo `gettext 'Starting $APP_LONG_NAME...'`
- getpid
- if [ "X$pid" = "X" ]
- then
- prepAdditionalParams "$@"
-
- # The string passed to eval must handles spaces in paths correctly.
- COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
- eval $COMMAND_LINE
- else
- eval echo `gettext '$APP_LONG_NAME is already running.'`
- exit 1
- fi
-
- startwait
-}
-
-stopit() {
- # $1 exit if down flag
-
- eval echo `gettext 'Stopping $APP_LONG_NAME...'`
- getpid
- if [ "X$pid" = "X" ]
- then
- eval echo `gettext '$APP_LONG_NAME was not running.'`
- if [ "X$1" = "X1" ]
- then
- exit 1
- fi
- else
- if [ "X$IGNORE_SIGNALS" = "X" ]
- then
- # Running so try to stop it.
- kill $pid
- if [ $? -ne 0 ]
- then
- # An explanation for the failure should have been given
- eval echo `gettext 'Unable to stop $APP_LONG_NAME.'`
- exit 1
- fi
- else
- rm -f "$ANCHORFILE"
- if [ -f "$ANCHORFILE" ]
- then
- # An explanation for the failure should have been given
- eval echo `gettext 'Unable to stop $APP_LONG_NAME.'`
- exit 1
- fi
- fi
-
- # We can not predict how long it will take for the wrapper to
- # actually stop as it depends on settings in wrapper.conf.
- # Loop until it does.
- savepid=$pid
- CNT=0
- TOTCNT=0
- while [ "X$pid" != "X" ]
- do
- # Show a waiting message every 5 seconds.
- if [ "$CNT" -lt "5" ]
- then
- CNT=`expr $CNT + 1`
- else
- eval echo `gettext 'Waiting for $APP_LONG_NAME to exit...'`
- CNT=0
- fi
- TOTCNT=`expr $TOTCNT + 1`
-
- sleep 1
-
- testpid
- done
-
- pid=$savepid
- testpid
- if [ "X$pid" != "X" ]
- then
- eval echo `gettext 'Failed to stop $APP_LONG_NAME.'`
- exit 1
- else
- eval echo `gettext 'Stopped $APP_LONG_NAME.'`
- fi
- fi
-}
-
-pause() {
- eval echo `gettext 'Pausing $APP_LONG_NAME.'`
-}
-
-resume() {
- eval echo `gettext 'Resuming $APP_LONG_NAME.'`
-}
-
-status() {
- getpid
- if [ "X$pid" = "X" ]
- then
- eval echo `gettext '$APP_LONG_NAME is not running.'`
- exit 1
- else
- if [ "X$DETAIL_STATUS" = "X" ]
- then
- eval echo `gettext '$APP_LONG_NAME is running: PID:$pid'`
- else
- getstatus
- eval echo `gettext '$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS'`
- fi
- exit 0
- fi
-}
-
-installUpstart() {
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon using upstart..'`
- if [ -f "${REALDIR}/${APP_NAME}.install" ] ; then
- eval echo `gettext ' a custom upstart conf file ${APP_NAME}.install found'`
- cp "${REALDIR}/${APP_NAME}.install" "/etc/init/${APP_NAME}.conf"
- else
- eval echo `gettext ' creating default upstart conf file..'`
- echo "# ${APP_NAME} - ${APP_LONG_NAME}" > "/etc/init/${APP_NAME}.conf"
- echo "description \"${APP_LONG_NAME}\"" >> "/etc/init/${APP_NAME}.conf"
- echo "author \"Tanuki Software Ltd. \"" >> "/etc/init/${APP_NAME}.conf"
- echo "start on runlevel [2345]" >> "/etc/init/${APP_NAME}.conf"
- echo "stop on runlevel [!2345]" >> "/etc/init/${APP_NAME}.conf"
- echo "env LANG=${LANG}" >> "/etc/init/${APP_NAME}.conf"
- echo "exec \"${REALPATH}\" upstartinternal" >> "/etc/init/${APP_NAME}.conf"
- fi
-}
-
-installdaemon() {
- if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
- eval echo `gettext 'Must be root to perform this action.'`
- exit 1
- else
- APP_NAME_LOWER=`echo "$APP_NAME" | $TREXE "[A-Z]" "[a-z]"`
- if [ "$DIST_OS" = "solaris" ] ; then
- eval echo `gettext 'Detected Solaris:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME"] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
- ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/K20$APP_NAME_LOWER"
- ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/S20$APP_NAME_LOWER"
- fi
- elif [ "$DIST_OS" = "linux" ] ; then
- if [ -f /etc/redhat-release -o -f /etc/redhat_version -o -f /etc/fedora-release ] ; then
- eval echo `gettext 'Detected RHEL or Fedora:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" -o -f "/etc/init/${APP_NAME}.conf" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- if [ -n "$USE_UPSTART" -a -d "/etc/init" ] ; then
- installUpstart
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
- /sbin/chkconfig --add "$APP_NAME"
- /sbin/chkconfig "$APP_NAME" on
- fi
- fi
- elif [ -f /etc/SuSE-release ] ; then
- eval echo `gettext 'Detected SuSE or SLES:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
- insserv "/etc/init.d/$APP_NAME"
- fi
- elif [ -f /etc/lsb-release ] ; then
- eval echo `gettext 'Detected Ubuntu:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" -o -f "/etc/init/${APP_NAME}.conf" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- if [ -n "$USE_UPSTART" -a -d "/etc/init" ] ; then
- installUpstart
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon using init.d..'`
- ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
- update-rc.d "$APP_NAME" defaults
- fi
- fi
- else
- eval echo `gettext 'Detected Linux:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- ln -s "$REALPATH" /etc/init.d/$APP_NAME
- ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/K20$APP_NAME_LOWER"
- ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/S20$APP_NAME_LOWER"
- ln -s "/etc/init.d/$APP_NAME" "/etc/rc5.d/S20$APP_NAME_LOWER"
- ln -s "/etc/init.d/$APP_NAME" "/etc/rc5.d/K20$APP_NAME_LOWER"
- fi
- fi
- elif [ "$DIST_OS" = "hpux" ] ; then
- eval echo `gettext 'Detected HP-UX:'`
- if [ -f "/sbin/init.d/$APP_NAME" -o -L "/sbin/init.d/$APP_NAME" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- ln -s "$REALPATH" "/sbin/init.d/$APP_NAME"
- ln -s "/sbin/init.d/$APP_NAME" "/sbin/rc3.d/K20$APP_NAME_LOWER"
- ln -s "/sbin/init.d/$APP_NAME" "/sbin/rc3.d/S20$APP_NAME_LOWER"
- fi
- elif [ "$DIST_OS" = "aix" ] ; then
- eval echo `gettext 'Detected AIX:'`
- if [ -f "/etc/rc.d/init.d/$APP_NAME" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed as rc.d script.'`
- exit 1
- elif [ -n "`/usr/sbin/lsitab $APP_NAME`" -a -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed as SRC service.'`
- exit 1
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- if [ -n "`/usr/sbin/lsitab install_assist`" ] ; then
- eval echo `gettext ' The task /usr/sbin/install_assist was found in the inittab, this might cause problems for all subsequent tasks to launch at this process is known to block the init task. Please make sure this task is not needed anymore and remove/deactivate it.'`
- fi
- /usr/bin/mkssys -s "$APP_NAME" -p "$REALPATH" -a "launchdinternal" -u 0 -f 9 -n 15 -S
- /usr/sbin/mkitab "$APP_NAME":2:once:"/usr/bin/startsrc -s \"${APP_NAME}\" >/dev/console 2>&1"
-
- fi
- elif [ "$DIST_OS" = "freebsd" ] ; then
- eval echo `gettext 'Detected FreeBSD:'`
- if [ -f "/etc/rc.d/$APP_NAME" -o -L "/etc/rc.d/$APP_NAME" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- sed -i .bak "/${APP_NAME}_enable=\"YES\"/d" /etc/rc.conf
- if [ -f "${REALDIR}/${APP_NAME}.install" ] ; then
- ln -s "${REALDIR}/${APP_NAME}.install" "/etc/rc.d/$APP_NAME"
- else
- echo '#!/bin/sh' > "/etc/rc.d/$APP_NAME"
- echo "#" >> "/etc/rc.d/$APP_NAME"
- echo "# PROVIDE: $APP_NAME" >> "/etc/rc.d/$APP_NAME"
- echo "# REQUIRE: NETWORKING" >> "/etc/rc.d/$APP_NAME"
- echo "# KEYWORD: shutdown" >> "/etc/rc.d/$APP_NAME"
- echo ". /etc/rc.subr" >> "/etc/rc.d/$APP_NAME"
- echo "name=\"$APP_NAME\"" >> "/etc/rc.d/$APP_NAME"
- echo "rcvar=\`set_rcvar\`" >> "/etc/rc.d/$APP_NAME"
- echo "command=\"${REALPATH}\"" >> "/etc/rc.d/$APP_NAME"
- echo 'start_cmd="${name}_start"' >> "/etc/rc.d/$APP_NAME"
- echo 'load_rc_config $name' >> "/etc/rc.d/$APP_NAME"
- echo 'status_cmd="${name}_status"' >> "/etc/rc.d/$APP_NAME"
- echo 'stop_cmd="${name}_stop"' >> "/etc/rc.d/$APP_NAME"
- echo "${APP_NAME}_status() {" >> "/etc/rc.d/$APP_NAME"
- echo '${command} status' >> "/etc/rc.d/$APP_NAME"
- echo '}' >> "/etc/rc.d/$APP_NAME"
- echo "${APP_NAME}_stop() {" >> "/etc/rc.d/$APP_NAME"
- echo '${command} stop' >> "/etc/rc.d/$APP_NAME"
- echo '}' >> "/etc/rc.d/$APP_NAME"
- echo "${APP_NAME}_start() {" >> "/etc/rc.d/$APP_NAME"
- echo '${command} start' >> "/etc/rc.d/$APP_NAME"
- echo '}' >> "/etc/rc.d/$APP_NAME"
- echo 'run_rc_command "$1"' >> "/etc/rc.d/$APP_NAME"
- fi
- echo "${APP_NAME}_enable=\"YES\"" >> /etc/rc.conf
- chmod 555 "/etc/rc.d/$APP_NAME"
- fi
- elif [ "$DIST_OS" = "macosx" ] ; then
- eval echo `gettext 'Detected Mac OSX:'`
- if [ -f "/Library/LaunchDaemons/${APP_PLIST}" -o -L "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- if [ -f "${REALDIR}/${APP_PLIST}" ] ; then
- ln -s "${REALDIR}/${APP_PLIST}" "/Library/LaunchDaemons/${APP_PLIST}"
- else
- echo "" > "/Library/LaunchDaemons/${APP_PLIST}"
- echo "> "/Library/LaunchDaemons/${APP_PLIST}"
- echo "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo "" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " Label" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " ${APP_PLIST_BASE}" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " ProgramArguments" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " ${REALPATH}" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " launchdinternal" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " OnDemand" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " RunAtLoad" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
- if [ "X$RUN_AS_USER" != "X" ] ; then
- echo " UserName" >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo " ${RUN_AS_USER}" >> "/Library/LaunchDaemons/${APP_PLIST}"
- fi
- echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
- echo "" >> "/Library/LaunchDaemons/${APP_PLIST}"
- fi
- chmod 555 "/Library/LaunchDaemons/${APP_PLIST}"
- fi
- elif [ "$DIST_OS" = "zos" ] ; then
- eval echo `gettext 'Detected z/OS:'`
- if [ -f /etc/rc.bak ] ; then
- eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
- exit 1
- else
- eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
- cp /etc/rc /etc/rc.bak
- sed "s:echo /etc/rc script executed, \`date\`::g" /etc/rc.bak > /etc/rc
- echo "_BPX_JOBNAME='${APP_NAME}' \"${REALDIR}/${APP_NAME}\" start" >>/etc/rc
- echo '/etc/rc script executed, `date`' >>/etc/rc
- fi
- else
- eval echo `gettext 'Install not currently supported for $DIST_OS'`
- exit 1
- fi
- fi
-}
-
-removedaemon() {
- if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
- eval echo `gettext 'Must be root to perform this action.'`
- exit 1
- else
- APP_NAME_LOWER=`echo "$APP_NAME" | $TREXE "[A-Z]" "[a-z]"`
- if [ "$DIST_OS" = "solaris" ] ; then
- eval echo `gettext 'Detected Solaris:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- for i in "/etc/rc3.d/S20$APP_NAME_LOWER" "/etc/rc3.d/K20$APP_NAME_LOWER" "/etc/init.d/$APP_NAME"
- do
- rm -f $i
- done
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- elif [ "$DIST_OS" = "linux" ] ; then
- if [ -f /etc/redhat-release -o -f /etc/redhat_version -o -f /etc/fedora-release ] ; then
- eval echo `gettext 'Detected RHEL or Fedora:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- /sbin/chkconfig "$APP_NAME" off
- /sbin/chkconfig --del "$APP_NAME"
- rm -f "/etc/init.d/$APP_NAME"
- elif [ -f "/etc/init/${APP_NAME}.conf" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon from upstart...'`
- rm "/etc/init/${APP_NAME}.conf"
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- elif [ -f /etc/SuSE-release ] ; then
- eval echo `gettext 'Detected SuSE or SLES:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- insserv -r "/etc/init.d/$APP_NAME"
- rm -f "/etc/init.d/$APP_NAME"
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- elif [ -f /etc/lsb-release ] ; then
- eval echo `gettext 'Detected Ubuntu:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon from init.d...'`
- update-rc.d -f "$APP_NAME" remove
- rm -f "/etc/init.d/$APP_NAME"
- elif [ -f "/etc/init/${APP_NAME}.conf" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon from upstart...'`
- rm "/etc/init/${APP_NAME}.conf"
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- else
- eval echo `gettext 'Detected Linux:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- for i in "/etc/rc3.d/K20$APP_NAME_LOWER" "/etc/rc5.d/K20$APP_NAME_LOWER" "/etc/rc3.d/S20$APP_NAME_LOWER" "/etc/init.d/$APP_NAME" "/etc/rc5.d/S20$APP_NAME_LOWER"
- do
- rm -f $i
- done
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- fi
- elif [ "$DIST_OS" = "hpux" ] ; then
- eval echo `gettext 'Detected HP-UX:'`
- if [ -f "/sbin/init.d/$APP_NAME" -o -L "/sbin/init.d/$APP_NAME" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- for i in "/sbin/rc3.d/K20$APP_NAME_LOWER" "/sbin/rc3.d/S20$APP_NAME_LOWER" "/sbin/init.d/$APP_NAME"
- do
- rm -f $i
- done
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- elif [ "$DIST_OS" = "aix" ] ; then
- eval echo `gettext 'Detected AIX:'`
- if [ -f "/etc/rc.d/init.d/$APP_NAME" -o -L "/etc/rc.d/init.d/$APP_NAME" -o -n "`/usr/sbin/lsitab $APP_NAME`" -o -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- if [ -f "/etc/rc.d/init.d/$APP_NAME" -o -L "/etc/rc.d/init.d/$APP_NAME" ] ; then
- for i in "/etc/rc.d/rc2.d/S20$APP_NAME_LOWER" "/etc/rc.d/rc2.d/K20$APP_NAME_LOWER" "/etc/rc.d/init.d/$APP_NAME"
- do
- rm -f $i
- done
- fi
- if [ -n "`/usr/sbin/lsitab $APP_NAME`" -o -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
- /usr/sbin/rmitab $APP_NAME
- /usr/bin/rmssys -s $APP_NAME
- fi
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- elif [ "$DIST_OS" = "freebsd" ] ; then
- eval echo `gettext 'Detected FreeBSD:'`
- if [ -f "/etc/rc.d/$APP_NAME" -o -L "/etc/rc.d/$APP_NAME" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- for i in "/etc/rc.d/$APP_NAME"
- do
- rm -f $i
- done
- sed -i .bak "/${APP_NAME}_enable=\"YES\"/d" /etc/rc.conf
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- elif [ "$DIST_OS" = "macosx" ] ; then
- eval echo `gettext 'Detected Mac OSX:'`
- if [ -f "/Library/LaunchDaemons/${APP_PLIST}" -o -L "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- # Make sure the plist is installed
- LOADED_PLIST=`launchctl list | grep ${APP_PLIST_BASE}`
- if [ "X${LOADED_PLIST}" != "X" ] ; then
- launchctl unload "/Library/LaunchDaemons/${APP_PLIST}"
- fi
- rm -f "/Library/LaunchDaemons/${APP_PLIST}"
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- elif [ "$DIST_OS" = "zos" ] ; then
- eval echo `gettext 'Detected z/OS:'`
- if [ -f /etc/rc.bak ] ; then
- stopit "0"
- eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- cp /etc/rc /etc/rc.bak
- sed "s/_BPX_JOBNAME=\'APP_NAME\'.*//g" /etc/rc.bak > /etc/rc
- rm /etc/rc.bak
- else
- eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
- exit 1
- fi
- else
- eval echo `gettext 'Remove not currently supported for $DIST_OS'`
- exit 1
- fi
- fi
-}
-
-dump() {
- eval echo `gettext 'Dumping $APP_LONG_NAME...'`
- getpid
- if [ "X$pid" = "X" ]
- then
- eval echo `gettext '$APP_LONG_NAME was not running.'`
- else
- kill -3 $pid
-
- if [ $? -ne 0 ]
- then
- eval echo `gettext 'Failed to dump $APP_LONG_NAME.'`
- exit 1
- else
- eval echo `gettext 'Dumped $APP_LONG_NAME.'`
- fi
- fi
-}
-
-# Used by HP-UX init scripts.
-startmsg() {
- getpid
- if [ "X$pid" = "X" ]
- then
- eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:Stopped'`
- else
- if [ "X$DETAIL_STATUS" = "X" ]
- then
- eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:Running'`
- else
- getstatus
- eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS'`
- fi
- fi
-}
-
-# Used by HP-UX init scripts.
-stopmsg() {
- getpid
- if [ "X$pid" = "X" ]
- then
- eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:Stopped'`
- else
- if [ "X$DETAIL_STATUS" = "X" ]
- then
- eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:Running'`
- else
- getstatus
- eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS'`
- fi
- fi
-}
-
-showUsage() {
- # $1 bad command
-
- if [ -n "$1" ]
- then
- eval echo `gettext 'Unexpected command: $1'`
- echo "";
- fi
-
- eval MSG=`gettext 'Usage: '`
- if [ -n "$FIXED_COMMAND" ] ; then
- if [ -n "$PASS_THROUGH" ] ; then
- echo "${MSG} $0 {JavaAppArgs}"
- else
- echo "${MSG} $0"
- fi
- else
- if [ -n "$PAUSABLE" ] ; then
- if [ -n "$PASS_THROUGH" ] ; then
- echo "${MSG} $0 [ console {JavaAppArgs} | start {JavaAppArgs} | stop | restart {JavaAppArgs} | condrestart {JavaAppArgs} | pause | resume | status | install | remove | dump ]"
- else
- echo "${MSG} $0 [ console | start | stop | restart | condrestart | pause | resume | status | install | remove | dump ]"
- fi
- else
- if [ -n "$PASS_THROUGH" ] ; then
- echo "${MSG} $0 [ console {JavaAppArgs} | start {JavaAppArgs} | stop | restart {JavaAppArgs} | condrestart {JavaAppArgs} | status | install | remove | dump ]"
- else
- echo "${MSG} $0 [ console | start | stop | restart | condrestart | status | install | remove | dump ]"
- fi
- fi
- fi
-
- if [ ! -n "$BRIEF_USAGE" ]
- then
- echo "";
- if [ ! -n "$FIXED_COMMAND" ] ; then
- echo "`gettext 'Commands:'`"
- echo "`gettext ' console Launch in the current console.'`"
- echo "`gettext ' start Start in the background as a daemon process.'`"
- echo "`gettext ' stop Stop if running as a daemon or in another console.'`"
- echo "`gettext ' restart Stop if running and then start.'`"
- echo "`gettext ' condrestart Restart only if already running.'`"
- if [ -n "$PAUSABLE" ] ; then
- echo "`gettext ' pause Pause if running.'`"
- echo "`gettext ' resume Resume if paused.'`"
- fi
- echo "`gettext ' status Query the current status.'`"
- echo "`gettext ' install Install to start automatically when system boots.'`"
- echo "`gettext ' remove Uninstall.'`"
- echo "`gettext ' dump Request a Java thread dump if running.'`"
- echo "";
- fi
- if [ -n "$PASS_THROUGH" ] ; then
- echo "`gettext 'JavaAppArgs: Zero or more arguments which will be passed to the Java application.'`"
- echo "";
- fi
- fi
-
- exit 1
-}
-
-docommand() {
- case "$COMMAND" in
- 'console')
- checkUser touchlock "$@"
- if [ ! -n "$FIXED_COMMAND" ] ; then
- shift
- fi
- console "$@"
- ;;
-
- 'start')
- if [ "$DIST_OS" = "macosx" -a -f "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
- macosxstart
- elif [ "$DIST_OS" = "linux" -a -f "/etc/init/${APP_NAME}.conf" ] ; then
- upstartstart
- else
- checkUser touchlock "$@"
- if [ ! -n "$FIXED_COMMAND" ] ; then
- shift
- fi
- start "$@"
- fi
- ;;
-
- 'stop')
- checkUser "" "$COMMAND"
- stopit "0"
- ;;
-
- 'restart')
- checkUser touchlock "$COMMAND"
- if [ ! -n "$FIXED_COMMAND" ] ; then
- shift
- fi
- stopit "0"
- start "$@"
- ;;
-
- 'condrestart')
- checkUser touchlock "$COMMAND"
- if [ ! -n "$FIXED_COMMAND" ] ; then
- shift
- fi
- stopit "1"
- start "$@"
- ;;
-
- 'pause')
- if [ -n "$PAUSABLE" ]
- then
- pause
- else
- showUsage "$COMMAND"
- fi
- ;;
-
- 'resume')
- if [ -n "$PAUSABLE" ]
- then
- resume
- else
- showUsage "$COMMAND"
- fi
- ;;
-
- 'status')
- status
- ;;
-
- 'install')
- installdaemon
- ;;
-
- 'remove')
- removedaemon
- ;;
-
- 'dump')
- checkUser "" "$COMMAND"
- dump
- ;;
-
- 'start_msg')
- # Internal command called by launchd on HP-UX.
- checkUser "" "$COMMAND"
- startmsg
- ;;
-
- 'stop_msg')
- # Internal command called by launchd on HP-UX.
- checkUser "" "$COMMAND"
- stopmsg
- ;;
-
- 'launchdinternal' | 'upstartinternal')
- if [ ! "$DIST_OS" = "macosx" -o ! -f "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
- checkUser touchlock "$@"
- fi
- # Internal command called by launchd on Max OSX.
- # We do not want to call checkUser here as it is handled in the launchd plist file. Doing it here would confuse launchd.
- if [ ! -n "$FIXED_COMMAND" ] ; then
- shift
- fi
- launchinternal "$@"
- ;;
-
- *)
- showUsage "$COMMAND"
- ;;
- esac
-}
-
-docommand "$@"
-
-exit 0
+#! /bin/sh
+
+#
+# Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+#
+# Java Service Wrapper sh script. Suitable for starting and stopping
+# wrapped Java applications on UNIX platforms.
+#
+
+#-----------------------------------------------------------------------------
+# These settings can be modified to fit the needs of your application
+# Optimized for use with version 3.5.17 of the Wrapper.
+
+#********************************************************************
+# NOTE - This script has been modified to run the TestWrapper sample
+# application and should NOT be used as a base for your own
+# applications. All of the documentation assumes that you are
+# working from the default source script:
+# WRAPPER_HOME/src/bin/sh.script.in
+#********************************************************************
+
+# Application
+APP_NAME="testwrapper"
+APP_LONG_NAME="Test Wrapper Sample Application"
+
+# Wrapper
+WRAPPER_CMD="./wrapper"
+WRAPPER_CONF="../conf/wrapper.conf"
+
+# Priority at which to run the wrapper. See "man nice" for valid priorities.
+# nice is only used if a priority is specified.
+PRIORITY=
+
+# Location of the pid file.
+PIDDIR="."
+
+# FIXED_COMMAND tells the script to use a hard coded action rather than
+# expecting the first parameter of the command line to be the command.
+# By default the command will will be expected to be the first parameter.
+#FIXED_COMMAND=console
+
+# PASS_THROUGH tells the script to pass all arguments through to the JVM
+# as is. If FIXED_COMMAND is specified then all arguments will be passed.
+# If not set then all arguments starting with the second will be passed.
+PASS_THROUGH=true
+
+# If uncommented, causes the Wrapper to be shutdown using an anchor file.
+# When launched with the 'start' command, it will also ignore all INT and
+# TERM signals.
+#IGNORE_SIGNALS=true
+
+# Wrapper will start the JVM asynchronously. Your application may have some
+# initialization tasks and it may be desirable to wait a few seconds
+# before returning. For example, to delay the invocation of following
+# startup scripts. Setting WAIT_AFTER_STARTUP to a positive number will
+# cause the start command to delay for the indicated period of time
+# (in seconds).
+#
+WAIT_AFTER_STARTUP=0
+
+# If set, wait for the wrapper to report that the daemon has started
+WAIT_FOR_STARTED_STATUS=true
+WAIT_FOR_STARTED_TIMEOUT=120
+
+# If set, the status, start_msg and stop_msg commands will print out detailed
+# state information on the Wrapper and Java processes.
+#DETAIL_STATUS=true
+
+# If set, the 'pause' and 'resume' commands will be enabled. These make it
+# possible to pause the JVM or Java application without completely stopping
+# the Wrapper. See the wrapper.pausable and wrapper.pausable.stop_jvm
+# properties for more information.
+#PAUSABLE=true
+
+# If specified, the Wrapper will be run as the specified user.
+# IMPORTANT - Make sure that the user has the required privileges to write
+# the PID file and wrapper.log files. Failure to be able to write the log
+# file will cause the Wrapper to exit without any way to write out an error
+# message.
+# NOTE - This will set the user which is used to run the Wrapper as well as
+# the JVM and is not useful in situations where a privileged resource or
+# port needs to be allocated prior to the user being changed.
+#RUN_AS_USER=
+
+# By default we show a detailed usage block. Uncomment to show brief usage.
+#BRIEF_USAGE=true
+
+# flag for using upstart when installing (rather than init.d rc.d)
+USE_UPSTART=
+
+# When installing on On Mac OSX platforms, the following domain will be used to
+# prefix the plist file name.
+PLIST_DOMAIN=org.tanukisoftware.wrapper
+
+# The following two lines are used by the chkconfig command. Change as is
+# appropriate for your application. They should remain commented.
+# chkconfig: 2345 20 80
+# description: Test Wrapper Sample Application
+
+# Initialization block for the install_initd and remove_initd scripts used by
+# SUSE linux distributions.
+### BEGIN INIT INFO
+# Provides: testwrapper
+# Required-Start: $local_fs $network $syslog
+# Should-Start:
+# Required-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Test Wrapper Sample Application
+# Description: Test Wrapper Sample Application Description
+### END INIT INFO
+
+# Do not modify anything beyond this point
+#-----------------------------------------------------------------------------
+
+if [ -n "$FIXED_COMMAND" ]
+then
+ COMMAND="$FIXED_COMMAND"
+else
+ COMMAND="$1"
+fi
+
+
+# Required for HP-UX Startup
+if [ `uname -s` = "HP-UX" -o `uname -s` = "HP-UX64" ] ; then
+ PATH=$PATH:/usr/bin
+fi
+
+# Get the fully qualified path to the script
+case $0 in
+ /*)
+ SCRIPT="$0"
+ ;;
+ *)
+ PWD=`pwd`
+ SCRIPT="$PWD/$0"
+ ;;
+esac
+
+# Resolve the true real path without any sym links.
+CHANGED=true
+while [ "X$CHANGED" != "X" ]
+do
+ # Change spaces to ":" so the tokens can be parsed.
+ SAFESCRIPT=`echo $SCRIPT | sed -e 's; ;:;g'`
+ # Get the real path to this script, resolving any symbolic links
+ TOKENS=`echo $SAFESCRIPT | sed -e 's;/; ;g'`
+ REALPATH=
+ for C in $TOKENS; do
+ # Change any ":" in the token back to a space.
+ C=`echo $C | sed -e 's;:; ;g'`
+ REALPATH="$REALPATH/$C"
+ # If REALPATH is a sym link, resolve it. Loop for nested links.
+ while [ -h "$REALPATH" ] ; do
+ LS="`ls -ld "$REALPATH"`"
+ LINK="`expr "$LS" : '.*-> \(.*\)$'`"
+ if expr "$LINK" : '/.*' > /dev/null; then
+ # LINK is absolute.
+ REALPATH="$LINK"
+ else
+ # LINK is relative.
+ REALPATH="`dirname "$REALPATH"`""/$LINK"
+ fi
+ done
+ done
+
+ if [ "$REALPATH" = "$SCRIPT" ]
+ then
+ CHANGED=""
+ else
+ SCRIPT="$REALPATH"
+ fi
+done
+
+# Get the location of the script.
+REALDIR=`dirname "$REALPATH"`
+# Normalize the path
+REALDIR=`cd "${REALDIR}"; pwd`
+
+# If the PIDDIR is relative, set its value relative to the full REALPATH to avoid problems if
+# the working directory is later changed.
+FIRST_CHAR=`echo $PIDDIR | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+ PIDDIR=$REALDIR/$PIDDIR
+fi
+# Same test for WRAPPER_CMD
+FIRST_CHAR=`echo $WRAPPER_CMD | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+ WRAPPER_CMD=$REALDIR/$WRAPPER_CMD
+fi
+# Same test for WRAPPER_CONF
+FIRST_CHAR=`echo $WRAPPER_CONF | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+ WRAPPER_CONF=$REALDIR/$WRAPPER_CONF
+fi
+
+# Process ID
+ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
+COMMANDFILE="$PIDDIR/$APP_NAME.command"
+STATUSFILE="$PIDDIR/$APP_NAME.status"
+JAVASTATUSFILE="$PIDDIR/$APP_NAME.java.status"
+PIDFILE="$PIDDIR/$APP_NAME.pid"
+LOCKDIR="/var/lock/subsys"
+LOCKFILE="$LOCKDIR/$APP_NAME"
+pid=""
+
+# Resolve the location of the 'ps' command
+PSEXE="/usr/ucb/ps"
+ if [ ! -x "$PSEXE" ]
+ then
+ PSEXE="/usr/bin/ps"
+ if [ ! -x "$PSEXE" ]
+ then
+ PSEXE="/bin/ps"
+ if [ ! -x "$PSEXE" ]
+ then
+ eval echo `gettext 'Unable to locate "ps".'`
+ eval echo `gettext 'Please report this message along with the location of the command on your system.'`
+ exit 1
+ fi
+ fi
+ fi
+
+TREXE="/usr/bin/tr"
+if [ ! -x "$TREXE" ]
+then
+ TREXE="/bin/tr"
+ if [ ! -x "$TREXE" ]
+ then
+ eval echo `gettext 'Unable to locate "tr".'`
+ eval echo `gettext 'Please report this message along with the location of the command on your system.'`
+ exit 1
+ fi
+fi
+# Resolve the os
+DIST_OS=`uname -s | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
+case "$DIST_OS" in
+ 'sunos')
+ DIST_OS="solaris"
+ ;;
+ 'hp-ux' | 'hp-ux64')
+ # HP-UX needs the XPG4 version of ps (for -o args)
+ DIST_OS="hpux"
+ UNIX95=""
+ export UNIX95
+ ;;
+ 'darwin')
+ DIST_OS="macosx"
+ ;;
+ 'unix_sv')
+ DIST_OS="unixware"
+ ;;
+ 'os/390')
+ DIST_OS="zos"
+ ;;
+esac
+
+# Resolve the architecture
+if [ "$DIST_OS" = "macosx" ]
+then
+ OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'`
+ DIST_ARCH="universal"
+ if [[ "$OS_VER" < "10.5.0" ]]
+ then
+ DIST_BITS="32"
+ else
+ if [ "X`sysctl -n hw.cpu64bit_capable`" == "X1" ]
+ then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ fi
+ APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME}
+ APP_PLIST=${APP_PLIST_BASE}.plist
+else
+ DIST_ARCH=
+ DIST_ARCH=`uname -p 2>/dev/null | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
+ if [ "X$DIST_ARCH" = "X" ]
+ then
+ DIST_ARCH="unknown"
+ fi
+ if [ "$DIST_ARCH" = "unknown" ]
+ then
+ DIST_ARCH=`uname -m 2>/dev/null | $TREXE "[A-Z]" "[a-z]" | $TREXE -d ' '`
+ fi
+ case "$DIST_ARCH" in
+ 'athlon' | 'i386' | 'i486' | 'i586' | 'i686')
+ DIST_ARCH="x86"
+ if [ "${DIST_OS}" = "solaris" ] ; then
+ DIST_BITS=`isainfo -b`
+ else
+ DIST_BITS="32"
+ fi
+ ;;
+ 'amd64' | 'x86_64')
+ DIST_ARCH="x86"
+ DIST_BITS="64"
+ ;;
+ 'ia32')
+ DIST_ARCH="ia"
+ DIST_BITS="32"
+ ;;
+ 'ia64' | 'ia64n' | 'ia64w')
+ DIST_ARCH="ia"
+ DIST_BITS="64"
+ ;;
+ 'ip27')
+ DIST_ARCH="mips"
+ DIST_BITS="32"
+ ;;
+ 'power' | 'powerpc' | 'power_pc' | 'ppc64')
+ if [ "${DIST_ARCH}" = "ppc64" ] ; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ DIST_ARCH="ppc"
+ if [ "${DIST_OS}" = "aix" ] ; then
+ if [ `getconf KERNEL_BITMODE` -eq 64 ]; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ fi
+ ;;
+ 'pa_risc' | 'pa-risc')
+ DIST_ARCH="parisc"
+ if [ `getconf KERNEL_BITS` -eq 64 ]; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ ;;
+ 'sun4u' | 'sparcv9' | 'sparc')
+ DIST_ARCH="sparc"
+ DIST_BITS=`isainfo -b`
+ ;;
+ '9000/800' | '9000/785')
+ DIST_ARCH="parisc"
+ if [ `getconf KERNEL_BITS` -eq 64 ]; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ ;;
+ '2064' | '2066' | '2084' | '2086' | '2094' | '2096' | '2097' | '2098' | '2817')
+ DIST_ARCH="390"
+ DIST_BITS="64"
+ ;;
+ armv*)
+ if [ -z "`readelf -A /proc/self/exe | grep Tag_ABI_VFP_args`" ] ; then
+ DIST_ARCH="armel"
+ DIST_BITS="32"
+ else
+ DIST_ARCH="armhf"
+ DIST_BITS="32"
+ fi
+ ;;
+ esac
+fi
+
+# OSX always places Java in the same location so we can reliably set JAVA_HOME
+if [ "$DIST_OS" = "macosx" ]
+then
+ if [ -z "$JAVA_HOME" ]; then
+ JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+ fi
+fi
+
+# Test Echo
+ECHOTEST=`echo -n "x"`
+if [ "$ECHOTEST" = "x" ]
+then
+ ECHOOPT="-n "
+else
+ ECHOOPT=""
+fi
+
+
+gettext() {
+ "$WRAPPER_CMD" --translate "$1" "$WRAPPER_CONF" 2>/dev/null
+ if [ $? != 0 ] ; then
+ echo "$1"
+ fi
+}
+
+outputFile() {
+ if [ -f "$1" ]
+ then
+ eval echo `gettext ' $1 Found but not executable.'`;
+ else
+ echo " $1"
+ fi
+}
+
+# Decide on the wrapper binary to use.
+# If the bits of the OS could be detected, we will try to look for the
+# binary with the correct bits value. If it doesn't exist, fall back
+# and look for the 32-bit binary. If that doesn't exist either then
+# look for the default.
+WRAPPER_TEST_CMD=""
+if [ -f "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-$DIST_BITS" ]
+then
+ WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-$DIST_BITS"
+ if [ ! -x "$WRAPPER_TEST_CMD" ]
+ then
+ chmod +x "$WRAPPER_TEST_CMD" 2>/dev/null
+ fi
+ if [ -x "$WRAPPER_TEST_CMD" ]
+ then
+ WRAPPER_CMD="$WRAPPER_TEST_CMD"
+ else
+ outputFile "$WRAPPER_TEST_CMD"
+ WRAPPER_TEST_CMD=""
+ fi
+fi
+if [ -f "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32" -a -z "$WRAPPER_TEST_CMD" ]
+then
+ WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+ if [ ! -x "$WRAPPER_TEST_CMD" ]
+ then
+ chmod +x "$WRAPPER_TEST_CMD" 2>/dev/null
+ fi
+ if [ -x "$WRAPPER_TEST_CMD" ]
+ then
+ WRAPPER_CMD="$WRAPPER_TEST_CMD"
+ else
+ outputFile "$WRAPPER_TEST_CMD"
+ WRAPPER_TEST_CMD=""
+ fi
+fi
+if [ -f "$WRAPPER_CMD" -a -z "$WRAPPER_TEST_CMD" ]
+then
+ WRAPPER_TEST_CMD="$WRAPPER_CMD"
+ if [ ! -x "$WRAPPER_TEST_CMD" ]
+ then
+ chmod +x "$WRAPPER_TEST_CMD" 2>/dev/null
+ fi
+ if [ -x "$WRAPPER_TEST_CMD" ]
+ then
+ WRAPPER_CMD="$WRAPPER_TEST_CMD"
+ else
+ outputFile "$WRAPPER_TEST_CMD"
+ WRAPPER_TEST_CMD=""
+ fi
+fi
+if [ -z "$WRAPPER_TEST_CMD" ]
+then
+ eval echo `gettext 'Unable to locate any of the following binaries:'`
+ outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-$DIST_BITS"
+ if [ ! "$DIST_BITS" = "32" ]
+ then
+ outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+ fi
+ outputFile "$WRAPPER_CMD"
+
+ exit 1
+fi
+
+
+# Build the nice clause
+if [ "X$PRIORITY" = "X" ]
+then
+ CMDNICE=""
+else
+ CMDNICE="nice -$PRIORITY"
+fi
+
+# Build the anchor file clause.
+if [ "X$IGNORE_SIGNALS" = "X" ]
+then
+ ANCHORPROP=
+ IGNOREPROP=
+else
+ ANCHORPROP=wrapper.anchorfile=\"$ANCHORFILE\"
+ IGNOREPROP=wrapper.ignore_signals=TRUE
+fi
+
+# Build the status file clause.
+if [ "X$DETAIL_STATUS$WAIT_FOR_STARTED_STATUS" = "X" ]
+then
+ STATUSPROP=
+else
+ STATUSPROP="wrapper.statusfile=\"$STATUSFILE\" wrapper.java.statusfile=\"$JAVASTATUSFILE\""
+fi
+
+# Build the command file clause.
+if [ -n "$PAUSABLE" ]
+then
+ COMMANDPROP="wrapper.commandfile=\"$COMMANDFILE\" wrapper.pausable=TRUE"
+else
+ COMMANDPROP=
+fi
+
+if [ ! -n "$WAIT_FOR_STARTED_STATUS" ]
+then
+ WAIT_FOR_STARTED_STATUS=true
+fi
+
+if [ $WAIT_FOR_STARTED_STATUS = true ] ; then
+ DETAIL_STATUS=true
+fi
+
+
+# Build the lock file clause. Only create a lock file if the lock directory exists on this platform.
+LOCKPROP=
+if [ -d $LOCKDIR ]
+then
+ if [ -w $LOCKDIR ]
+ then
+ LOCKPROP=wrapper.lockfile=\"$LOCKFILE\"
+ fi
+fi
+
+prepAdditionalParams() {
+ ADDITIONAL_PARA=""
+ if [ -n "$PASS_THROUGH" ] ; then
+ ADDITIONAL_PARA="--"
+ fi
+ while [ -n "$1" ] ; do
+ ADDITIONAL_PARA="$ADDITIONAL_PARA \"$1\""
+ shift
+ done
+}
+
+checkUser() {
+ # $1 touchLock flag
+ # $2.. [command] args
+
+ # Check the configured user. If necessary rerun this script as the desired user.
+ if [ "X$RUN_AS_USER" != "X" ]
+ then
+ # Resolve the location of the 'id' command
+ IDEXE="/usr/xpg4/bin/id"
+ if [ ! -x "$IDEXE" ]
+ then
+ IDEXE="/usr/bin/id"
+ if [ ! -x "$IDEXE" ]
+ then
+ eval echo `gettext 'Unable to locate "id".'`
+ eval echo `gettext 'Please report this message along with the location of the command on your system.'`
+ exit 1
+ fi
+ fi
+
+ if [ "`$IDEXE -u -n`" = "$RUN_AS_USER" ]
+ then
+ # Already running as the configured user. Avoid password prompts by not calling su.
+ RUN_AS_USER=""
+ fi
+ fi
+ if [ "X$RUN_AS_USER" != "X" ]
+ then
+ if [ "`$IDEXE -u -n "$RUN_AS_USER" 2>/dev/null`" != "$RUN_AS_USER" ]
+ then
+ eval echo `gettext 'User $RUN_AS_USER does not exist.'`
+ exit 1
+ fi
+
+ # If LOCKPROP and $RUN_AS_USER are defined then the new user will most likely not be
+ # able to create the lock file. The Wrapper will be able to update this file once it
+ # is created but will not be able to delete it on shutdown. If $1 is set then
+ # the lock file should be created for the current command
+ if [ "X$LOCKPROP" != "X" ]
+ then
+ if [ "X$1" != "X" ]
+ then
+ # Resolve the primary group
+ RUN_AS_GROUP=`groups $RUN_AS_USER | awk '{print $3}' | tail -1`
+ if [ "X$RUN_AS_GROUP" = "X" ]
+ then
+ RUN_AS_GROUP=$RUN_AS_USER
+ fi
+ touch $LOCKFILE
+ chown $RUN_AS_USER:$RUN_AS_GROUP $LOCKFILE
+ fi
+ fi
+
+ # Still want to change users, recurse. This means that the user will only be
+ # prompted for a password once. Variables shifted by 1
+ shift
+
+ # Wrap the parameters so they can be passed.
+ ADDITIONAL_PARA=""
+ while [ -n "$1" ] ; do
+ ADDITIONAL_PARA="$ADDITIONAL_PARA \"$1\""
+ shift
+ done
+
+ # Use "runuser" if this exists. runuser should be used on RedHat in preference to su.
+ #
+ if test -f "/sbin/runuser"
+ then
+ /sbin/runuser - $RUN_AS_USER -c "\"$REALPATH\" $ADDITIONAL_PARA"
+ else
+ su - $RUN_AS_USER -c "\"$REALPATH\" $ADDITIONAL_PARA"
+ fi
+ RUN_AS_USER_EXITCODE=$?
+ # Now that we are the original user again, we may need to clean up the lock file.
+ if [ "X$LOCKPROP" != "X" ]
+ then
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ # Wrapper is not running so make sure the lock file is deleted.
+ if [ -f "$LOCKFILE" ]
+ then
+ rm "$LOCKFILE"
+ fi
+ fi
+ fi
+
+ exit $RUN_AS_USER_EXITCODE
+ fi
+}
+
+getpid() {
+ pid=""
+ if [ -f "$PIDFILE" ]
+ then
+ if [ -r "$PIDFILE" ]
+ then
+ pid=`cat "$PIDFILE"`
+ if [ "X$pid" != "X" ]
+ then
+ # It is possible that 'a' process with the pid exists but that it is not the
+ # correct process. This can happen in a number of cases, but the most
+ # common is during system startup after an unclean shutdown.
+ # The ps statement below looks for the specific wrapper command running as
+ # the pid. If it is not found then the pid file is considered to be stale.
+ case "$DIST_OS" in
+ 'freebsd')
+ pidtest=`$PSEXE -p $pid -o args | tail -1`
+ if [ "X$pidtest" = "XCOMMAND" ]
+ then
+ pidtest=""
+ fi
+ ;;
+ 'macosx')
+ pidtest=`$PSEXE -ww -p $pid -o command | grep -F "$WRAPPER_CMD" | tail -1`
+ ;;
+ 'solaris')
+ if [ -f "/usr/bin/pargs" ]
+ then
+ pidtest=`pargs $pid | fgrep "$WRAPPER_CMD" | tail -1`
+ else
+ case "$PSEXE" in
+ '/usr/ucb/ps')
+ pidtest=`$PSEXE -auxww $pid | fgrep "$WRAPPER_CMD" | tail -1`
+ ;;
+ '/usr/bin/ps')
+ TRUNCATED_CMD=`$PSEXE -o comm -p $pid | tail -1`
+ COUNT=`echo $TRUNCATED_CMD | wc -m`
+ COUNT=`echo ${COUNT}`
+ COUNT=`expr $COUNT - 1`
+ TRUNCATED_CMD=`echo $WRAPPER_CMD | cut -c1-$COUNT`
+ pidtest=`$PSEXE -o comm -p $pid | fgrep "$TRUNCATED_CMD" | tail -1`
+ ;;
+ '/bin/ps')
+ TRUNCATED_CMD=`$PSEXE -o comm -p $pid | tail -1`
+ COUNT=`echo $TRUNCATED_CMD | wc -m`
+ COUNT=`echo ${COUNT}`
+ COUNT=`expr $COUNT - 1`
+ TRUNCATED_CMD=`echo $WRAPPER_CMD | cut -c1-$COUNT`
+ pidtest=`$PSEXE -o comm -p $pid | fgrep "$TRUNCATED_CMD" | tail -1`
+ ;;
+ *)
+ echo "Unsupported ps command $PSEXE"
+ exit 1
+ ;;
+ esac
+ fi
+ ;;
+ 'hpux')
+ pidtest=`$PSEXE -p $pid -x -o args | grep -F "$WRAPPER_CMD" | tail -1`
+ ;;
+ *)
+ pidtest=`$PSEXE -p $pid -o args | grep -F "$WRAPPER_CMD" | tail -1`
+ ;;
+ esac
+
+ if [ "X$pidtest" = "X" ]
+ then
+ # This is a stale pid file.
+ rm -f "$PIDFILE"
+ eval echo `gettext 'Removed stale pid file: $PIDFILE'`
+ pid=""
+ fi
+ fi
+ else
+ eval echo `gettext 'Cannot read $PIDFILE.'`
+ exit 1
+ fi
+ fi
+}
+
+getstatus() {
+ STATUS=
+ if [ -f "$STATUSFILE" ]
+ then
+ if [ -r "$STATUSFILE" ]
+ then
+ STATUS=`cat "$STATUSFILE"`
+ fi
+ fi
+ if [ "X$STATUS" = "X" ]
+ then
+ STATUS="Unknown"
+ fi
+
+ JAVASTATUS=
+ if [ -f "$JAVASTATUSFILE" ]
+ then
+ if [ -r "$JAVASTATUSFILE" ]
+ then
+ JAVASTATUS=`cat "$JAVASTATUSFILE"`
+ fi
+ fi
+ if [ "X$JAVASTATUS" = "X" ]
+ then
+ JAVASTATUS="Unknown"
+ fi
+}
+
+testpid() {
+ case "$DIST_OS" in
+ 'solaris')
+ case "$PSEXE" in
+ '/usr/ucb/ps')
+ pid=`$PSEXE $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+ ;;
+ '/usr/bin/ps')
+ pid=`$PSEXE -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+ ;;
+ '/bin/ps')
+ pid=`$PSEXE -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+ ;;
+ *)
+ echo "Unsupported ps command $PSEXE"
+ exit 1
+ ;;
+ esac
+ ;;
+ *)
+ pid=`$PSEXE -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1` 2>/dev/null
+ ;;
+ esac
+ if [ "X$pid" = "X" ]
+ then
+ # Process is gone so remove the pid file.
+ rm -f "$PIDFILE"
+ pid=""
+ fi
+}
+
+launchdtrap() {
+ stopit
+ exit
+}
+
+waitforwrapperstop() {
+ getpid
+ while [ "X$pid" != "X" ] ; do
+ sleep 1
+ getpid
+ done
+}
+
+launchinternal() {
+ getpid
+ trap launchdtrap TERM
+ if [ "X$pid" = "X" ]
+ then
+ prepAdditionalParams "$@"
+
+ # The string passed to eval must handles spaces in paths correctly.
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
+ eval $COMMAND_LINE
+ else
+ eval echo `gettext '$APP_LONG_NAME is already running.'`
+ exit 1
+ fi
+ # launchd expects that this script stay up and running so we need to do our own monitoring of the Wrapper process.
+ if [ $WAIT_FOR_STARTED_STATUS = true ]
+ then
+ waitforwrapperstop
+ fi
+}
+
+console() {
+ eval echo `gettext 'Running $APP_LONG_NAME...'`
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ trap '' 3
+
+ prepAdditionalParams "$@"
+
+ # The string passed to eval must handles spaces in paths correctly.
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
+ eval $COMMAND_LINE
+ else
+ eval echo `gettext '$APP_LONG_NAME is already running.'`
+ exit 1
+ fi
+}
+
+waitforjavastartup() {
+ getstatus
+ eval echo $ECHOOPT `gettext 'Waiting for $APP_LONG_NAME...'`
+
+ # Wait until the timeout or we have something besides Unknown.
+ counter=15
+ while [ "$JAVASTATUS" = "Unknown" -a $counter -gt 0 -a -n "$JAVASTATUS" ] ; do
+ echo $ECHOOPT"."
+ sleep 1
+ getstatus
+ counter=`expr $counter - 1`
+ done
+
+ if [ -n "$WAIT_FOR_STARTED_TIMEOUT" ] ; then
+ counter=$WAIT_FOR_STARTED_TIMEOUT
+ else
+ counter=120
+ fi
+ while [ "$JAVASTATUS" != "STARTED" -a "$JAVASTATUS" != "Unknown" -a $counter -gt 0 -a -n "$JAVASTATUS" ] ; do
+ echo $ECHOOPT"."
+ sleep 1
+ getstatus
+ counter=`expr $counter - 1`
+ done
+ if [ "X$ECHOOPT" != "X" ] ; then
+ echo ""
+ fi
+}
+
+startwait() {
+ if [ $WAIT_FOR_STARTED_STATUS = true ]
+ then
+ waitforjavastartup
+ fi
+ # Sleep for a few seconds to allow for intialization if required
+ # then test to make sure we're still running.
+ #
+ i=0
+ while [ $i -lt $WAIT_AFTER_STARTUP ]
+ do
+ sleep 1
+ echo $ECHOOPT"."
+ i=`expr $i + 1`
+ done
+ if [ $WAIT_AFTER_STARTUP -gt 0 -o $WAIT_FOR_STARTED_STATUS = true ]
+ then
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext ' WARNING: $APP_LONG_NAME may have failed to start.'`
+ exit 1
+ else
+ eval echo `gettext ' running: PID:$pid'`
+ fi
+ else
+ echo ""
+ fi
+}
+
+macosxstart() {
+ # The daemon has been installed.
+ eval echo `gettext 'Starting $APP_LONG_NAME. Detected Mac OSX and installed launchd daemon.'`
+ if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
+ eval echo `gettext 'Must be root to perform this action.'`
+ exit 1
+ fi
+
+ getpid
+ if [ "X$pid" != "X" ] ; then
+ eval echo `gettext '$APP_LONG_NAME is already running.'`
+ exit 1
+ fi
+
+ # If the daemon was just installed, it may not be loaded.
+ LOADED_PLIST=`launchctl list | grep ${APP_PLIST_BASE}`
+ if [ "X${LOADED_PLIST}" = "X" ] ; then
+ launchctl load /Library/LaunchDaemons/${APP_PLIST}
+ fi
+ # If launchd is set to run the daemon already at Load, we don't need to call start
+ getpid
+ if [ "X$pid" == "X" ] ; then
+ launchctl start ${APP_PLIST_BASE}
+ fi
+
+ startwait
+}
+
+upstartstart() {
+ # The daemon has been installed.
+ eval echo `gettext 'Starting $APP_LONG_NAME. Detected Linux and installed upstart.'`
+ if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
+ eval echo `gettext 'Must be root to perform this action.'`
+ exit 1
+ fi
+
+ getpid
+ if [ "X$pid" != "X" ] ; then
+ eval echo `gettext '$APP_LONG_NAME is already running.'`
+ exit 1
+ fi
+
+ /sbin/start ${APP_NAME}
+
+ startwait
+}
+
+start() {
+ eval echo `gettext 'Starting $APP_LONG_NAME...'`
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ prepAdditionalParams "$@"
+
+ # The string passed to eval must handles spaces in paths correctly.
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
+ eval $COMMAND_LINE
+ else
+ eval echo `gettext '$APP_LONG_NAME is already running.'`
+ exit 1
+ fi
+
+ startwait
+}
+
+stopit() {
+ # $1 exit if down flag
+
+ eval echo `gettext 'Stopping $APP_LONG_NAME...'`
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext '$APP_LONG_NAME was not running.'`
+ if [ "X$1" = "X1" ]
+ then
+ exit 1
+ fi
+ else
+ if [ "X$IGNORE_SIGNALS" = "X" ]
+ then
+ # Running so try to stop it.
+ kill $pid
+ if [ $? -ne 0 ]
+ then
+ # An explanation for the failure should have been given
+ eval echo `gettext 'Unable to stop $APP_LONG_NAME.'`
+ exit 1
+ fi
+ else
+ rm -f "$ANCHORFILE"
+ if [ -f "$ANCHORFILE" ]
+ then
+ # An explanation for the failure should have been given
+ eval echo `gettext 'Unable to stop $APP_LONG_NAME.'`
+ exit 1
+ fi
+ fi
+
+ # We can not predict how long it will take for the wrapper to
+ # actually stop as it depends on settings in wrapper.conf.
+ # Loop until it does.
+ savepid=$pid
+ CNT=0
+ TOTCNT=0
+ while [ "X$pid" != "X" ]
+ do
+ # Show a waiting message every 5 seconds.
+ if [ "$CNT" -lt "5" ]
+ then
+ CNT=`expr $CNT + 1`
+ else
+ eval echo `gettext 'Waiting for $APP_LONG_NAME to exit...'`
+ CNT=0
+ fi
+ TOTCNT=`expr $TOTCNT + 1`
+
+ sleep 1
+
+ testpid
+ done
+
+ pid=$savepid
+ testpid
+ if [ "X$pid" != "X" ]
+ then
+ eval echo `gettext 'Failed to stop $APP_LONG_NAME.'`
+ exit 1
+ else
+ eval echo `gettext 'Stopped $APP_LONG_NAME.'`
+ fi
+ fi
+}
+
+pause() {
+ eval echo `gettext 'Pausing $APP_LONG_NAME.'`
+}
+
+resume() {
+ eval echo `gettext 'Resuming $APP_LONG_NAME.'`
+}
+
+status() {
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext '$APP_LONG_NAME is not running.'`
+ exit 1
+ else
+ if [ "X$DETAIL_STATUS" = "X" ]
+ then
+ eval echo `gettext '$APP_LONG_NAME is running: PID:$pid'`
+ else
+ getstatus
+ eval echo `gettext '$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS'`
+ fi
+ exit 0
+ fi
+}
+
+installUpstart() {
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon using upstart..'`
+ if [ -f "${REALDIR}/${APP_NAME}.install" ] ; then
+ eval echo `gettext ' a custom upstart conf file ${APP_NAME}.install found'`
+ cp "${REALDIR}/${APP_NAME}.install" "/etc/init/${APP_NAME}.conf"
+ else
+ eval echo `gettext ' creating default upstart conf file..'`
+ echo "# ${APP_NAME} - ${APP_LONG_NAME}" > "/etc/init/${APP_NAME}.conf"
+ echo "description \"${APP_LONG_NAME}\"" >> "/etc/init/${APP_NAME}.conf"
+ echo "author \"Tanuki Software Ltd. \"" >> "/etc/init/${APP_NAME}.conf"
+ echo "start on runlevel [2345]" >> "/etc/init/${APP_NAME}.conf"
+ echo "stop on runlevel [!2345]" >> "/etc/init/${APP_NAME}.conf"
+ echo "env LANG=${LANG}" >> "/etc/init/${APP_NAME}.conf"
+ echo "exec \"${REALPATH}\" upstartinternal" >> "/etc/init/${APP_NAME}.conf"
+ fi
+}
+
+installdaemon() {
+ if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
+ eval echo `gettext 'Must be root to perform this action.'`
+ exit 1
+ else
+ APP_NAME_LOWER=`echo "$APP_NAME" | $TREXE "[A-Z]" "[a-z]"`
+ if [ "$DIST_OS" = "solaris" ] ; then
+ eval echo `gettext 'Detected Solaris:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME"] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/K20$APP_NAME_LOWER"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/S20$APP_NAME_LOWER"
+ fi
+ elif [ "$DIST_OS" = "linux" ] ; then
+ if [ -f /etc/redhat-release -o -f /etc/redhat_version -o -f /etc/fedora-release ] ; then
+ eval echo `gettext 'Detected RHEL or Fedora:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" -o -f "/etc/init/${APP_NAME}.conf" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ if [ -n "$USE_UPSTART" -a -d "/etc/init" ] ; then
+ installUpstart
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
+ /sbin/chkconfig --add "$APP_NAME"
+ /sbin/chkconfig "$APP_NAME" on
+ fi
+ fi
+ elif [ -f /etc/SuSE-release ] ; then
+ eval echo `gettext 'Detected SuSE or SLES:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
+ insserv "/etc/init.d/$APP_NAME"
+ fi
+ elif [ -f /etc/lsb-release ] ; then
+ eval echo `gettext 'Detected Ubuntu:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" -o -f "/etc/init/${APP_NAME}.conf" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ if [ -n "$USE_UPSTART" -a -d "/etc/init" ] ; then
+ installUpstart
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon using init.d..'`
+ ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
+ update-rc.d "$APP_NAME" defaults
+ fi
+ fi
+ else
+ eval echo `gettext 'Detected Linux:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ ln -s "$REALPATH" /etc/init.d/$APP_NAME
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/K20$APP_NAME_LOWER"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/S20$APP_NAME_LOWER"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc5.d/S20$APP_NAME_LOWER"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc5.d/K20$APP_NAME_LOWER"
+ fi
+ fi
+ elif [ "$DIST_OS" = "hpux" ] ; then
+ eval echo `gettext 'Detected HP-UX:'`
+ if [ -f "/sbin/init.d/$APP_NAME" -o -L "/sbin/init.d/$APP_NAME" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ ln -s "$REALPATH" "/sbin/init.d/$APP_NAME"
+ ln -s "/sbin/init.d/$APP_NAME" "/sbin/rc3.d/K20$APP_NAME_LOWER"
+ ln -s "/sbin/init.d/$APP_NAME" "/sbin/rc3.d/S20$APP_NAME_LOWER"
+ fi
+ elif [ "$DIST_OS" = "aix" ] ; then
+ eval echo `gettext 'Detected AIX:'`
+ if [ -f "/etc/rc.d/init.d/$APP_NAME" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed as rc.d script.'`
+ exit 1
+ elif [ -n "`/usr/sbin/lsitab $APP_NAME`" -a -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed as SRC service.'`
+ exit 1
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ if [ -n "`/usr/sbin/lsitab install_assist`" ] ; then
+ eval echo `gettext ' The task /usr/sbin/install_assist was found in the inittab, this might cause problems for all subsequent tasks to launch at this process is known to block the init task. Please make sure this task is not needed anymore and remove/deactivate it.'`
+ fi
+ /usr/bin/mkssys -s "$APP_NAME" -p "$REALPATH" -a "launchdinternal" -u 0 -f 9 -n 15 -S
+ /usr/sbin/mkitab "$APP_NAME":2:once:"/usr/bin/startsrc -s \"${APP_NAME}\" >/dev/console 2>&1"
+
+ fi
+ elif [ "$DIST_OS" = "freebsd" ] ; then
+ eval echo `gettext 'Detected FreeBSD:'`
+ if [ -f "/etc/rc.d/$APP_NAME" -o -L "/etc/rc.d/$APP_NAME" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ sed -i .bak "/${APP_NAME}_enable=\"YES\"/d" /etc/rc.conf
+ if [ -f "${REALDIR}/${APP_NAME}.install" ] ; then
+ ln -s "${REALDIR}/${APP_NAME}.install" "/etc/rc.d/$APP_NAME"
+ else
+ echo '#!/bin/sh' > "/etc/rc.d/$APP_NAME"
+ echo "#" >> "/etc/rc.d/$APP_NAME"
+ echo "# PROVIDE: $APP_NAME" >> "/etc/rc.d/$APP_NAME"
+ echo "# REQUIRE: NETWORKING" >> "/etc/rc.d/$APP_NAME"
+ echo "# KEYWORD: shutdown" >> "/etc/rc.d/$APP_NAME"
+ echo ". /etc/rc.subr" >> "/etc/rc.d/$APP_NAME"
+ echo "name=\"$APP_NAME\"" >> "/etc/rc.d/$APP_NAME"
+ echo "rcvar=\`set_rcvar\`" >> "/etc/rc.d/$APP_NAME"
+ echo "command=\"${REALPATH}\"" >> "/etc/rc.d/$APP_NAME"
+ echo 'start_cmd="${name}_start"' >> "/etc/rc.d/$APP_NAME"
+ echo 'load_rc_config $name' >> "/etc/rc.d/$APP_NAME"
+ echo 'status_cmd="${name}_status"' >> "/etc/rc.d/$APP_NAME"
+ echo 'stop_cmd="${name}_stop"' >> "/etc/rc.d/$APP_NAME"
+ echo "${APP_NAME}_status() {" >> "/etc/rc.d/$APP_NAME"
+ echo '${command} status' >> "/etc/rc.d/$APP_NAME"
+ echo '}' >> "/etc/rc.d/$APP_NAME"
+ echo "${APP_NAME}_stop() {" >> "/etc/rc.d/$APP_NAME"
+ echo '${command} stop' >> "/etc/rc.d/$APP_NAME"
+ echo '}' >> "/etc/rc.d/$APP_NAME"
+ echo "${APP_NAME}_start() {" >> "/etc/rc.d/$APP_NAME"
+ echo '${command} start' >> "/etc/rc.d/$APP_NAME"
+ echo '}' >> "/etc/rc.d/$APP_NAME"
+ echo 'run_rc_command "$1"' >> "/etc/rc.d/$APP_NAME"
+ fi
+ echo "${APP_NAME}_enable=\"YES\"" >> /etc/rc.conf
+ chmod 555 "/etc/rc.d/$APP_NAME"
+ fi
+ elif [ "$DIST_OS" = "macosx" ] ; then
+ eval echo `gettext 'Detected Mac OSX:'`
+ if [ -f "/Library/LaunchDaemons/${APP_PLIST}" -o -L "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ if [ -f "${REALDIR}/${APP_PLIST}" ] ; then
+ ln -s "${REALDIR}/${APP_PLIST}" "/Library/LaunchDaemons/${APP_PLIST}"
+ else
+ echo "" > "/Library/LaunchDaemons/${APP_PLIST}"
+ echo "> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo "" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " Label" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " ${APP_PLIST_BASE}" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " ProgramArguments" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " ${REALPATH}" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " launchdinternal" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " OnDemand" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " RunAtLoad" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
+ if [ "X$RUN_AS_USER" != "X" ] ; then
+ echo " UserName" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " ${RUN_AS_USER}" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+ echo " " >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo "" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+ chmod 555 "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+ elif [ "$DIST_OS" = "zos" ] ; then
+ eval echo `gettext 'Detected z/OS:'`
+ if [ -f /etc/rc.bak ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ exit 1
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
+ cp /etc/rc /etc/rc.bak
+ sed "s:echo /etc/rc script executed, \`date\`::g" /etc/rc.bak > /etc/rc
+ echo "_BPX_JOBNAME='${APP_NAME}' \"${REALDIR}/${APP_NAME}\" start" >>/etc/rc
+ echo '/etc/rc script executed, `date`' >>/etc/rc
+ fi
+ else
+ eval echo `gettext 'Install not currently supported for $DIST_OS'`
+ exit 1
+ fi
+ fi
+}
+
+removedaemon() {
+ if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
+ eval echo `gettext 'Must be root to perform this action.'`
+ exit 1
+ else
+ APP_NAME_LOWER=`echo "$APP_NAME" | $TREXE "[A-Z]" "[a-z]"`
+ if [ "$DIST_OS" = "solaris" ] ; then
+ eval echo `gettext 'Detected Solaris:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ for i in "/etc/rc3.d/S20$APP_NAME_LOWER" "/etc/rc3.d/K20$APP_NAME_LOWER" "/etc/init.d/$APP_NAME"
+ do
+ rm -f $i
+ done
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "linux" ] ; then
+ if [ -f /etc/redhat-release -o -f /etc/redhat_version -o -f /etc/fedora-release ] ; then
+ eval echo `gettext 'Detected RHEL or Fedora:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ /sbin/chkconfig "$APP_NAME" off
+ /sbin/chkconfig --del "$APP_NAME"
+ rm -f "/etc/init.d/$APP_NAME"
+ elif [ -f "/etc/init/${APP_NAME}.conf" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon from upstart...'`
+ rm "/etc/init/${APP_NAME}.conf"
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ -f /etc/SuSE-release ] ; then
+ eval echo `gettext 'Detected SuSE or SLES:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ insserv -r "/etc/init.d/$APP_NAME"
+ rm -f "/etc/init.d/$APP_NAME"
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ -f /etc/lsb-release ] ; then
+ eval echo `gettext 'Detected Ubuntu:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon from init.d...'`
+ update-rc.d -f "$APP_NAME" remove
+ rm -f "/etc/init.d/$APP_NAME"
+ elif [ -f "/etc/init/${APP_NAME}.conf" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon from upstart...'`
+ rm "/etc/init/${APP_NAME}.conf"
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ else
+ eval echo `gettext 'Detected Linux:'`
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ for i in "/etc/rc3.d/K20$APP_NAME_LOWER" "/etc/rc5.d/K20$APP_NAME_LOWER" "/etc/rc3.d/S20$APP_NAME_LOWER" "/etc/init.d/$APP_NAME" "/etc/rc5.d/S20$APP_NAME_LOWER"
+ do
+ rm -f $i
+ done
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ fi
+ elif [ "$DIST_OS" = "hpux" ] ; then
+ eval echo `gettext 'Detected HP-UX:'`
+ if [ -f "/sbin/init.d/$APP_NAME" -o -L "/sbin/init.d/$APP_NAME" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ for i in "/sbin/rc3.d/K20$APP_NAME_LOWER" "/sbin/rc3.d/S20$APP_NAME_LOWER" "/sbin/init.d/$APP_NAME"
+ do
+ rm -f $i
+ done
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "aix" ] ; then
+ eval echo `gettext 'Detected AIX:'`
+ if [ -f "/etc/rc.d/init.d/$APP_NAME" -o -L "/etc/rc.d/init.d/$APP_NAME" -o -n "`/usr/sbin/lsitab $APP_NAME`" -o -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ if [ -f "/etc/rc.d/init.d/$APP_NAME" -o -L "/etc/rc.d/init.d/$APP_NAME" ] ; then
+ for i in "/etc/rc.d/rc2.d/S20$APP_NAME_LOWER" "/etc/rc.d/rc2.d/K20$APP_NAME_LOWER" "/etc/rc.d/init.d/$APP_NAME"
+ do
+ rm -f $i
+ done
+ fi
+ if [ -n "`/usr/sbin/lsitab $APP_NAME`" -o -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ /usr/sbin/rmitab $APP_NAME
+ /usr/bin/rmssys -s $APP_NAME
+ fi
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "freebsd" ] ; then
+ eval echo `gettext 'Detected FreeBSD:'`
+ if [ -f "/etc/rc.d/$APP_NAME" -o -L "/etc/rc.d/$APP_NAME" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ for i in "/etc/rc.d/$APP_NAME"
+ do
+ rm -f $i
+ done
+ sed -i .bak "/${APP_NAME}_enable=\"YES\"/d" /etc/rc.conf
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "macosx" ] ; then
+ eval echo `gettext 'Detected Mac OSX:'`
+ if [ -f "/Library/LaunchDaemons/${APP_PLIST}" -o -L "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ # Make sure the plist is installed
+ LOADED_PLIST=`launchctl list | grep ${APP_PLIST_BASE}`
+ if [ "X${LOADED_PLIST}" != "X" ] ; then
+ launchctl unload "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+ rm -f "/Library/LaunchDaemons/${APP_PLIST}"
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "zos" ] ; then
+ eval echo `gettext 'Detected z/OS:'`
+ if [ -f /etc/rc.bak ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
+ cp /etc/rc /etc/rc.bak
+ sed "s/_BPX_JOBNAME=\'APP_NAME\'.*//g" /etc/rc.bak > /etc/rc
+ rm /etc/rc.bak
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ else
+ eval echo `gettext 'Remove not currently supported for $DIST_OS'`
+ exit 1
+ fi
+ fi
+}
+
+dump() {
+ eval echo `gettext 'Dumping $APP_LONG_NAME...'`
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext '$APP_LONG_NAME was not running.'`
+ else
+ kill -3 $pid
+
+ if [ $? -ne 0 ]
+ then
+ eval echo `gettext 'Failed to dump $APP_LONG_NAME.'`
+ exit 1
+ else
+ eval echo `gettext 'Dumped $APP_LONG_NAME.'`
+ fi
+ fi
+}
+
+# Used by HP-UX init scripts.
+startmsg() {
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:Stopped'`
+ else
+ if [ "X$DETAIL_STATUS" = "X" ]
+ then
+ eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:Running'`
+ else
+ getstatus
+ eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS'`
+ fi
+ fi
+}
+
+# Used by HP-UX init scripts.
+stopmsg() {
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:Stopped'`
+ else
+ if [ "X$DETAIL_STATUS" = "X" ]
+ then
+ eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:Running'`
+ else
+ getstatus
+ eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS'`
+ fi
+ fi
+}
+
+showUsage() {
+ # $1 bad command
+
+ if [ -n "$1" ]
+ then
+ eval echo `gettext 'Unexpected command: $1'`
+ echo "";
+ fi
+
+ eval MSG=`gettext 'Usage: '`
+ if [ -n "$FIXED_COMMAND" ] ; then
+ if [ -n "$PASS_THROUGH" ] ; then
+ echo "${MSG} $0 {JavaAppArgs}"
+ else
+ echo "${MSG} $0"
+ fi
+ else
+ if [ -n "$PAUSABLE" ] ; then
+ if [ -n "$PASS_THROUGH" ] ; then
+ echo "${MSG} $0 [ console {JavaAppArgs} | start {JavaAppArgs} | stop | restart {JavaAppArgs} | condrestart {JavaAppArgs} | pause | resume | status | install | remove | dump ]"
+ else
+ echo "${MSG} $0 [ console | start | stop | restart | condrestart | pause | resume | status | install | remove | dump ]"
+ fi
+ else
+ if [ -n "$PASS_THROUGH" ] ; then
+ echo "${MSG} $0 [ console {JavaAppArgs} | start {JavaAppArgs} | stop | restart {JavaAppArgs} | condrestart {JavaAppArgs} | status | install | remove | dump ]"
+ else
+ echo "${MSG} $0 [ console | start | stop | restart | condrestart | status | install | remove | dump ]"
+ fi
+ fi
+ fi
+
+ if [ ! -n "$BRIEF_USAGE" ]
+ then
+ echo "";
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ echo "`gettext 'Commands:'`"
+ echo "`gettext ' console Launch in the current console.'`"
+ echo "`gettext ' start Start in the background as a daemon process.'`"
+ echo "`gettext ' stop Stop if running as a daemon or in another console.'`"
+ echo "`gettext ' restart Stop if running and then start.'`"
+ echo "`gettext ' condrestart Restart only if already running.'`"
+ if [ -n "$PAUSABLE" ] ; then
+ echo "`gettext ' pause Pause if running.'`"
+ echo "`gettext ' resume Resume if paused.'`"
+ fi
+ echo "`gettext ' status Query the current status.'`"
+ echo "`gettext ' install Install to start automatically when system boots.'`"
+ echo "`gettext ' remove Uninstall.'`"
+ echo "`gettext ' dump Request a Java thread dump if running.'`"
+ echo "";
+ fi
+ if [ -n "$PASS_THROUGH" ] ; then
+ echo "`gettext 'JavaAppArgs: Zero or more arguments which will be passed to the Java application.'`"
+ echo "";
+ fi
+ fi
+
+ exit 1
+}
+
+docommand() {
+ case "$COMMAND" in
+ 'console')
+ checkUser touchlock "$@"
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+ console "$@"
+ ;;
+
+ 'start')
+ if [ "$DIST_OS" = "macosx" -a -f "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ macosxstart
+ elif [ "$DIST_OS" = "linux" -a -f "/etc/init/${APP_NAME}.conf" ] ; then
+ upstartstart
+ else
+ checkUser touchlock "$@"
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+ start "$@"
+ fi
+ ;;
+
+ 'stop')
+ checkUser "" "$COMMAND"
+ stopit "0"
+ ;;
+
+ 'restart')
+ checkUser touchlock "$COMMAND"
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+ stopit "0"
+ start "$@"
+ ;;
+
+ 'condrestart')
+ checkUser touchlock "$COMMAND"
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+ stopit "1"
+ start "$@"
+ ;;
+
+ 'pause')
+ if [ -n "$PAUSABLE" ]
+ then
+ pause
+ else
+ showUsage "$COMMAND"
+ fi
+ ;;
+
+ 'resume')
+ if [ -n "$PAUSABLE" ]
+ then
+ resume
+ else
+ showUsage "$COMMAND"
+ fi
+ ;;
+
+ 'status')
+ status
+ ;;
+
+ 'install')
+ installdaemon
+ ;;
+
+ 'remove')
+ removedaemon
+ ;;
+
+ 'dump')
+ checkUser "" "$COMMAND"
+ dump
+ ;;
+
+ 'start_msg')
+ # Internal command called by launchd on HP-UX.
+ checkUser "" "$COMMAND"
+ startmsg
+ ;;
+
+ 'stop_msg')
+ # Internal command called by launchd on HP-UX.
+ checkUser "" "$COMMAND"
+ stopmsg
+ ;;
+
+ 'launchdinternal' | 'upstartinternal')
+ if [ ! "$DIST_OS" = "macosx" -o ! -f "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ checkUser touchlock "$@"
+ fi
+ # Internal command called by launchd on Max OSX.
+ # We do not want to call checkUser here as it is handled in the launchd plist file. Doing it here would confuse launchd.
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+ launchinternal "$@"
+ ;;
+
+ *)
+ showUsage "$COMMAND"
+ ;;
+ esac
+}
+
+docommand "$@"
+
+exit 0
diff --git a/rapla-source-1.8.2/service/bin/wrapper b/rapla/service/bin/wrapper
similarity index 100%
rename from rapla-source-1.8.2/service/bin/wrapper
rename to rapla/service/bin/wrapper
diff --git a/rapla-source-1.8.2/service/bin/wrapper.exe b/rapla/service/bin/wrapper.exe
similarity index 100%
rename from rapla-source-1.8.2/service/bin/wrapper.exe
rename to rapla/service/bin/wrapper.exe
diff --git a/rapla-source-1.8.2/service/conf/wrapper.conf b/rapla/service/conf/wrapper.conf
similarity index 97%
rename from rapla-source-1.8.2/service/conf/wrapper.conf
rename to rapla/service/conf/wrapper.conf
index 3fafe31..aebbe1c 100644
--- a/rapla-source-1.8.2/service/conf/wrapper.conf
+++ b/rapla/service/conf/wrapper.conf
@@ -1,212 +1,212 @@
-#encoding=UTF-8
-# Configuration files must begin with a line specifying the encoding
-# of the the file.
-
-#********************************************************************
-# Wrapper License Properties (Ignored by Community Edition)
-#********************************************************************
-# Professional and Standard Editions of the Wrapper require a valid
-# License Key to start. Licenses can be purchased or a trial license
-# requested on the following pages:
-# http://wrapper.tanukisoftware.com/purchase
-# http://wrapper.tanukisoftware.com/trial
-
-# Include file problems can be debugged by removing the first '#'
-# from the following line:
-##include.debug
-
-# The Wrapper will look for either of the following optional files for a
-# valid License Key. License Key properties can optionally be included
-# directly in this configuration file.
-#include ../conf/wrapper-license.conf
-#include ../conf/wrapper-license-%WRAPPER_HOST_NAME%.conf
-
-# The following property will output information about which License Key(s)
-# are being found, and can aid in resolving any licensing problems.
-#wrapper.license.debug=FALSE
-
-#********************************************************************
-# Wrapper Localization
-#********************************************************************
-# Specify the locale which the Wrapper should use. By default the system
-# locale is used.
-#wrapper.lang=en_US # en_US or ja_JP
-
-# Specify the location of the Wrapper's language resources. If these are
-# missing, the Wrapper will default to the en_US locale.
-wrapper.lang.folder=../lang
-
-#********************************************************************
-# Wrapper Java Properties
-#********************************************************************
-# Java Application
-# Locate the java binary on the system PATH:
-wrapper.java.command=java
-# Specify a specific java binary:
-#set.JAVA_HOME=/java/path
-#wrapper.java.command=%JAVA_HOME%/bin/java
-
-# Tell the Wrapper to log the full generated Java command line.
-#wrapper.java.command.loglevel=INFO
-
-# Java Main class. This class must implement the WrapperListener interface
-# or guarantee that the WrapperManager class is initialized. Helper
-# classes are provided to do this for you. See the Integration section
-# of the documentation for details.
-wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
-
-# Java Classpath (include wrapper.jar) Add class path elements as
-# needed starting from 1
-wrapper.java.classpath.1=../../raplabootstrap.jar
-wrapper.java.classpath.2=../lib/wrapper.jar
-
-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=../lib
-
-# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
-wrapper.java.additional.auto_bits=TRUE
-
-# Java Additional Parameters
-# wrapper.java.additional.1=
-
-# Initial Java Heap Size (in MB)
-#wrapper.java.initmemory=3
-
-# Maximum Java Heap Size (in MB)
-#wrapper.java.maxmemory=64
-
-# Application parameters. Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.rapla.bootstrap.RaplaServerAsServiceLoader
-
-#********************************************************************
-# Wrapper Logging Properties
-#********************************************************************
-# Enables Debug output from the Wrapper.
-# wrapper.debug=TRUE
-
-# Format of output for the console. (See docs for formats)
-wrapper.console.format=PM
-
-# Log Level for console output. (See docs for log levels)
-wrapper.console.loglevel=INFO
-
-# Log file to use for wrapper output logging.
-wrapper.logfile=../../logs/wrapper.log
-
-# Format of output for the log file. (See docs for formats)
-wrapper.logfile.format=LPTM
-
-# Log Level for log file output. (See docs for log levels)
-wrapper.logfile.loglevel=WARN
-
-# Maximum size that the log file will be allowed to grow to before
-# the log is rolled. Size is specified in bytes. The default value
-# of 0, disables log rolling. May abbreviate with the 'k' (kb) or
-# 'm' (mb) suffix. For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=10m
-
-# Maximum number of rolled log files which will be allowed before old
-# files are deleted. The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=10
-
-# Log Level for sys/event log output. (See docs for log levels)
-wrapper.syslog.loglevel=WARN
-
-#********************************************************************
-# Wrapper General Properties
-#********************************************************************
-# Allow for the use of non-contiguous numbered properties
-wrapper.ignore_sequence_gaps=TRUE
-
-# Do not start if the pid file already exists.
-wrapper.pidfile.strict=TRUE
-
-# Title to use when running as a console
-wrapper.console.title=Rapla
-
-#********************************************************************
-# Wrapper JVM Checks
-#********************************************************************
-# Detect DeadLocked Threads in the JVM. (Requires Standard Edition)
-wrapper.check.deadlock=TRUE
-wrapper.check.deadlock.interval=10
-wrapper.check.deadlock.action=RESTART
-wrapper.check.deadlock.output=FULL
-
-# Out Of Memory detection.
-# (Ignore output from dumping the configuration to the console. This is only needed by the TestWrapper sample application.)
-wrapper.filter.trigger.999=wrapper.filter.trigger.*java.lang.OutOfMemoryError
-wrapper.filter.allow_wildcards.999=TRUE
-wrapper.filter.action.999=NONE
-# Ignore -verbose:class output to avoid false positives.
-wrapper.filter.trigger.1000=[Loaded java.lang.OutOfMemoryError
-wrapper.filter.action.1000=NONE
-# (Simple match)
-wrapper.filter.trigger.1001=java.lang.OutOfMemoryError
-# (Only match text in stack traces if -XX:+PrintClassHistogram is being used.)
-#wrapper.filter.trigger.1001=Exception in thread "*" java.lang.OutOfMemoryError
-#wrapper.filter.allow_wildcards.1001=TRUE
-wrapper.filter.action.1001=RESTART
-wrapper.filter.message.1001=The JVM has run out of memory.
-
-#********************************************************************
-# Wrapper Email Notifications. (Requires Professional Edition)
-#********************************************************************
-# Common Event Email settings.
-#wrapper.event.default.email.debug=TRUE
-#wrapper.event.default.email.smtp.host=
-#wrapper.event.default.email.smtp.port=25
-#wrapper.event.default.email.subject=[%WRAPPER_HOSTNAME%:%WRAPPER_NAME%:%WRAPPER_EVENT_NAME%] Event Notification
-#wrapper.event.default.email.sender=
-#wrapper.event.default.email.recipient=
-
-# Configure the log attached to event emails.
-#wrapper.event.default.email.attach_log=TRUE
-#wrapper.event.default.email.maillog.lines=50
-#wrapper.event.default.email.maillog.format=LPTM
-#wrapper.event.default.email.maillog.loglevel=INFO
-
-# Enable specific event emails.
-#wrapper.event.wrapper_start.email=TRUE
-#wrapper.event.jvm_prelaunch.email=TRUE
-#wrapper.event.jvm_start.email=TRUE
-#wrapper.event.jvm_started.email=TRUE
-#wrapper.event.jvm_deadlock.email=TRUE
-#wrapper.event.jvm_stop.email=TRUE
-#wrapper.event.jvm_stopped.email=TRUE
-#wrapper.event.jvm_restart.email=TRUE
-#wrapper.event.jvm_failed_invocation.email=TRUE
-#wrapper.event.jvm_max_failed_invocations.email=TRUE
-#wrapper.event.jvm_kill.email=TRUE
-#wrapper.event.jvm_killed.email=TRUE
-#wrapper.event.jvm_unexpected_exit.email=TRUE
-#wrapper.event.wrapper_stop.email=TRUE
-
-# Specify custom mail content
-wrapper.event.jvm_restart.email.body=The JVM was restarted.\n\nPlease check on its status.\n
-
-#********************************************************************
-# Wrapper Windows NT/2000/XP Service Properties
-#********************************************************************
-# WARNING - Do not modify any of these properties when an application
-# using this configuration file has been installed as a service.
-# Please uninstall the service before modifying this section. The
-# service can then be reinstalled.
-
-# Name of the service
-wrapper.name=Raplaxxxxxxxx
-
-# Display name of the service
-wrapper.displayname=Rapla Server
-# Description of the service
-wrapper.description=Rapla resource-management server
-
-# Service dependencies. Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed. AUTO_START, DELAY_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
-
+#encoding=UTF-8
+# Configuration files must begin with a line specifying the encoding
+# of the the file.
+
+#********************************************************************
+# Wrapper License Properties (Ignored by Community Edition)
+#********************************************************************
+# Professional and Standard Editions of the Wrapper require a valid
+# License Key to start. Licenses can be purchased or a trial license
+# requested on the following pages:
+# http://wrapper.tanukisoftware.com/purchase
+# http://wrapper.tanukisoftware.com/trial
+
+# Include file problems can be debugged by removing the first '#'
+# from the following line:
+##include.debug
+
+# The Wrapper will look for either of the following optional files for a
+# valid License Key. License Key properties can optionally be included
+# directly in this configuration file.
+#include ../conf/wrapper-license.conf
+#include ../conf/wrapper-license-%WRAPPER_HOST_NAME%.conf
+
+# The following property will output information about which License Key(s)
+# are being found, and can aid in resolving any licensing problems.
+#wrapper.license.debug=FALSE
+
+#********************************************************************
+# Wrapper Localization
+#********************************************************************
+# Specify the locale which the Wrapper should use. By default the system
+# locale is used.
+#wrapper.lang=en_US # en_US or ja_JP
+
+# Specify the location of the Wrapper's language resources. If these are
+# missing, the Wrapper will default to the en_US locale.
+wrapper.lang.folder=../lang
+
+#********************************************************************
+# Wrapper Java Properties
+#********************************************************************
+# Java Application
+# Locate the java binary on the system PATH:
+wrapper.java.command=java
+# Specify a specific java binary:
+#set.JAVA_HOME=/java/path
+#wrapper.java.command=%JAVA_HOME%/bin/java
+
+# Tell the Wrapper to log the full generated Java command line.
+#wrapper.java.command.loglevel=INFO
+
+# Java Main class. This class must implement the WrapperListener interface
+# or guarantee that the WrapperManager class is initialized. Helper
+# classes are provided to do this for you. See the Integration section
+# of the documentation for details.
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar) Add class path elements as
+# needed starting from 1
+wrapper.java.classpath.1=../../raplabootstrap.jar
+wrapper.java.classpath.2=../lib/wrapper.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=../lib
+
+# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
+wrapper.java.additional.auto_bits=TRUE
+
+# Java Additional Parameters
+# wrapper.java.additional.1=
+
+# Initial Java Heap Size (in MB)
+#wrapper.java.initmemory=3
+
+# Maximum Java Heap Size (in MB)
+#wrapper.java.maxmemory=64
+
+# Application parameters. Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.rapla.bootstrap.RaplaServerAsServiceLoader
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Enables Debug output from the Wrapper.
+# wrapper.debug=TRUE
+
+# Format of output for the console. (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output. (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=../../logs/wrapper.log
+
+# Format of output for the log file. (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output. (See docs for log levels)
+wrapper.logfile.loglevel=WARN
+
+# Maximum size that the log file will be allowed to grow to before
+# the log is rolled. Size is specified in bytes. The default value
+# of 0, disables log rolling. May abbreviate with the 'k' (kb) or
+# 'm' (mb) suffix. For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=10m
+
+# Maximum number of rolled log files which will be allowed before old
+# files are deleted. The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=10
+
+# Log Level for sys/event log output. (See docs for log levels)
+wrapper.syslog.loglevel=WARN
+
+#********************************************************************
+# Wrapper General Properties
+#********************************************************************
+# Allow for the use of non-contiguous numbered properties
+wrapper.ignore_sequence_gaps=TRUE
+
+# Do not start if the pid file already exists.
+wrapper.pidfile.strict=TRUE
+
+# Title to use when running as a console
+wrapper.console.title=Rapla
+
+#********************************************************************
+# Wrapper JVM Checks
+#********************************************************************
+# Detect DeadLocked Threads in the JVM. (Requires Standard Edition)
+wrapper.check.deadlock=TRUE
+wrapper.check.deadlock.interval=10
+wrapper.check.deadlock.action=RESTART
+wrapper.check.deadlock.output=FULL
+
+# Out Of Memory detection.
+# (Ignore output from dumping the configuration to the console. This is only needed by the TestWrapper sample application.)
+wrapper.filter.trigger.999=wrapper.filter.trigger.*java.lang.OutOfMemoryError
+wrapper.filter.allow_wildcards.999=TRUE
+wrapper.filter.action.999=NONE
+# Ignore -verbose:class output to avoid false positives.
+wrapper.filter.trigger.1000=[Loaded java.lang.OutOfMemoryError
+wrapper.filter.action.1000=NONE
+# (Simple match)
+wrapper.filter.trigger.1001=java.lang.OutOfMemoryError
+# (Only match text in stack traces if -XX:+PrintClassHistogram is being used.)
+#wrapper.filter.trigger.1001=Exception in thread "*" java.lang.OutOfMemoryError
+#wrapper.filter.allow_wildcards.1001=TRUE
+wrapper.filter.action.1001=RESTART
+wrapper.filter.message.1001=The JVM has run out of memory.
+
+#********************************************************************
+# Wrapper Email Notifications. (Requires Professional Edition)
+#********************************************************************
+# Common Event Email settings.
+#wrapper.event.default.email.debug=TRUE
+#wrapper.event.default.email.smtp.host=
+#wrapper.event.default.email.smtp.port=25
+#wrapper.event.default.email.subject=[%WRAPPER_HOSTNAME%:%WRAPPER_NAME%:%WRAPPER_EVENT_NAME%] Event Notification
+#wrapper.event.default.email.sender=
+#wrapper.event.default.email.recipient=
+
+# Configure the log attached to event emails.
+#wrapper.event.default.email.attach_log=TRUE
+#wrapper.event.default.email.maillog.lines=50
+#wrapper.event.default.email.maillog.format=LPTM
+#wrapper.event.default.email.maillog.loglevel=INFO
+
+# Enable specific event emails.
+#wrapper.event.wrapper_start.email=TRUE
+#wrapper.event.jvm_prelaunch.email=TRUE
+#wrapper.event.jvm_start.email=TRUE
+#wrapper.event.jvm_started.email=TRUE
+#wrapper.event.jvm_deadlock.email=TRUE
+#wrapper.event.jvm_stop.email=TRUE
+#wrapper.event.jvm_stopped.email=TRUE
+#wrapper.event.jvm_restart.email=TRUE
+#wrapper.event.jvm_failed_invocation.email=TRUE
+#wrapper.event.jvm_max_failed_invocations.email=TRUE
+#wrapper.event.jvm_kill.email=TRUE
+#wrapper.event.jvm_killed.email=TRUE
+#wrapper.event.jvm_unexpected_exit.email=TRUE
+#wrapper.event.wrapper_stop.email=TRUE
+
+# Specify custom mail content
+wrapper.event.jvm_restart.email.body=The JVM was restarted.\n\nPlease check on its status.\n
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+# using this configuration file has been installed as a service.
+# Please uninstall the service before modifying this section. The
+# service can then be reinstalled.
+
+# Name of the service
+wrapper.name=Raplaxxxxxxxx
+
+# Display name of the service
+wrapper.displayname=Rapla Server
+# Description of the service
+wrapper.description=Rapla resource-management server
+
+# Service dependencies. Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed. AUTO_START, DELAY_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
+
diff --git a/rapla-source-1.8.2/service/doc/readme.txt b/rapla/service/doc/readme.txt
similarity index 96%
rename from rapla-source-1.8.2/service/doc/readme.txt
rename to rapla/service/doc/readme.txt
index 6332f32..3a1f0bb 100644
--- a/rapla-source-1.8.2/service/doc/readme.txt
+++ b/rapla/service/doc/readme.txt
@@ -1,7 +1,7 @@
-Java Service Wrapper
-
-Complete documentation can be found online:
-http://wrapper.tanukisoftware.org
-
-Java docs are available online as well:
-http://wrapper.tanukisoftware.org/jdoc/index.html
+Java Service Wrapper
+
+Complete documentation can be found online:
+http://wrapper.tanukisoftware.org
+
+Java docs are available online as well:
+http://wrapper.tanukisoftware.org/jdoc/index.html
diff --git a/rapla-source-1.8.2/service/lib/libwrapper.so b/rapla/service/lib/libwrapper.so
similarity index 100%
rename from rapla-source-1.8.2/service/lib/libwrapper.so
rename to rapla/service/lib/libwrapper.so
diff --git a/rapla-source-1.8.2/service/lib/wrapper.dll b/rapla/service/lib/wrapper.dll
similarity index 100%
rename from rapla-source-1.8.2/service/lib/wrapper.dll
rename to rapla/service/lib/wrapper.dll
diff --git a/rapla-source-1.8.2/service/lib/wrapper.jar b/rapla/service/lib/wrapper.jar
similarity index 100%
rename from rapla-source-1.8.2/service/lib/wrapper.jar
rename to rapla/service/lib/wrapper.jar
diff --git a/rapla-source-1.8.2/src/commons-logging.properties b/rapla/src/commons-logging.properties
similarity index 98%
rename from rapla-source-1.8.2/src/commons-logging.properties
rename to rapla/src/commons-logging.properties
index 350677e..4636154 100644
--- a/rapla-source-1.8.2/src/commons-logging.properties
+++ b/rapla/src/commons-logging.properties
@@ -1 +1 @@
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
diff --git a/rapla-source-1.8.2/src/ical4j.properties b/rapla/src/ical4j.properties
similarity index 98%
rename from rapla-source-1.8.2/src/ical4j.properties
rename to rapla/src/ical4j.properties
index af7262d..ea51945 100644
--- a/rapla-source-1.8.2/src/ical4j.properties
+++ b/rapla/src/ical4j.properties
@@ -1 +1 @@
-net.fortuna.ical4j.timezone.update.enabled=false
+net.fortuna.ical4j.timezone.update.enabled=false
diff --git a/rapla-source-1.8.2/src/org/rapla/AppointmentFormaterImpl.java b/rapla/src/org/rapla/AppointmentFormaterImpl.java
similarity index 97%
rename from rapla-source-1.8.2/src/org/rapla/AppointmentFormaterImpl.java
rename to rapla/src/org/rapla/AppointmentFormaterImpl.java
index 70e80d5..27e45bf 100644
--- a/rapla-source-1.8.2/src/org/rapla/AppointmentFormaterImpl.java
+++ b/rapla/src/org/rapla/AppointmentFormaterImpl.java
@@ -1,354 +1,354 @@
-/*--------------------------------------------------------------------------*
- | Copyright (C) 2014 Christopher Kohlhaas |
- | |
- | This program is free software; you can redistribute it and/or modify |
- | it under the terms of the GNU General Public License as published by the |
- | Free Software Foundation. A copy of the license has been included with |
- | these distribution in the COPYING file, if not go to www.fsf.org |
- | |
- | As a special exception, you are granted the permissions to link this |
- | program with every library, which license fulfills the Open Source |
- | Definition as published by the Open Source Initiative (OSI). |
- *--------------------------------------------------------------------------*/
-package org.rapla;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.rapla.components.util.DateTools;
-import org.rapla.components.xmlbundle.I18nBundle;
-import org.rapla.entities.domain.Appointment;
-import org.rapla.entities.domain.AppointmentFormater;
-import org.rapla.entities.domain.Period;
-import org.rapla.entities.domain.Repeating;
-import org.rapla.facade.RaplaComponent;
-import org.rapla.framework.RaplaContext;
-import org.rapla.framework.RaplaException;
-import org.rapla.framework.RaplaLocale;
-
-/** default implementation of appointment formater */
-public class AppointmentFormaterImpl
- implements
- AppointmentFormater
-{
- I18nBundle i18n;
- RaplaLocale loc;
-
- public AppointmentFormaterImpl(RaplaContext context) throws RaplaException
- {
- i18n = context.lookup(RaplaComponent.RAPLA_RESOURCES);
- loc = context.lookup(RaplaLocale.class);
- }
-
- protected RaplaLocale getRaplaLocale() {
- return loc;
- }
-
- protected I18nBundle getI18n() {
- return i18n;
- }
-
- protected String getString(String key) {
- return i18n.getString(key);
- }
-
-
- public String getShortSummary(Appointment appointment) {
- String time = loc.formatTime(appointment.getStart());
- Repeating repeating = appointment.getRepeating();
- final boolean wholeDaysSet = appointment.isWholeDaysSet();
- final String timeString = wholeDaysSet ? "" :" " + time;
- String weekday = loc.getWeekday(appointment.getStart());
- if (repeating != null) {
- if (repeating.isWeekly()) {
- return weekday + timeString;
- }
- if (repeating.isDaily())
- return getString("daily") + " " + time;
- if (repeating.isMonthly())
- return getWeekdayOfMonth( appointment.getStart() ) + weekday + timeString;
- if (repeating.isYearly())
- return getDayOfMonth( appointment.getStart() ) + loc.getMonth(appointment.getStart()) +" " + timeString;
- }
- String date = loc.formatDate(appointment.getStart());
- return weekday + " " +date + " " + timeString;
- }
-
- public String getVeryShortSummary(Appointment appointment) {
- Repeating repeating = appointment.getRepeating();
- if (repeating != null) {
- if (repeating.isWeekly())
- return getRaplaLocale().getWeekday(appointment.getStart());
- if (repeating.isDaily()) {
- String time = getRaplaLocale().formatTime(appointment.getStart());
- return time;
- }
- if (repeating.isMonthly())
- {
- return getRaplaLocale().getWeekday(appointment.getStart());
- }
- }
- String date = getRaplaLocale().formatDateShort(appointment.getStart());
- return date;
- }
-
- public String getSummary( Appointment a ) {
- StringBuffer buf = new StringBuffer();
- Repeating repeating = a.getRepeating();
- final boolean wholeDaysSet = a.isWholeDaysSet();
- Date start = a.getStart();
- Date end = a.getEnd();
- if ( repeating == null )
- {
- buf.append( loc.getWeekday( start ) );
- buf.append( ' ' );
- buf.append( loc.formatDate( start ) );
- if (!wholeDaysSet && !( end.equals( DateTools.cutDate(end)) && start.equals(DateTools.cutDate( start))))
- {
- buf.append( ' ' );
- buf.append( loc.formatTime( start ) );
-
- if ( isSameDay( start, end ) || (end.equals( DateTools.cutDate(end)) && isSameDay( DateTools.fillDate( start), end)) )
- {
- buf.append( '-' );
- }
- else
- {
- buf.append( " - " );
- buf.append( loc.getWeekday( end ) );
- buf.append( ' ' );
- buf.append( loc.formatDate( end ) );
- buf.append( ' ' );
- }
- buf.append( loc.formatTime( end ) );
- }
- else if ( end.getTime() - start.getTime() > DateTools.MILLISECONDS_PER_DAY)
- {
- buf.append( " - " );
- buf.append( loc.getWeekday( DateTools.addDays(end,-1 )) );
- buf.append( ' ' );
- buf.append( loc.formatDate( DateTools.addDays(end,-1 )) );
- }
- }
- else if ( repeating.isWeekly() || repeating.isMonthly() || repeating.isYearly())
- {
- if( repeating.isMonthly())
- {
- buf.append( getWeekdayOfMonth( start ));
- }
- if (repeating.isYearly())
- {
- buf.append( getDayOfMonth( start ) );
- buf.append( loc.getMonth( start ) );
- }
- else
- {
- buf.append( loc.getWeekday( start ) );
- }
- if (wholeDaysSet)
- {
- if ( end.getTime() - start.getTime() > DateTools.MILLISECONDS_PER_DAY)
- {
- if ( end.getTime() - start.getTime() <= DateTools.MILLISECONDS_PER_DAY * 6 )
- {
- buf.append( " - " );
- buf.append( loc.getWeekday( end ) );
- }
- else
- {
- buf.append( ' ' );
- buf.append( loc.formatDate( start ) );
- buf.append( " - " );
- buf.append( loc.getWeekday( end ) );
- buf.append( ' ' );
- buf.append( loc.formatDate( end ) );
- }
- }
- }
- else
- {
- buf.append( ' ' );
- if ( isSameDay( start, end ) )
- {
- buf.append( loc.formatTime( start ) );
- buf.append( '-' );
- buf.append( loc.formatTime( end ) );
- }
- else if ( end.getTime() - start.getTime() <= DateTools.MILLISECONDS_PER_DAY * 6 )
- {
- buf.append( loc.formatTime( start ) );
- buf.append( " - " );
- buf.append( loc.getWeekday( end ) );
- buf.append( ' ' );
- buf.append( loc.formatTime( end ) );
- }
- else
- {
- buf.append( loc.formatDate( start ) );
- buf.append( ' ' );
- buf.append( loc.formatTime( start ) );
- buf.append( " - " );
- buf.append( loc.getWeekday( end ) );
- buf.append( ' ' );
- buf.append( loc.formatDate( end ) );
- buf.append( ' ' );
- buf.append( loc.formatTime( end ) );
- }
- }
-
- if ( repeating.isWeekly())
- {
- buf.append( ' ' );
- buf.append( getInterval( repeating ) );
- }
- if ( repeating.isMonthly())
- {
- buf.append(" " + getString("monthly"));
- }
- if ( repeating.isYearly())
- {
- buf.append(" " + getString("yearly"));
- }
- }
-
- else if ( repeating.isDaily() )
- {
-
- long days =(end.getTime() - start.getTime()) / (DateTools.MILLISECONDS_PER_HOUR * 24 );
- if ( !a.isWholeDaysSet())
- {
- buf.append( loc.formatTime( start ) );
- if ( days <1)
- {
- buf.append( '-' );
- buf.append( loc.formatTime( end ) );
- }
- buf.append( ' ' );
- }
- buf.append( getInterval( repeating ) );
- }
- return buf.toString();
- }
-
- private String getWeekdayOfMonth( Date date )
- {
- StringBuffer b = new StringBuffer();
- int numb = DateTools.getDayOfWeekInMonth( date );
- b.append( String.valueOf(numb));
- b.append( '.');
- b.append( ' ');
- return b.toString();
- }
-
- private String getDayOfMonth( Date date )
- {
- StringBuffer b = new StringBuffer();
- int numb = DateTools.getDayOfMonth( date );
- b.append( String.valueOf(numb));
- b.append( '.');
- b.append( ' ');
- return b.toString();
- }
-
- private boolean isSameDay( Date d1, Date d2 ) {
- return DateTools.isSameDay(d1, d2);
- }
-
- public String getExceptionSummary( Repeating r ) {
- StringBuffer buf = new StringBuffer();
- buf.append(getString("appointment.exceptions"));
- buf.append(": ");
- Date[] exc = r.getExceptions();
- for ( int i=0;i0)
- buf.append(", ");
- buf.append( getRaplaLocale().formatDate( exc[i] ) );
- }
- return buf.toString();
- }
-
- private String getInterval( Repeating r ) {
- StringBuffer buf = new StringBuffer();
- if ( r.getInterval() == 1 ) {
- buf.append( getString( r.getType().toString() ) );
- } else {
- String fString ="weekly";
- if ( r.isWeekly() ) {
- fString = getString( "weeks" );
- }
- if ( r.isDaily() ) {
- fString = getString( "days" );
- }
- buf.append( getI18n().format( "interval.format", "" + r.getInterval(), fString ) );
- }
- return buf.toString();
- }
-
- private boolean isPeriodicaly(Period period, Repeating r) {
- Appointment a = r.getAppointment();
- if (r.getEnd().after( period.getEnd() ) )
- return false;
- if ( r.isWeekly() )
- {
- return
- ( DateTools.cutDate(a.getStart().getTime()) - period.getStart().getTime() )
- <= DateTools.MILLISECONDS_PER_DAY * 6
- &&
- ( DateTools.cutDate(period.getEnd().getTime()) - r.getEnd().getTime() )
- <= DateTools.MILLISECONDS_PER_DAY * 6
- ;
- }
- else if ( r.isDaily() )
- {
- return
- isSameDay( a.getStart(), period.getStart() )
- &&
- isSameDay( r.getEnd(), period.getEnd() )
- ;
- }
- return false;
- }
-
- public String getSummary( Repeating r , List periods) {
- if ( r.getEnd() != null && !r.isFixedNumber() )
- {
- Iterator it = periods.iterator();
- while ( it.hasNext() ) {
- Period period = it.next();
- if ( isPeriodicaly(period, r))
- return getI18n().format("in_period.format"
- ,period.getName(loc.getLocale())
- );
- }
- }
- return getSummary(r);
- }
-
- public String getSummary( Repeating r ) {
- Appointment a = r.getAppointment();
- StringBuffer buf = new StringBuffer();
- String startDate = loc.formatDate( a.getStart() );
- buf.append( getI18n().format("format.repeat_from", startDate) );
- buf.append( ' ' );
- // print end date, when end is given
- if ( r.getEnd() != null) {
- String endDate = loc.formatDate( DateTools.subDay(r.getEnd()) );
- buf.append( getI18n().format("format.repeat_until", endDate) );
- buf.append( ' ' );
- }
-
- // print number of repeating if number is gt 0 and fixed times
- if ( r.getNumber()>=0 && r.isFixedNumber() ) {
- buf.append( getI18n().format("format.repeat_n_times", String.valueOf(r.getNumber())) );
- buf.append( ' ' );
- }
- // print never ending if end is null
- if (r.getEnd() == null ){
- buf.append( getString("repeating.forever") );
- buf.append( ' ' );
- }
-
- return buf.toString();
- }
-
-}
+/*--------------------------------------------------------------------------*
+ | Copyright (C) 2014 Christopher Kohlhaas |
+ | |
+ | This program is free software; you can redistribute it and/or modify |
+ | it under the terms of the GNU General Public License as published by the |
+ | Free Software Foundation. A copy of the license has been included with |
+ | these distribution in the COPYING file, if not go to www.fsf.org |
+ | |
+ | As a special exception, you are granted the permissions to link this |
+ | program with every library, which license fulfills the Open Source |
+ | Definition as published by the Open Source Initiative (OSI). |
+ *--------------------------------------------------------------------------*/
+package org.rapla;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import org.rapla.components.util.DateTools;
+import org.rapla.components.xmlbundle.I18nBundle;
+import org.rapla.entities.domain.Appointment;
+import org.rapla.entities.domain.AppointmentFormater;
+import org.rapla.entities.domain.Period;
+import org.rapla.entities.domain.Repeating;
+import org.rapla.facade.RaplaComponent;
+import org.rapla.framework.RaplaContext;
+import org.rapla.framework.RaplaException;
+import org.rapla.framework.RaplaLocale;
+
+/** default implementation of appointment formater */
+public class AppointmentFormaterImpl
+ implements
+ AppointmentFormater
+{
+ I18nBundle i18n;
+ RaplaLocale loc;
+
+ public AppointmentFormaterImpl(RaplaContext context) throws RaplaException
+ {
+ i18n = context.lookup(RaplaComponent.RAPLA_RESOURCES);
+ loc = context.lookup(RaplaLocale.class);
+ }
+
+ protected RaplaLocale getRaplaLocale() {
+ return loc;
+ }
+
+ protected I18nBundle getI18n() {
+ return i18n;
+ }
+
+ protected String getString(String key) {
+ return i18n.getString(key);
+ }
+
+
+ public String getShortSummary(Appointment appointment) {
+ String time = loc.formatTime(appointment.getStart());
+ Repeating repeating = appointment.getRepeating();
+ final boolean wholeDaysSet = appointment.isWholeDaysSet();
+ final String timeString = wholeDaysSet ? "" :" " + time;
+ String weekday = loc.getWeekday(appointment.getStart());
+ if (repeating != null) {
+ if (repeating.isWeekly()) {
+ return weekday + timeString;
+ }
+ if (repeating.isDaily())
+ return getString("daily") + " " + time;
+ if (repeating.isMonthly())
+ return getWeekdayOfMonth( appointment.getStart() ) + weekday + timeString;
+ if (repeating.isYearly())
+ return getDayOfMonth( appointment.getStart() ) + loc.getMonth(appointment.getStart()) +" " + timeString;
+ }
+ String date = loc.formatDate(appointment.getStart());
+ return weekday + " " +date + " " + timeString;
+ }
+
+ public String getVeryShortSummary(Appointment appointment) {
+ Repeating repeating = appointment.getRepeating();
+ if (repeating != null) {
+ if (repeating.isWeekly())
+ return getRaplaLocale().getWeekday(appointment.getStart());
+ if (repeating.isDaily()) {
+ String time = getRaplaLocale().formatTime(appointment.getStart());
+ return time;
+ }
+ if (repeating.isMonthly())
+ {
+ return getRaplaLocale().getWeekday(appointment.getStart());
+ }
+ }
+ String date = getRaplaLocale().formatDateShort(appointment.getStart());
+ return date;
+ }
+
+ public String getSummary( Appointment a ) {
+ StringBuffer buf = new StringBuffer();
+ Repeating repeating = a.getRepeating();
+ final boolean wholeDaysSet = a.isWholeDaysSet();
+ Date start = a.getStart();
+ Date end = a.getEnd();
+ if ( repeating == null )
+ {
+ buf.append( loc.getWeekday( start ) );
+ buf.append( ' ' );
+ buf.append( loc.formatDate( start ) );
+ if (!wholeDaysSet && !( end.equals( DateTools.cutDate(end)) && start.equals(DateTools.cutDate( start))))
+ {
+ buf.append( ' ' );
+ buf.append( loc.formatTime( start ) );
+
+ if ( isSameDay( start, end ) || (end.equals( DateTools.cutDate(end)) && isSameDay( DateTools.fillDate( start), end)) )
+ {
+ buf.append( '-' );
+ }
+ else
+ {
+ buf.append( " - " );
+ buf.append( loc.getWeekday( end ) );
+ buf.append( ' ' );
+ buf.append( loc.formatDate( end ) );
+ buf.append( ' ' );
+ }
+ buf.append( loc.formatTime( end ) );
+ }
+ else if ( end.getTime() - start.getTime() > DateTools.MILLISECONDS_PER_DAY)
+ {
+ buf.append( " - " );
+ buf.append( loc.getWeekday( DateTools.addDays(end,-1 )) );
+ buf.append( ' ' );
+ buf.append( loc.formatDate( DateTools.addDays(end,-1 )) );
+ }
+ }
+ else if ( repeating.isWeekly() || repeating.isMonthly() || repeating.isYearly())
+ {
+ if( repeating.isMonthly())
+ {
+ buf.append( getWeekdayOfMonth( start ));
+ }
+ if (repeating.isYearly())
+ {
+ buf.append( getDayOfMonth( start ) );
+ buf.append( loc.getMonth( start ) );
+ }
+ else
+ {
+ buf.append( loc.getWeekday( start ) );
+ }
+ if (wholeDaysSet)
+ {
+ if ( end.getTime() - start.getTime() > DateTools.MILLISECONDS_PER_DAY)
+ {
+ if ( end.getTime() - start.getTime() <= DateTools.MILLISECONDS_PER_DAY * 6 )
+ {
+ buf.append( " - " );
+ buf.append( loc.getWeekday( end ) );
+ }
+ else
+ {
+ buf.append( ' ' );
+ buf.append( loc.formatDate( start ) );
+ buf.append( " - " );
+ buf.append( loc.getWeekday( end ) );
+ buf.append( ' ' );
+ buf.append( loc.formatDate( end ) );
+ }
+ }
+ }
+ else
+ {
+ buf.append( ' ' );
+ if ( isSameDay( start, end ) )
+ {
+ buf.append( loc.formatTime( start ) );
+ buf.append( '-' );
+ buf.append( loc.formatTime( end ) );
+ }
+ else if ( end.getTime() - start.getTime() <= DateTools.MILLISECONDS_PER_DAY * 6 )
+ {
+ buf.append( loc.formatTime( start ) );
+ buf.append( " - " );
+ buf.append( loc.getWeekday( end ) );
+ buf.append( ' ' );
+ buf.append( loc.formatTime( end ) );
+ }
+ else
+ {
+ buf.append( loc.formatDate( start ) );
+ buf.append( ' ' );
+ buf.append( loc.formatTime( start ) );
+ buf.append( " - " );
+ buf.append( loc.getWeekday( end ) );
+ buf.append( ' ' );
+ buf.append( loc.formatDate( end ) );
+ buf.append( ' ' );
+ buf.append( loc.formatTime( end ) );
+ }
+ }
+
+ if ( repeating.isWeekly())
+ {
+ buf.append( ' ' );
+ buf.append( getInterval( repeating ) );
+ }
+ if ( repeating.isMonthly())
+ {
+ buf.append(" " + getString("monthly"));
+ }
+ if ( repeating.isYearly())
+ {
+ buf.append(" " + getString("yearly"));
+ }
+ }
+
+ else if ( repeating.isDaily() )
+ {
+
+ long days =(end.getTime() - start.getTime()) / (DateTools.MILLISECONDS_PER_HOUR * 24 );
+ if ( !a.isWholeDaysSet())
+ {
+ buf.append( loc.formatTime( start ) );
+ if ( days <1)
+ {
+ buf.append( '-' );
+ buf.append( loc.formatTime( end ) );
+ }
+ buf.append( ' ' );
+ }
+ buf.append( getInterval( repeating ) );
+ }
+ return buf.toString();
+ }
+
+ private String getWeekdayOfMonth( Date date )
+ {
+ StringBuffer b = new StringBuffer();
+ int numb = DateTools.getDayOfWeekInMonth( date );
+ b.append( String.valueOf(numb));
+ b.append( '.');
+ b.append( ' ');
+ return b.toString();
+ }
+
+ private String getDayOfMonth( Date date )
+ {
+ StringBuffer b = new StringBuffer();
+ int numb = DateTools.getDayOfMonth( date );
+ b.append( String.valueOf(numb));
+ b.append( '.');
+ b.append( ' ');
+ return b.toString();
+ }
+
+ private boolean isSameDay( Date d1, Date d2 ) {
+ return DateTools.isSameDay(d1, d2);
+ }
+
+ public String getExceptionSummary( Repeating r ) {
+ StringBuffer buf = new StringBuffer();
+ buf.append(getString("appointment.exceptions"));
+ buf.append(": ");
+ Date[] exc = r.getExceptions();
+ for ( int i=0;i0)
+ buf.append(", ");
+ buf.append( getRaplaLocale().formatDate( exc[i] ) );
+ }
+ return buf.toString();
+ }
+
+ private String getInterval( Repeating r ) {
+ StringBuffer buf = new StringBuffer();
+ if ( r.getInterval() == 1 ) {
+ buf.append( getString( r.getType().toString() ) );
+ } else {
+ String fString ="weekly";
+ if ( r.isWeekly() ) {
+ fString = getString( "weeks" );
+ }
+ if ( r.isDaily() ) {
+ fString = getString( "days" );
+ }
+ buf.append( getI18n().format( "interval.format", "" + r.getInterval(), fString ) );
+ }
+ return buf.toString();
+ }
+
+ private boolean isPeriodicaly(Period period, Repeating r) {
+ Appointment a = r.getAppointment();
+ if (r.getEnd().after( period.getEnd() ) )
+ return false;
+ if ( r.isWeekly() )
+ {
+ return
+ ( DateTools.cutDate(a.getStart().getTime()) - period.getStart().getTime() )
+ <= DateTools.MILLISECONDS_PER_DAY * 6
+ &&
+ ( DateTools.cutDate(period.getEnd().getTime()) - r.getEnd().getTime() )
+ <= DateTools.MILLISECONDS_PER_DAY * 6
+ ;
+ }
+ else if ( r.isDaily() )
+ {
+ return
+ isSameDay( a.getStart(), period.getStart() )
+ &&
+ isSameDay( r.getEnd(), period.getEnd() )
+ ;
+ }
+ return false;
+ }
+
+ public String getSummary( Repeating r , List periods) {
+ if ( r.getEnd() != null && !r.isFixedNumber() )
+ {
+ Iterator it = periods.iterator();
+ while ( it.hasNext() ) {
+ Period period = it.next();
+ if ( isPeriodicaly(period, r))
+ return getI18n().format("in_period.format"
+ ,period.getName(loc.getLocale())
+ );
+ }
+ }
+ return getSummary(r);
+ }
+
+ public String getSummary( Repeating r ) {
+ Appointment a = r.getAppointment();
+ StringBuffer buf = new StringBuffer();
+ String startDate = loc.formatDate( a.getStart() );
+ buf.append( getI18n().format("format.repeat_from", startDate) );
+ buf.append( ' ' );
+ // print end date, when end is given
+ if ( r.getEnd() != null) {
+ String endDate = loc.formatDate( DateTools.subDay(r.getEnd()) );
+ buf.append( getI18n().format("format.repeat_until", endDate) );
+ buf.append( ' ' );
+ }
+
+ // print number of repeating if number is gt 0 and fixed times
+ if ( r.getNumber()>=0 && r.isFixedNumber() ) {
+ buf.append( getI18n().format("format.repeat_n_times", String.valueOf(r.getNumber())) );
+ buf.append( ' ' );
+ }
+ // print never ending if end is null
+ if (r.getEnd() == null ){
+ buf.append( getString("repeating.forever") );
+ buf.append( ' ' );
+ }
+
+ return buf.toString();
+ }
+
+}
diff --git a/rapla-source-1.8.2/src/org/rapla/ConnectInfo.java b/rapla/src/org/rapla/ConnectInfo.java
similarity index 96%
rename from rapla-source-1.8.2/src/org/rapla/ConnectInfo.java
rename to rapla/src/org/rapla/ConnectInfo.java
index deb2e56..9ca82dc 100644
--- a/rapla-source-1.8.2/src/org/rapla/ConnectInfo.java
+++ b/rapla/src/org/rapla/ConnectInfo.java
@@ -1,35 +1,35 @@
-package org.rapla;
-
-import java.util.Arrays;
-/** Object that encapsulates the login information.
- * For admin users it is possible to connect as an other user.
- */
-public class ConnectInfo {
- String username;
- char[] password;
- String connectAs;
- public ConnectInfo(String username, char[] password, String connectAs) {
- this.username = username;
- this.password = password;
- this.connectAs = connectAs;
- }
-
- public ConnectInfo(String username, char[] password) {
- this( username, password, null);
- }
-
- public String getUsername() {
- return username;
- }
- public char[] getPassword() {
- return password;
- }
- public String getConnectAs() {
- return connectAs;
- }
-
- @Override
- public String toString() {
- return "ReconnectInfo [username=" + username + ", password=" + Arrays.toString(password) + ", connectAs=" + connectAs + "]";
- }
-}
+package org.rapla;
+
+import java.util.Arrays;
+/** Object that encapsulates the login information.
+ * For admin users it is possible to connect as an other user.
+ */
+public class ConnectInfo {
+ String username;
+ char[] password;
+ String connectAs;
+ public ConnectInfo(String username, char[] password, String connectAs) {
+ this.username = username;
+ this.password = password;
+ this.connectAs = connectAs;
+ }
+
+ public ConnectInfo(String username, char[] password) {
+ this( username, password, null);
+ }
+
+ public String getUsername() {
+ return username;
+ }
+ public char[] getPassword() {
+ return password;
+ }
+ public String getConnectAs() {
+ return connectAs;
+ }
+
+ @Override
+ public String toString() {
+ return "ReconnectInfo [username=" + username + ", password=" + Arrays.toString(password) + ", connectAs=" + connectAs + "]";
+ }
+}
diff --git a/rapla-source-1.8.2/src/org/rapla/MyResources.xml b/rapla/src/org/rapla/MyResources.xml
similarity index 97%
rename from rapla-source-1.8.2/src/org/rapla/MyResources.xml
rename to rapla/src/org/rapla/MyResources.xml
index c6de8b9..60730d9 100644
--- a/rapla-source-1.8.2/src/org/rapla/MyResources.xml
+++ b/rapla/src/org/rapla/MyResources.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
- Hello {0}, enjoy yourself!
-
-
+
+
+
+
+
+ Hello {0}, enjoy yourself!
+
+
diff --git a/rapla-source-1.8.2/src/org/rapla/RaplaMainContainer.java b/rapla/src/org/rapla/RaplaMainContainer.java
similarity index 97%
rename from rapla-source-1.8.2/src/org/rapla/RaplaMainContainer.java
rename to rapla/src/org/rapla/RaplaMainContainer.java
index 1e88197..a1d50f8 100644
--- a/rapla-source-1.8.2/src/org/rapla/RaplaMainContainer.java
+++ b/rapla/src/org/rapla/RaplaMainContainer.java
@@ -1,381 +1,381 @@
-/*--------------------------------------------------------------------------*
- | Copyright (C) 2014 Christopher Kohlhaas |
- | |
- | This program is free software; you can redistribute it and/or modify |
- | it under the terms of the GNU General Public License as published by the |
- | Free Software Foundation. A copy of the license has been included with |
- | these distribution in the COPYING file, if not go to www.fsf.org |
- | |
- | As a special exception, you are granted the permissions to link this |
- | program with every library, which license fulfills the Open Source |
- | Definition as published by the Open Source Initiative (OSI). |
- *--------------------------------------------------------------------------*/
-package org.rapla;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-
-import org.rapla.components.util.CommandScheduler;
-import org.rapla.components.util.IOUtil;
-import org.rapla.components.util.xml.RaplaNonValidatedInput;
-import org.rapla.components.xmlbundle.CompoundI18n;
-import org.rapla.components.xmlbundle.I18nBundle;
-import org.rapla.components.xmlbundle.LocaleSelector;
-import org.rapla.components.xmlbundle.impl.I18nBundleImpl;
-import org.rapla.entities.domain.AppointmentFormater;
-import org.rapla.entities.dynamictype.internal.AttributeImpl;
-import org.rapla.facade.CalendarOptions;
-import org.rapla.facade.RaplaComponent;
-import org.rapla.facade.internal.CalendarOptionsImpl;
-import org.rapla.framework.Configuration;
-import org.rapla.framework.Provider;
-import org.rapla.framework.RaplaContext;
-import org.rapla.framework.RaplaContextException;
-import org.rapla.framework.RaplaDefaultContext;
-import org.rapla.framework.RaplaLocale;
-import org.rapla.framework.ServiceListCreator;
-import org.rapla.framework.StartupEnvironment;
-import org.rapla.framework.TypedComponentRole;
-import org.rapla.framework.internal.ComponentInfo;
-import org.rapla.framework.internal.ConfigTools;
-import org.rapla.framework.internal.ContainerImpl;
-import org.rapla.framework.internal.RaplaJDKLoggingAdapter;
-import org.rapla.framework.internal.RaplaLocaleImpl;
-import org.rapla.framework.internal.RaplaMetaConfigInfo;
-import org.rapla.framework.logger.Logger;
-import org.rapla.rest.gwtjsonrpc.common.FutureResult;
-import org.rapla.storage.dbrm.RaplaHTTPConnector;
-import org.rapla.storage.dbrm.RemoteConnectionInfo;
-import org.rapla.storage.dbrm.RemoteMethodStub;
-import org.rapla.storage.dbrm.RemoteServer;
-import org.rapla.storage.dbrm.RemoteServiceCaller;
-import org.rapla.storage.dbrm.StatusUpdater;
-import org.rapla.storage.dbrm.StatusUpdater.Status;
-/**
-The Rapla Main Container class for the basic container for Rapla specific services and the rapla plugin architecture.
-The rapla container has only one instance at runtime. Configuration of the RaplaMainContainer is done in the rapla*.xconf
-files. Typical configurations of the MainContainer are
-
-
-
Client: A ClientContainerService, one facade and a remote storage ( automaticaly pointing to the download server in webstart mode)
-
Server: A ServerContainerService (providing a facade) a messaging server for handling the connections with the clients, a storage (file or db) and an extra service for importing and exporting in the db
-
Standalone: A ClientContainerService (with preconfigured auto admin login) and a ServerContainerService that is directly connected to the client without http communication.
-
Embedded: Configuration example follows.
-
-
-Configuration of the main container is usually done via the raplaserver.xconf
-
-
-The Main Container provides the following Services to all RaplaComponents
-
-
-
I18nBundle
-
AppointmentFormater
-
RaplaLocale
-
LocaleSelector
-
RaplaMainContainer.PLUGIN_LIST (A list of all available plugins)
-
-
- @see I18nBundle
- @see RaplaLocale
- @see AppointmentFormater
- @see LocaleSelector
- */
-final public class RaplaMainContainer extends ContainerImpl
-{
- public static final TypedComponentRole RAPLA_MAIN_CONFIGURATION = new TypedComponentRole("org.rapla.MainConfiguration");
- public static final TypedComponentRole DOWNLOAD_SERVER = new TypedComponentRole("download-server");
- public static final TypedComponentRole DOWNLOAD_URL = new TypedComponentRole("download-url");
- public static final TypedComponentRole ENV_RAPLADATASOURCE = new TypedComponentRole("env.rapladatasource");
- public static final TypedComponentRole ENV_RAPLAFILE = new TypedComponentRole("env.raplafile");
- public static final TypedComponentRole
+
+The client package is responsible for initialize the gui
+and the client-plugins and providing the services for the
+client application.
+