From e842c16bb44837b0664e6e34a4460364c2eb03ac Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 10 Nov 2020 00:55:01 +1100 Subject: [PATCH] osgi AnnotationConfiguration should replace the standard one Signed-off-by: Lachlan Roberts --- .../jetty/osgi/annotations/AnnotationConfiguration.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 8db88e052e8..b303f9fba11 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 @@ -30,6 +30,7 @@ import org.eclipse.jetty.osgi.boot.OSGiWebappConstants; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.statistic.CounterStatistic; +import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; @@ -74,6 +75,12 @@ public class AnnotationConfiguration extends org.eclipse.jetty.annotations.Annot { } + @Override + public Class replaces() + { + return org.eclipse.jetty.annotations.AnnotationConfiguration.class; + } + /** * This parser scans the bundles using the OSGi APIs instead of assuming a jar. */