[MRM-688] allow separating the base from the installation again

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@642119 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-docs/src/site/apt/adminguide/standalone.apt b/archiva-docs/src/site/apt/adminguide/standalone.apt
index 53b88e7898649cd94b125d24b62a197f77314798..31ed6a04e567198faaddf096c9e70185c5a2dc55 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/standalone.apt
+++ b/archiva-docs/src/site/apt/adminguide/standalone.apt
@@ -19,15 +19,30 @@ Installing Standalone Distribution of Apache Archiva
 
     []
 
+* Separating the base from the installation
+
+  The standalone instance of Archiva uses the Plexus application server, which is capable of separating it's configuration from installation,
+  in much the same way Tomcat does for example.
+
+  This is achieved by the following steps:
+
+   [[1]] Creating the base location. For example, you might install Archiva in <<</opt/archiva-1.0>>> and the data in <<</var/archiva>>>. Create the directories <<</var/archiva/logs>>>, <<</var/archiva/data>>> and <<</var/archiva/conf>>>.
+
+   [[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.
+
+   [[4]] Start Archiva standalone as described above from the installation location
+
 * Configuring Archiva
 
   Archiva's configuration is loaded from the following files, in order of most precedent:
 
     * <<<~/.m2/archiva.xml>>>
 
-    * <<<$ARCHIVA_BASE/conf/archiva.xml>>>
+    * <<<$APP_BASE/conf/archiva.xml>>>
 
-    * <<<$ARCHIVA_HOME/conf/archiva.xml>>>
+    * <<<conf/archiva.xml>>> in the Archiva installation
 
   When Archiva saves it's configuration, all configuration is stored to a single file. The file chosen is by the following rules:
 

diff --git a/archiva-web/archiva-standalone/archiva-jetty/pom.xml b/archiva-web/archiva-standalone/archiva-jetty/pom.xml
index bbe9269e9e8861cba71b9947c77b7c401652d49c..8d86927f6b37724c60ae36d65bfa6300ab256508 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-jetty/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/pom.xml
@@ -128,6 +128,12 @@
       <artifactId>jasper-compiler-jdt</artifactId>
       <version>5.5.15</version>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jdt</groupId>
+          <artifactId>core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <build>
@@ -160,21 +166,34 @@
                       <name>wrapper.java.additional.1.stripquotes</name>
                       <value>TRUE</value>
                     </property>
+                    <property>
+                      <name>set.default.APP_BASE</name>
+                      <value>%PWD%/..</value>
+                    </property>
                     <property>
                       <name>set.default.REPO_DIR</name>
                       <value>lib</value>
                     </property>
                     <property>
                       <name>wrapper.logfile</name>
-                      <value>./logs/wrapper.log</value>
+                      <value>%APP_BASE%/logs/wrapper.log</value>
+                    </property>
+                    <property>
+                      <name>wrapper.app.parameter.2</name>
+                      <value>%APP_BASE%/conf/jetty.xml</value>
+                    </property>
+                    <property>
+                      <name>wrapper.app.parameter.3</name>
+                      <value>%APP_BASE%/conf/jetty-logging.xml</value>
                     </property>
                   </configuration>
                 </generatorConfiguration>
               </generatorConfigurations>
               <jvmSettings>
                 <systemProperties>
-                  <systemProperty>appserver.base="."</systemProperty>
-                  <systemProperty>derby.system.home=logs</systemProperty>
+                  <systemProperty>appserver.base=%APP_BASE%</systemProperty>
+                  <systemProperty>derby.system.home=%APP_BASE%/logs</systemProperty>
+                  <systemProperty>jetty.logs=%APP_BASE%/logs</systemProperty>
                 </systemProperties>
               </jvmSettings> 
             </daemon>

diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty-logging.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty-logging.xml
index 0a1c292d0c77b37cea86aae9f1c8c6d530753c62..3eedcd6bd48e908f840ff1b5b9592614bd31a472 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty-logging.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty-logging.xml
@@ -13,7 +13,7 @@
     <New id="ServerLog" class="java.io.PrintStream">
       <Arg>
         <New class="org.mortbay.util.RolloverFileOutputStream">
-          <Arg><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.stderrout.log</Arg>
+          <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.stderrout.log</Arg>
           <Arg type="boolean">false</Arg>
           <Arg type="int">90</Arg>
           <Arg><Call class="java.util.TimeZone" name="getTimeZone"><Arg>GMT</Arg></Call></Arg>

diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml
index c908723c7299108a5d85218e382e3d3b96d0de72..6568ae25c212d0f1ab49045fa10b9c77dd1a2cb1 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml
@@ -294,7 +294,7 @@
     <Arg>jdbc/archiva</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="DatabaseName">../data/databases/archiva</Set>
+        <Set name="DatabaseName"><SystemProperty name="appserver.base" default=".."/>/data/databases/archiva</Set>
         <Set name="user">sa</Set>
         <Set name="createDatabase">create</Set>
       </New>
@@ -305,7 +305,7 @@
     <Arg>jdbc/archivaShutdown</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="DatabaseName">../data/databases/archiva</Set>
+        <Set name="DatabaseName"><SystemProperty name="appserver.base" default=".."/>/data/databases/archiva</Set>
         <Set name="user">sa</Set>
         <Set name="shutdownDatabase">shutdown</Set>
       </New>
@@ -318,7 +318,7 @@
     <Arg>jdbc/users</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="DatabaseName">../data/databases/users</Set>
+        <Set name="DatabaseName"><SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set>
         <Set name="user">sa</Set>
         <Set name="createDatabase">create</Set>
       </New>
@@ -329,7 +329,7 @@
     <Arg>jdbc/usersShutdown</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="DatabaseName">../data/databases/users</Set>
+        <Set name="DatabaseName"><SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set>
         <Set name="user">sa</Set>
         <Set name="shutdownDatabase">shutdown</Set>
       </New>