diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-26 19:57:31 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-26 19:57:31 +0000 |
| commit | 1de6fe7f0d94dc707f3347afa87c0accc134a6c7 (patch) | |
| tree | 584ff4a4ea4584bc86bca8f77ae90d93c2ac8b57 /archiva-jetty-js | |
| parent | b224367c9e39ad99445016f10b055bf7b4e10e95 (diff) | |
| download | archiva-1de6fe7f0d94dc707f3347afa87c0accc134a6c7.tar.gz archiva-1de6fe7f0d94dc707f3347afa87c0accc134a6c7.zip | |
cleanup and add license header
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1390704 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-jetty-js')
| -rw-r--r-- | archiva-jetty-js/pom.xml | 1 | ||||
| -rw-r--r-- | archiva-jetty-js/src/main/assembly/bin.xml | 1 | ||||
| -rw-r--r-- | archiva-jetty-js/src/main/contexts/archiva.xml | 33 |
3 files changed, 18 insertions, 17 deletions
diff --git a/archiva-jetty-js/pom.xml b/archiva-jetty-js/pom.xml index 3e1a6880f..e20c723ca 100644 --- a/archiva-jetty-js/pom.xml +++ b/archiva-jetty-js/pom.xml @@ -246,7 +246,6 @@ <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 59f4630db..d3d93a4ba 100644 --- a/archiva-jetty-js/src/main/assembly/bin.xml +++ b/archiva-jetty-js/src/main/assembly/bin.xml @@ -22,7 +22,6 @@ <formats> <format>tar.gz</format> <format>zip</format> - <format>dir</format> </formats> <fileSets> <fileSet> diff --git a/archiva-jetty-js/src/main/contexts/archiva.xml b/archiva-jetty-js/src/main/contexts/archiva.xml index 3831de7c1..93728d8e6 100644 --- a/archiva-jetty-js/src/main/contexts/archiva.xml +++ b/archiva-jetty-js/src/main/contexts/archiva.xml @@ -1,24 +1,27 @@ <?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. -===================================================================== --> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> <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> |