consolidate the configuration

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

8 files changed, 4 insertions, 84 deletions

diff --git a/archiva-web/archiva-standalone/archiva-jetty/pom.xml b/archiva-web/archiva-standalone/archiva-jetty/pom.xml
index ef057fbf8..66317b166 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/pom.xml
@@ -136,8 +136,8 @@
               <id>archiva</id>
               <mainClass>org.mortbay.start.Main</mainClass>
               <commandLineArguments>
-                <commandLineArgument>etc/jetty.xml</commandLineArgument>
-                <commandLineArgument>etc/jetty-logging.xml</commandLineArgument> 
+                <commandLineArgument>conf/jetty.xml</commandLineArgument>
+                <commandLineArgument>conf/jetty-logging.xml</commandLineArgument> 
               </commandLineArguments>
               <platforms>
                 <platform>jsw</platform>
@@ -212,10 +212,7 @@
             <configuration>
               <tasks>
                 <copy todir="target/generated-resources/appassembler/jsw/archiva/conf">
-                  <fileset dir="src/main/appserver/conf" />                  
-                </copy>
-                <copy todir="target/generated-resources/appassembler/jsw/archiva/etc">
-                  <fileset dir="src/main/etc" />                  
+                  <fileset dir="src/main/conf" />                  
                 </copy>
                 <mkdir dir="target/generated-resources/appassembler/jsw/archiva/logs"/>      
               </tasks>
diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
index 4a166ac27..dd945e8d9 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
@@ -47,27 +47,6 @@
       <outputDirectory>logs</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>target/generated-resources/appassembler/jsw/archiva/services</directory>
-      <outputDirectory>services</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/generated-resources/appassembler/jsw/archiva/etc</directory>
-      <outputDirectory>etc</outputDirectory>
-      <includes>
-        <include>jetty.xml</include>
-        <include>jetty-logging.xml</include>
-        <include>webdefault.xml</include>
-        <include>realm.properties</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/generated-resources/appassembler/jsw/archiva/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <includes>
-        <include>wrapper.conf</include>
-      </includes>
-    </fileSet>
-    <fileSet>
       <directory>target/generated-resources/appassembler/jsw/archiva/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <includes>   
diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/appserver/conf/archiva.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/archiva.xml
index 9afb83352..9afb83352 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/appserver/conf/archiva.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/archiva.xml
diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty-logging.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty-logging.xml
index 0a1c292d0..0a1c292d0 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty-logging.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty-logging.xml
diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml
index 163089d2e..2c78cc998 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml
@@ -168,31 +168,12 @@
 	  <Set name="parentLoaderPriority">false</Set>
 	  <Set name="extract">true</Set>
 	  <Set name="allowDuplicates">false</Set>
-          <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+          <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/conf/webdefault.xml</Set>
         </New>
       </Arg>
     </Call>
 
     <!-- =========================================================== -->
-    <!-- Configure Authentication Realms                             -->
-    <!-- Realms may be configured for the entire server here, or     -->
-    <!-- they can be configured for a specific web app in a context  -->
-    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
-    <!-- example).                                                   -->
-    <!-- =========================================================== -->
-    <Set name="UserRealms">
-      <Array type="org.mortbay.jetty.security.UserRealm">
-        <Item>
-          <New class="org.mortbay.jetty.security.HashUserRealm">
-            <Set name="name">Test Realm</Set>
-            <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
-            <Set name="refreshInterval">0</Set>
-          </New>
-        </Item>
-      </Array>
-    </Set>
-
-    <!-- =========================================================== -->
     <!-- Configure Request Log                                       -->
     <!-- Request logs  may be configured for the entire server here, -->
     <!-- or they can be configured for a specific web app in a       -->
@@ -266,22 +247,6 @@
 
 
   <!-- =========================================================== -->
-  <!-- Example JAAS realm setup.                                   -->
-  <!-- The LoginModuleName must be exactly the same as in the      -->
-  <!-- login.conf file, and the realm Name must be the same as in  -->
-  <!-- the web.xml file.                                           -->
-  <!-- =========================================================== -->
-  <Call name="addUserRealm">
-    <Arg>
-      <New class="org.mortbay.jetty.plus.jaas.JAASUserRealm">
-	      <Set name="name">xyzrealm</Set>
-	      <Set name="LoginModuleName">xyz</Set>
-	    </New>
-    </Arg>
-  </Call>
-
-
-  <!-- =========================================================== -->
   <!-- Configurations for WebAppContexts                           -->
   <!-- Sequence of configurations to be applied to a webapp.       -->
   <!-- =========================================================== -->
diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/appserver/conf/shared.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/shared.xml
index 9afb83352..9afb83352 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/appserver/conf/shared.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/shared.xml
diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/webdefault.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/webdefault.xml
index df9fa1739..df9fa1739 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/webdefault.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/webdefault.xml
diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/realm.properties b/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/realm.properties
deleted file mode 100644
index f9e4e7fa3..000000000
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/realm.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This file defines users passwords and roles for a HashUserRealm
-#
-# The format is
-#  <username>: <password>[,<rolename> ...]
-#
-# Passwords may be clear text, obfuscated or checksummed.  The class 
-# org.mortbay.util.Password should be used to generate obfuscated
-# passwords or password checksums
-#
-# If DIGEST Authentication is used, the password must be in a recoverable
-# format, either plain text or OBF:.
-#
-jetty: MD5:164c88b302622e17050af52c89945d44,user
-admin: CRYPT:ad1ks..kc.1Ug,server-administrator,content-administrator,admin
-other: OBF:1xmk1w261u9r1w1c1xmq
-plain: plain
-user: password
-
-# This entry is for digest auth.  The credential is a MD5 hash of username:realmname:password
-digest: MD5:6e120743ad67abfbc385bc2bb754e297