diff options
| author | Greg Wilkins | 2012-11-07 20:34:13 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2012-11-07 20:34:40 +0000 |
| commit | 7ae264e30c625c6243ec84f64a3210ecb52fa063 (patch) | |
| tree | 911348c5dc16611f83ed0e075473cdb237d8f67f | |
| parent | a08536c8bc2d80d18460e53492b1e7e543a3c66a (diff) | |
| download | org.eclipse.jetty.project-7ae264e30c625c6243ec84f64a3210ecb52fa063.tar.gz org.eclipse.jetty.project-7ae264e30c625c6243ec84f64a3210ecb52fa063.tar.xz org.eclipse.jetty.project-7ae264e30c625c6243ec84f64a3210ecb52fa063.zip | |
jetty-9 corrections for documentation
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 a9de4e655f..c3f06c559a 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 137dc15e9e..d03e7f6243 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 e77ac11ca9..806f43e345 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 |