bug 448004: Test bundle - implement the changed interface.
diff --git a/test-bundles/customizer-bundle/src/main/java/org/eclipse/gemini/web/BundleJarScanner.java b/test-bundles/customizer-bundle/src/main/java/org/eclipse/gemini/web/BundleJarScanner.java
index 4b5f6e7..e3a7615 100755
--- a/test-bundles/customizer-bundle/src/main/java/org/eclipse/gemini/web/BundleJarScanner.java
+++ b/test-bundles/customizer-bundle/src/main/java/org/eclipse/gemini/web/BundleJarScanner.java
@@ -1,14 +1,14 @@
/*******************************************************************************
- * Copyright (c) 2012, 2015 SAP AG
+ * Copyright (c) 2012, 2015 SAP SE
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
+ * and Apache License v2.0 which accompanies this distribution.
* The Eclipse Public License is available at
* http://www.eclipse.org/legal/epl-v10.html
- * and the Apache License v2.0 is available at
+ * and the Apache License v2.0 is available at
* http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
+ * You may elect to redistribute this code under either of these licenses.
*
* Contributors:
* Violeta Georgieva - initial contribution
@@ -22,10 +22,11 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import java.util.Set;
import javax.servlet.ServletContext;
+import org.apache.tomcat.JarScanFilter;
+import org.apache.tomcat.JarScanType;
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.JarScannerCallback;
import org.eclipse.osgi.internal.framework.EquinoxBundle;
@@ -43,13 +44,23 @@
private static final String REFERENCE_URL_PREFIX = "reference";
@Override
- public void scan(ServletContext servletContext, ClassLoader classLoader, JarScannerCallback jarScannerCallback, Set<String> jarsToSkip) {
+ public void scan(JarScanType jarScanType, ServletContext servletContext, JarScannerCallback jarScannerCallback) {
Bundle bundle = FrameworkUtil.getBundle(this.getClass());
if (bundle != null) {
scanBundle(bundle, jarScannerCallback);
}
}
+ @Override
+ public JarScanFilter getJarScanFilter() {
+ return null;
+ }
+
+ @Override
+ public void setJarScanFilter(JarScanFilter jarScanFilter) {
+ // no-op
+ }
+
private void scanBundle(Bundle bundle, JarScannerCallback callback) {
File bundleFile = resolve(bundle);
if (bundleFile != null) {
@@ -80,7 +91,7 @@
private void scanBundleFile(File bundleFile, JarScannerCallback callback) {
if (bundleFile.isDirectory()) {
try {
- callback.scan(bundleFile);
+ callback.scan(bundleFile, null, true);
} catch (IOException e) {
System.out.println("Failure when attempting to scan bundle file '" + bundleFile + "':" + e.getMessage());
}
@@ -101,7 +112,7 @@
URLConnection connection = url.openConnection();
if (connection instanceof JarURLConnection) {
- callback.scan((JarURLConnection) connection);
+ callback.scan((JarURLConnection) connection, null, true);
}
} catch (IOException e) {
System.out.println("Failure when attempting to scan bundle via jar URL '" + url + "':" + e.getMessage());
