Author: brett
Date: Wed Mar 26 23:35:30 2008
New Revision: 641714
URL: http://svn.apache.org/viewvc?rev=641714&view=rev
Log:
consolidate the configuration
Added:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/
- copied from r641698,
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/appserver/conf/
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty-logging.xml
- copied unchanged from r641698,
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty-logging.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml
- copied, changed from r641698,
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/webdefault.xml
- copied unchanged from r641698,
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/webdefault.xml
Removed:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/appserver/
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml?rev=641714&r1=641713&r2=641714&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml
(original)
+++ maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/pom.xml
Wed Mar 26 23:35:30 2008
@@ -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>
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml?rev=641714&r1=641713&r2=641714&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
Wed Mar 26 23:35:30 2008
@@ -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>
Copied:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml
(from r641698,
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml?p2=maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml&p1=maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml&r1=641698&r2=641714&rev=641714&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/conf/jetty.xml
Wed Mar 26 23:35:30 2008
@@ -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 -->
@@ -263,22 +244,6 @@
<!-- You can configure any transaction manager that implements -->
<!-- javax.transaction.UserTransaction. -->
-
-
- <!-- =========================================================== -->
- <!-- 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>
<!-- =========================================================== -->
