diff options
| -rw-r--r-- | archiva-docs/src/site/apt/adminguide/standalone.apt | 6 | ||||
| -rw-r--r-- | archiva-jetty/pom.xml | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/archiva-docs/src/site/apt/adminguide/standalone.apt b/archiva-docs/src/site/apt/adminguide/standalone.apt index c506b01f8..0807e3915 100644 --- a/archiva-docs/src/site/apt/adminguide/standalone.apt +++ b/archiva-docs/src/site/apt/adminguide/standalone.apt @@ -50,7 +50,7 @@ Installing Standalone Distribution of Apache Archiva [[2]] Copy the configuration files from the Archiva installation (eg <<</opt/archiva-1.0/conf>>> to the new location (eg. <<</var/archiva/conf>>>). If you've previously run Archiva, you may need to edit <<<conf/archiva.xml>>> to change the location of the repositories - [[3]] Set the environment variable <<<APP_BASE>>> to the data location (eg. <<</var/archiva>>>). In bash, be sure to export the variable. + [[3]] Set the environment variable <<<ARCHIVA_BASE>>> to the data location (eg. <<</var/archiva>>>). In bash, be sure to export the variable. [[4]] Start Archiva standalone as described above from the installation location @@ -60,7 +60,7 @@ Installing Standalone Distribution of Apache Archiva * <<<~/.m2/archiva.xml>>> - * <<<$APP_BASE/conf/archiva.xml>>> + * <<<$ARCHIVA_BASE/conf/archiva.xml>>> * <<<conf/archiva.xml>>> in the Archiva installation @@ -68,7 +68,7 @@ Installing Standalone Distribution of Apache Archiva * If <<<~/.m2/archiva.xml>>> exists, it is saved there - * Otherwise, it is saved to <<<$APP_BASE/conf/archiva.xml>>>, regardless of whether it previously existed. + * Otherwise, it is saved to <<<$ARCHIVA_BASE/conf/archiva.xml>>>, regardless of whether it previously existed. The configuration will never be saved in the Archiva installation directory if you are using a separate base directory. diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 322148373..04220dc75 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -172,15 +172,19 @@ </property> <property> <name>wrapper.logfile</name> - <value>%APP_BASE%/logs/wrapper.log</value> + <value>%ARCHIVA_BASE%/logs/wrapper.log</value> </property> <property> <name>wrapper.app.parameter.2</name> - <value>%APP_BASE%/conf/jetty.xml</value> + <value>%ARCHIVA_BASE%/conf/jetty.xml</value> </property> <property> <name>wrapper.app.parameter.3</name> - <value>%APP_BASE%/conf/jetty-logging.xml</value> + <value>%ARCHIVA_BASE%/conf/jetty-logging.xml</value> + </property> + <property> + <name>app.base.envvar</name> + <value>ARCHIVA_BASE</value> </property> </configuration> </generatorConfiguration> @@ -188,11 +192,11 @@ <jvmSettings> <systemProperties> <systemProperty>appserver.home=.</systemProperty> - <systemProperty>appserver.base=%APP_BASE%</systemProperty> - <!-- can't set this at present, it moves the databases if APP_BASE is not set - <systemProperty>derby.system.home=%APP_BASE%/logs</systemProperty> + <systemProperty>appserver.base=%ARCHIVA_BASE%</systemProperty> + <!-- can't set this at present, it moves the databases if ARCHIVA_BASE is not set + <systemProperty>derby.system.home=%ARCHIVA_BASE%/logs</systemProperty> --> - <systemProperty>jetty.logs=%APP_BASE%/logs</systemProperty> + <systemProperty>jetty.logs=%ARCHIVA_BASE%/logs</systemProperty> </systemProperties> </jvmSettings> </daemon> |