diff options
| author | Joakim Erdfelt | 2015-03-11 23:02:18 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-03-12 17:09:53 +0000 |
| commit | e92bcccc84e704b938ecaa4d665edada2c3737e3 (patch) | |
| tree | 904123fc62ca228b83403052b15587293bfa9c55 /jetty-annotations/src | |
| parent | 0301de099d876124b5a0b26da171105c63ab0632 (diff) | |
| download | org.eclipse.jetty.project-e92bcccc84e704b938ecaa4d665edada2c3737e3.tar.gz org.eclipse.jetty.project-e92bcccc84e704b938ecaa4d665edada2c3737e3.tar.xz org.eclipse.jetty.project-e92bcccc84e704b938ecaa4d665edada2c3737e3.zip | |
Using new Decorator
Diffstat (limited to 'jetty-annotations/src')
| -rw-r--r-- | jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java | 4 | ||||
| -rw-r--r-- | jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationDecorator.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java index 4f1daa6332..936e7724b6 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java @@ -424,7 +424,7 @@ public class AnnotationConfiguration extends AbstractConfiguration @Override public void configure(WebAppContext context) throws Exception { - context.addDecorator(new AnnotationDecorator(context)); + context.getObjectFactory().addDecorator(new AnnotationDecorator(context)); //Even if metadata is complete, we still need to scan for ServletContainerInitializers - if there are any @@ -646,7 +646,7 @@ public class AnnotationConfiguration extends AbstractConfiguration @Override public void cloneConfigure(WebAppContext template, WebAppContext context) throws Exception { - context.addDecorator(new AnnotationDecorator(context)); + context.getObjectFactory().addDecorator(new AnnotationDecorator(context)); } diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationDecorator.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationDecorator.java index 3f07ebcf18..bd6c99b916 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationDecorator.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationDecorator.java @@ -18,7 +18,7 @@ package org.eclipse.jetty.annotations; -import org.eclipse.jetty.servlet.ServletContextHandler.Decorator; +import org.eclipse.jetty.util.Decorator; import org.eclipse.jetty.webapp.WebAppContext; /** |