diff options
| author | Joakim Erdfelt | 2014-12-18 18:30:40 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-03-12 17:06:03 +0000 |
| commit | 0c930c86400873e6afb993608f43bd79605abc55 (patch) | |
| tree | 015cc761806f079f0c9be2727a63f22d53bfbcae /jetty-servlet/src/main | |
| parent | c65e6aaab78e7f4026504dfbe147f68ebba5faf5 (diff) | |
| download | org.eclipse.jetty.project-0c930c86400873e6afb993608f43bd79605abc55.tar.gz org.eclipse.jetty.project-0c930c86400873e6afb993608f43bd79605abc55.tar.xz org.eclipse.jetty.project-0c930c86400873e6afb993608f43bd79605abc55.zip | |
Rename EnhancedInstantiator to DecoratedObjectFactory
Diffstat (limited to 'jetty-servlet/src/main')
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java index 45a85afd9c..29cbed496c 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java @@ -60,7 +60,7 @@ import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.server.handler.gzip.GzipHandler; import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.servlet.BaseHolder.Source; -import org.eclipse.jetty.util.EnhancedInstantiator; +import org.eclipse.jetty.util.DecoratedObjectFactory; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.LifeCycle; @@ -88,7 +88,7 @@ public class ServletContextHandler extends ContextHandler public interface ServletContainerInitializerCaller extends LifeCycle {}; - protected final EnhancedInstantiator _instantiator= new EnhancedInstantiator(); + protected final DecoratedObjectFactory _instantiator= new DecoratedObjectFactory(); protected Class<? extends SecurityHandler> _defaultSecurityHandlerClass=org.eclipse.jetty.security.ConstraintSecurityHandler.class; protected SessionHandler _sessionHandler; protected SecurityHandler _securityHandler; @@ -252,7 +252,7 @@ public class ServletContextHandler extends ContextHandler @Override protected void doStart() throws Exception { - setAttribute(EnhancedInstantiator.ATTR, _instantiator); + setAttribute(DecoratedObjectFactory.ATTR, _instantiator); super.doStart(); } @@ -651,7 +651,7 @@ public class ServletContextHandler extends ContextHandler /* ------------------------------------------------------------ */ /** * @return The decorator list used to resource inject new Filters, Servlets and EventListeners - * @deprecated use getAttribute("org.eclipse.jetty.util.EnhancedInstantiator") instead + * @deprecated use getAttribute("org.eclipse.jetty.util.DecoratedObjectFactory") instead */ @Deprecated public List<Decorator> getDecorators() |