diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-26 19:57:20 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-26 19:57:20 +0000 |
| commit | b224367c9e39ad99445016f10b055bf7b4e10e95 (patch) | |
| tree | c3691fad5c3dcb506fc18c34de0ee0be948dcb85 | |
| parent | 3e257226ee083b41bb2ac1fa743ee8b425f98a86 (diff) | |
| download | archiva-b224367c9e39ad99445016f10b055bf7b4e10e95.tar.gz archiva-b224367c9e39ad99445016f10b055bf7b4e10e95.zip | |
[MRM-1030] Change the web context for jetty deliverable to ROOT.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1390702 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-jetty-js/pom.xml | 1 | ||||
| -rw-r--r-- | archiva-jetty-js/src/main/assembly/bin.xml | 5 | ||||
| -rw-r--r-- | archiva-jetty-js/src/main/conf/jetty.xml | 12 | ||||
| -rw-r--r-- | archiva-jetty-js/src/main/contexts/archiva.xml | 28 |
4 files changed, 46 insertions, 0 deletions
diff --git a/archiva-jetty-js/pom.xml b/archiva-jetty-js/pom.xml index e20c723ca..3e1a6880f 100644 --- a/archiva-jetty-js/pom.xml +++ b/archiva-jetty-js/pom.xml @@ -246,6 +246,7 @@ <configuration> <excludes> <exclude>src/main/conf/**</exclude> + <exclude>src/main/contexts/**</exclude> </excludes> </configuration> </plugin> diff --git a/archiva-jetty-js/src/main/assembly/bin.xml b/archiva-jetty-js/src/main/assembly/bin.xml index ccab3848c..59f4630db 100644 --- a/archiva-jetty-js/src/main/assembly/bin.xml +++ b/archiva-jetty-js/src/main/assembly/bin.xml @@ -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> diff --git a/archiva-jetty-js/src/main/conf/jetty.xml b/archiva-jetty-js/src/main/conf/jetty.xml index 4592f3718..39ca9f1ed 100644 --- a/archiva-jetty-js/src/main/conf/jetty.xml +++ b/archiva-jetty-js/src/main/conf/jetty.xml @@ -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> diff --git a/archiva-jetty-js/src/main/contexts/archiva.xml b/archiva-jetty-js/src/main/contexts/archiva.xml new file mode 100644 index 000000000..3831de7c1 --- /dev/null +++ b/archiva-jetty-js/src/main/contexts/archiva.xml @@ -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 |