Author: olamy
Date: Wed Sep 26 19:57:20 2012
New Revision: 1390702
URL: http://svn.apache.org/viewvc?rev=1390702&view=rev
Log:
[MRM-1030] Change the web context for jetty deliverable to ROOT.
Added:
archiva/trunk/archiva-jetty-js/src/main/contexts/
archiva/trunk/archiva-jetty-js/src/main/contexts/archiva.xml (with props)
Modified:
archiva/trunk/archiva-jetty-js/pom.xml
archiva/trunk/archiva-jetty-js/src/main/assembly/bin.xml
archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml
Modified: archiva/trunk/archiva-jetty-js/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty-js/pom.xml?rev=1390702&r1=1390701&r2=1390702&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty-js/pom.xml (original)
+++ archiva/trunk/archiva-jetty-js/pom.xml Wed Sep 26 19:57:20 2012
@@ -246,6 +246,7 @@
<configuration>
<excludes>
<exclude>src/main/conf/**</exclude>
+ <exclude>src/main/contexts/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: archiva/trunk/archiva-jetty-js/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty-js/src/main/assembly/bin.xml?rev=1390702&r1=1390701&r2=1390702&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty-js/src/main/assembly/bin.xml (original)
+++ archiva/trunk/archiva-jetty-js/src/main/assembly/bin.xml Wed Sep 26
19:57:20 2012
@@ -22,6 +22,7 @@
<formats>
<format>tar.gz</format>
<format>zip</format>
+ <format>dir</format>
</formats>
<fileSets>
<fileSet>
@@ -104,6 +105,10 @@
<include>LICENSE</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>src/main/contexts</directory>
+ <outputDirectory>contexts</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml?rev=1390702&r1=1390701&r2=1390702&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml (original)
+++ archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml Wed Sep 26 19:57:20
2012
@@ -339,4 +339,16 @@
</New>
</Arg>
</New>
+
+
+ <!--
+ <New id="ArchivaWebAppContext"
class="org.eclipse.jetty.webapp.WebAppContext">
+ <Arg><Ref id="Handlers"/></Arg>
+ <Arg><SystemProperty name="jetty.home" default="."/>/apps/archiva</Arg>
+ <Arg>/</Arg>
+ <Set name="extractWAR">false</Set>
+ <Set name="throwUnavailableOnStartupException">true</Set>
+ </New>
+ -->
+
</Configure>
Added: archiva/trunk/archiva-jetty-js/src/main/contexts/archiva.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty-js/src/main/contexts/archiva.xml?rev=1390702&view=auto
==============================================================================
--- archiva/trunk/archiva-jetty-js/src/main/contexts/archiva.xml (added)
+++ archiva/trunk/archiva-jetty-js/src/main/contexts/archiva.xml Wed Sep 26
19:57:20 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN"
"http://www.eclipse.org/jetty/configure.dtd";>
+
+<!-- ==================================================================
+Configure and deploy the test web application in $(jetty.home)/webapps/test
+
+Note. If this file did not exist or used a context path other that /test
+then the default configuration of jetty.xml would discover the test
+webapplication with a WebAppDeployer. By specifying a context in this
+directory, additional configuration may be specified and hot deployments
+detected.
+===================================================================== -->
+
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Required minimal context configuration : -->
+ <!-- + contextPath -->
+ <!-- + war OR resourceBase -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <Set name="contextPath">/</Set>
+ <Set name="war"><SystemProperty name="jetty.home"
default="."/>/apps/archiva</Set>
+
+ <Set name="extractWAR">false</Set>
+ <Set name="copyWebDir">false</Set>
+
+</Configure>
\ No newline at end of file
Propchange: archiva/trunk/archiva-jetty-js/src/main/contexts/archiva.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-jetty-js/src/main/contexts/archiva.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
