From 1de6fe7f0d94dc707f3347afa87c0accc134a6c7 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 26 Sep 2012 19:57:31 +0000
Subject: [PATCH] cleanup and add license header

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1390704 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-jetty-js/pom.xml                      |  1 -
 archiva-jetty-js/src/main/assembly/bin.xml    |  1 -
 .../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>