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

implemented ServletContext.getVersionServerName

This commit is contained in:
Greg Wilkins 2015-07-23 19:46:51 +10:00
parent ee67cb46de
commit ea7c0fed30
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -1783,7 +1783,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
* *
* *
*/ */
public class Context extends NoContext public class Context extends StaticContext
{ {
protected boolean _enabled = true; //whether or not the dynamic API is enabled for callers protected boolean _enabled = true; //whether or not the dynamic API is enabled for callers
protected boolean _extendedListenerTypes = false; protected boolean _extendedListenerTypes = false;
@ -1970,7 +1970,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
{ {
Resource resource = ContextHandler.this.getResource(path); Resource resource = ContextHandler.this.getResource(path);
if (resource != null && resource.exists()) if (resource != null && resource.exists())
return resource.getURL(); return resource.getURI().toURL();
return null; return null;
} }
@ -2340,16 +2340,24 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
T o = clazz.newInstance(); T o = clazz.newInstance();
return o; return o;
} }
@Override
public String getVirtualServerName()
{
String[] hosts = getVirtualHosts();
if (hosts!=null && hosts.length>0)
return hosts[0];
return null;
}
} }
public static class StaticContext extends AttributesMap implements ServletContext
public static class NoContext extends AttributesMap implements ServletContext
{ {
private int _effectiveMajorVersion = SERVLET_MAJOR_VERSION; private int _effectiveMajorVersion = SERVLET_MAJOR_VERSION;
private int _effectiveMinorVersion = SERVLET_MINOR_VERSION; private int _effectiveMinorVersion = SERVLET_MINOR_VERSION;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public NoContext() public StaticContext()
{ {
} }
@ -2685,13 +2693,9 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
LOG.warn(__unimplmented); LOG.warn(__unimplmented);
} }
/**
* @see javax.servlet.ServletContext#getVirtualServerName()
*/
@Override @Override
public String getVirtualServerName() public String getVirtualServerName()
{ {
// TODO 3.1 Auto-generated method stub
return null; return null;
} }
} }
@ -2738,7 +2742,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
return false; return false;
String a=resource.getAlias().toString(); String a=resource.getAlias().toString();
String r=resource.getURL().toString(); String r=resource.getURI().toString();
if (a.length()>r.length()) if (a.length()>r.length())
return a.startsWith(r) && a.length()==r.length()+1 && a.endsWith("/"); return a.startsWith(r) && a.length()==r.length()+1 && a.endsWith("/");

2
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
View File

@ -142,7 +142,7 @@ public class ServletHandler extends ScopedHandler
throws Exception throws Exception
{ {
ContextHandler.Context context=ContextHandler.getCurrentContext(); ContextHandler.Context context=ContextHandler.getCurrentContext();
_servletContext=context==null?new ContextHandler.NoContext():context; _servletContext=context==null?new ContextHandler.StaticContext():context;
_contextHandler=(ServletContextHandler)(context==null?null:context.getContextHandler()); _contextHandler=(ServletContextHandler)(context==null?null:context.getContextHandler());
if (_contextHandler!=null) if (_contextHandler!=null)