From 7ae264e30c625c6243ec84f64a3210ecb52fa063 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Thu, 8 Nov 2012 07:34:13 +1100
Subject: [PATCH] jetty-9 corrections for documentation

---
 .../src/test/config/etc/jetty-testrealm.xml     |  9 +++------
 .../org/eclipse/jetty/webapp/WebAppContext.java |  4 ----
 .../src/main/config/etc/test-realm.xml          | 17 +++++++----------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml
index a9de4e655fa..c3f06c559aa 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
+<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure.dtd">
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-
     <!-- =========================================================== -->
     <!-- Configure Authentication Login Service                      -->
     <!-- Realms may be configured for the entire server here, or     -->
     <!-- they can be configured for a specific web app in a context  -->
-    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
+    <!-- configuration (see $(jetty.home)/webapps/test.xml for an    -->
     <!-- example).                                                   -->
     <!-- =========================================================== -->
     <Call name="addBean">
@@ -19,5 +17,4 @@
         </New>
       </Arg>
     </Call>
-
-</Configure>
+</Configure>
\ No newline at end of file
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
index 137dc15e9ec..d03e7f6243c 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
@@ -606,9 +606,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     /**
      * The override descriptor is a web.xml format file that is applied to the context after the standard WEB-INF/web.xml
      * @return Returns the Override Descriptor.
-     * @deprecated use {@link #getOverrideDescriptors()}
      */
-    @Deprecated
     public String getOverrideDescriptor()
     {
         if (_overrideDescriptors.size()!=1)
@@ -971,9 +969,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     /**
      * The override descriptor is a web.xml format file that is applied to the context after the standard WEB-INF/web.xml
      * @param overrideDescriptor The overrideDescritpor to set.
-     * @deprecated use {@link #setOverrideDescriptors(List)}
      */
-    @Deprecated
     public void setOverrideDescriptor(String overrideDescriptor)
     {
         _overrideDescriptors.clear();
diff --git a/test-jetty-webapp/src/main/config/etc/test-realm.xml b/test-jetty-webapp/src/main/config/etc/test-realm.xml
index e77ac11ca98..806f43e345e 100644
--- a/test-jetty-webapp/src/main/config/etc/test-realm.xml
+++ b/test-jetty-webapp/src/main/config/etc/test-realm.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
+<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure.dtd">
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-    <Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
-      <Call name="warn"><Arg>test-realm is deployed. DO NOT USE IN PRODUCTION!</Arg></Call>
-    </Get>
-  
     <!-- =========================================================== -->
     <!-- Configure Authentication Login Service                      -->
     <!-- Realms may be configured for the entire server here, or     -->
     <!-- they can be configured for a specific web app in a context  -->
-    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
+    <!-- configuration (see $(jetty.home)/webapps/test.xml for an    -->
     <!-- example).                                                   -->
     <!-- =========================================================== -->
     <Call name="addBean">
@@ -23,5 +17,8 @@
         </New>
       </Arg>
     </Call>
-
-</Configure>
+    
+    <Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
+      <Call name="warn"><Arg>test-realm is deployed. DO NOT USE IN PRODUCTION!</Arg></Call>
+    </Get>
+</Configure>
\ No newline at end of file