Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Olivier Lamy 2012-09-26 19:57:20 +00:00
parent 3e257226ee
commit b224367c9e
4 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-jetty-js/pom.xml
View File

@ -246,6 +246,7 @@
<configuration> <configuration>
<excludes> <excludes>
<exclude>src/main/conf/**</exclude> <exclude>src/main/conf/**</exclude>
<exclude>src/main/contexts/**</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>

5
archiva-jetty-js/src/main/assembly/bin.xml
View File

@ -22,6 +22,7 @@
<formats> <formats>
<format>tar.gz</format> <format>tar.gz</format>
<format>zip</format> <format>zip</format>
<format>dir</format>
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
@ -104,6 +105,10 @@
<include>LICENSE</include> <include>LICENSE</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<directory>src/main/contexts</directory>
<outputDirectory>contexts</outputDirectory>
</fileSet>
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>

12
archiva-jetty-js/src/main/conf/jetty.xml
View File

@ -339,4 +339,16 @@
</New> </New>
</Arg> </Arg>
</New> </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> </Configure>

28
archiva-jetty-js/src/main/contexts/archiva.xml Normal file
View File

@ -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>