Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-09-16 23:12:54 -0400
committerJan Bartel2013-09-16 23:12:54 -0400
commitf44787075ab32126aab00732f1e27a6d2cd512ca (patch)
tree71155999d03c34623e77ac7d3e698f34dbf9c031 /jetty-osgi/jetty-osgi-boot/src
parent6594ee87fa7acef9a580a27ba6fc3532a28932ee (diff)
downloadorg.eclipse.jetty.project-f44787075ab32126aab00732f1e27a6d2cd512ca.tar.gz
org.eclipse.jetty.project-f44787075ab32126aab00732f1e27a6d2cd512ca.tar.xz
org.eclipse.jetty.project-f44787075ab32126aab00732f1e27a6d2cd512ca.zip
417382 - Upgrade to asm 4.1 and refactor annotation parsing
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/src')
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
index b4ae909819..4b15ae5b9d 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
@@ -18,16 +18,11 @@
package org.eclipse.jetty.osgi.annotations;
-import java.util.ArrayList;
-import java.util.List;
-
import org.eclipse.jetty.annotations.AbstractDiscoverableAnnotationHandler;
-import org.eclipse.jetty.annotations.AnnotationParser.DiscoverableAnnotationHandler;
import org.eclipse.jetty.annotations.ClassNameResolver;
import org.eclipse.jetty.osgi.boot.OSGiWebappConstants;
import org.eclipse.jetty.osgi.boot.utils.internal.PackageAdminServiceTracker;
import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.webapp.DiscoveredAnnotation;
import org.eclipse.jetty.webapp.WebAppContext;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -157,7 +152,7 @@ public class AnnotationConfiguration extends org.eclipse.jetty.annotations.Annot
Resource bundleRes = parser.getResource(bundle);
parser.clearHandlers();
- for (DiscoverableAnnotationHandler h:_discoverableAnnotationHandlers)
+ for (AbstractDiscoverableAnnotationHandler h:_discoverableAnnotationHandlers)
{
if (h instanceof AbstractDiscoverableAnnotationHandler)
{

Back to the top