diff options
| author | Violeta Georgieva | 2015-01-05 13:22:09 +0000 |
|---|---|---|
| committer | Violeta Georgieva | 2015-01-05 13:22:09 +0000 |
| commit | fcdee2995877186314a42b006e49a9225ee7ca4f (patch) | |
| tree | 4d32e959792e475af8d85a5df931530a6e74535d /test-bundles | |
| parent | f0da07b8907fe3f6a334791e3192c83c71b8daf4 (diff) | |
| download | org.eclipse.gemini.web.gemini-web-container-fcdee2995877186314a42b006e49a9225ee7ca4f.tar.gz org.eclipse.gemini.web.gemini-web-container-fcdee2995877186314a42b006e49a9225ee7ca4f.tar.xz org.eclipse.gemini.web.gemini-web-container-fcdee2995877186314a42b006e49a9225ee7ca4f.zip | |
Integration with Equinox 3.10.x.
Diffstat (limited to 'test-bundles')
3 files changed, 13 insertions, 16 deletions
diff --git a/test-bundles/customizer-bundle/.classpath b/test-bundles/customizer-bundle/.classpath index b510ea9..0283b26 100755 --- a/test-bundles/customizer-bundle/.classpath +++ b/test-bundles/customizer-bundle/.classpath @@ -3,7 +3,7 @@ h<?xml version="1.0" encoding="UTF-8"?> <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.55.v201409050650/org.apache.tomcat.api-7.0.55.v201409050650.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.55.v201409050650/org.apache.tomcat.api.source-7.0.55.v201409050650.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-sources-3.8.1.v20120830-144521.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.2.0.M02/org.eclipse.gemini.web.tomcat-2.2.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.2.0.M02/org.eclipse.gemini.web.tomcat-sources-2.2.0.M02.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
<classpathentry kind="output" path="target"/>
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 f89cef1..4b5f6e7 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,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2014 SAP AG
+ * Copyright (c) 2012, 2015 SAP AG
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -28,10 +28,9 @@ import javax.servlet.ServletContext; import org.apache.tomcat.JarScanner;
import org.apache.tomcat.JarScannerCallback;
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.eclipse.osgi.framework.adaptor.BundleData;
-import org.eclipse.osgi.framework.internal.core.BundleHost;
+import org.eclipse.osgi.internal.framework.EquinoxBundle;
+import org.eclipse.osgi.storage.BundleInfo.Generation;
+import org.eclipse.osgi.storage.bundlefile.BundleFile;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
@@ -120,12 +119,10 @@ public class BundleJarScanner implements JarScanner { }
private BundleFile getBundleFile(Bundle bundle) {
- if (bundle instanceof BundleHost) {
- BundleHost bh = (BundleHost) bundle;
- BundleData bundleData = bh.getBundleData();
- if (bundleData instanceof BaseData) {
- return ((BaseData) bundleData).getBundleFile();
- }
+ if (bundle instanceof EquinoxBundle) {
+ EquinoxBundle eb = (EquinoxBundle) bundle;
+ Generation current = (Generation) eb.getModule().getCurrentRevision().getRevisionInfo();
+ return current.getBundleFile();
}
return null;
}
diff --git a/test-bundles/customizer-bundle/src/main/resources/META-INF/MANIFEST.MF b/test-bundles/customizer-bundle/src/main/resources/META-INF/MANIFEST.MF index a33c08a..6916b68 100755 --- a/test-bundles/customizer-bundle/src/main/resources/META-INF/MANIFEST.MF +++ b/test-bundles/customizer-bundle/src/main/resources/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Import-Package: org.apache.tomcat, org.osgi.framework, javax.servlet, javax.servlet.http, - org.eclipse.osgi.baseadaptor, - org.eclipse.osgi.baseadaptor.bundlefile, - org.eclipse.osgi.framework.adaptor, - org.eclipse.osgi.framework.internal.core + org.eclipse.osgi.container, + org.eclipse.osgi.internal.framework, + org.eclipse.osgi.storage.bundlefile, + org.eclipse.osgi.storage Bundle-Activator: org.eclipse.gemini.web.Activator |