Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-688] s/APP_BASE/ARCHIVA_BASE/ 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642876 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2008-03-31 05:05:49 +00:00
parent a49a0f2863
commit 6397c4184f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archiva-docs/src/site/apt/adminguide/standalone.apt
View File

@ -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.

18
archiva-jetty/pom.xml
View File

@ -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>