Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jetty-9 corrections for documentation

This commit is contained in:
Greg Wilkins 2012-11-08 07:34:13 +11:00
parent a08536c8bc
commit 7ae264e30c
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml
View File

@ -1,13 +1,11 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Configure Authentication Login Service --> <!-- Configure Authentication Login Service -->
<!-- Realms may be configured for the entire server here, or --> <!-- Realms may be configured for the entire server here, or -->
<!-- they can be configured for a specific web app in a context --> <!-- 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). --> <!-- example). -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Call name="addBean"> <Call name="addBean">
@ -19,5 +17,4 @@
</New> </New>
</Arg> </Arg>
</Call> </Call>
</Configure> </Configure>

4
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
View File

@ -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 * 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. * @return Returns the Override Descriptor.
* @deprecated use {@link #getOverrideDescriptors()}
*/ */
@Deprecated
public String getOverrideDescriptor() public String getOverrideDescriptor()
{ {
if (_overrideDescriptors.size()!=1) 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 * 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. * @param overrideDescriptor The overrideDescritpor to set.
* @deprecated use {@link #setOverrideDescriptors(List)}
*/ */
@Deprecated
public void setOverrideDescriptor(String overrideDescriptor) public void setOverrideDescriptor(String overrideDescriptor)
{ {
_overrideDescriptors.clear(); _overrideDescriptors.clear();

13
test-jetty-webapp/src/main/config/etc/test-realm.xml
View File

@ -1,17 +1,11 @@
<?xml version="1.0"?> <?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 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 --> <!-- Configure Authentication Login Service -->
<!-- Realms may be configured for the entire server here, or --> <!-- Realms may be configured for the entire server here, or -->
<!-- they can be configured for a specific web app in a context --> <!-- 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). --> <!-- example). -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Call name="addBean"> <Call name="addBean">
@ -24,4 +18,7 @@
</Arg> </Arg>
</Call> </Call>
<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> </Configure>