[tycho] 03/04: Fixed the compilation errors with Java 9 (Closes: #874130)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 23 14:00:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tycho.
commit 311839ed5b2d7ab27538a925a8a4f2e88bbc7ee5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Nov 23 14:57:50 2017 +0100
Fixed the compilation errors with Java 9 (Closes: #874130)
---
debian/changelog | 1 +
debian/patches/java9-compatibility.patch | 543 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 545 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 90b5cd0..29537cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ tycho (0.25.0-4) UNRELEASED; urgency=medium
* Team upload.
* Added the missing build dependency on libcommons-httpclient-java
(Closes: #881335)
+ * Fixed the compilation errors with Java 9 (Closes: #874130)
* Removed the unused build dependency on glassfish-javaee
-- Emmanuel Bourg <ebourg at apache.org> Thu, 23 Nov 2017 14:00:28 +0100
diff --git a/debian/patches/java9-compatibility.patch b/debian/patches/java9-compatibility.patch
new file mode 100644
index 0000000..2988313
--- /dev/null
+++ b/debian/patches/java9-compatibility.patch
@@ -0,0 +1,543 @@
+Description: Fixes the compilation errors with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/874130
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java
+@@ -46,7 +46,7 @@
+ @Override
+ public void preFindLocalClass(String name, ClasspathManager manager) throws ClassNotFoundException {
+ ModuleRevision revision = manager.getGeneration().getRevision();
+- Module module = revision.getRevisions().getModule();
++ org.eclipse.osgi.container.Module module = revision.getRevisions().getModule();
+ // If the bundle is active, uninstalled or stopping then the bundle has already
+ // been initialized (though it may have been destroyed) so just return the class.
+ if (alreadyActive.contains(module.getState()))
+@@ -101,7 +101,7 @@
+ // Note that another thread may already be starting this bundle;
+ // In this case we will timeout after a default of 5 seconds and record the BundleException
+ long startTime = System.currentTimeMillis();
+- Module m = managers[i].getGeneration().getRevision().getRevisions().getModule();
++ org.eclipse.osgi.container.Module m = managers[i].getGeneration().getRevision().getRevisions().getModule();
+ try {
+ // do not persist the start of this bundle
+ secureAction.start(m, StartOptions.LAZY_TRIGGER);
+@@ -124,7 +124,7 @@
+ }
+ }
+
+- private boolean shouldActivateFor(String className, Module module, ModuleRevision revision, ClasspathManager manager) throws ClassNotFoundException {
++ private boolean shouldActivateFor(String className, org.eclipse.osgi.container.Module module, ModuleRevision revision, ClasspathManager manager) throws ClassNotFoundException {
+ State state = module.getState();
+ if (!State.LAZY_STARTING.equals(state)) {
+ if (State.STARTING.equals(state) && manager.getClassLoader().getBundleLoader().isTriggerSet()) {
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java
+@@ -124,7 +124,7 @@
+
+ @Override
+ public void loadFragments(Collection<ModuleRevision> fragments) {
+- Module systemModule = getWiring().getRevision().getRevisions().getModule();
++ org.eclipse.osgi.container.Module systemModule = getWiring().getRevision().getRevisions().getModule();
+ try {
+ this.getGeneration().getBundleInfo().getStorage().getExtensionInstaller().addExtensionContent(fragments, systemModule);
+ } catch (BundleException e) {
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java
+@@ -179,7 +179,7 @@
+ }
+
+ private void installExtensions() {
+- Module systemModule = moduleContainer.getModule(0);
++ org.eclipse.osgi.container.Module systemModule = moduleContainer.getModule(0);
+ ModuleRevision systemRevision = systemModule == null ? null : systemModule.getCurrentRevision();
+ ModuleWiring systemWiring = systemRevision == null ? null : systemRevision.getWiring();
+ if (systemWiring == null) {
+@@ -205,8 +205,8 @@
+ }
+
+ private void discardBundlesOnLoad() throws BundleException {
+- Collection<Module> discarded = new ArrayList<Module>(0);
+- for (Module module : moduleContainer.getModules()) {
++ Collection<org.eclipse.osgi.container.Module> discarded = new ArrayList<org.eclipse.osgi.container.Module>(0);
++ for (org.eclipse.osgi.container.Module module : moduleContainer.getModules()) {
+ if (module.getId() == Constants.SYSTEM_BUNDLE_ID)
+ continue;
+ ModuleRevision revision = module.getCurrentRevision();
+@@ -246,7 +246,7 @@
+ }
+
+ private void checkSystemBundle() {
+- Module systemModule = moduleContainer.getModule(0);
++ org.eclipse.osgi.container.Module systemModule = moduleContainer.getModule(0);
+ Generation newGeneration = null;
+ try {
+ if (systemModule == null) {
+@@ -320,8 +320,8 @@
+ }
+
+ // close all the generations
+- List<Module> modules = moduleContainer.getModules();
+- for (Module module : modules) {
++ List<org.eclipse.osgi.container.Module> modules = moduleContainer.getModules();
++ for (org.eclipse.osgi.container.Module module : modules) {
+ for (ModuleRevision revision : module.getRevisions().getModuleRevisions()) {
+ Generation generation = (Generation) revision.getRevisionInfo();
+ if (generation != null) {
+@@ -407,7 +407,7 @@
+ return osgiLocation.isReadOnly();
+ }
+
+- public URLConnection getContentConnection(Module module, String bundleLocation, final InputStream in) throws IOException {
++ public URLConnection getContentConnection(org.eclipse.osgi.container.Module module, String bundleLocation, final InputStream in) throws IOException {
+ if (in != null) {
+ return new URLConnection(null) {
+ /**
+@@ -434,7 +434,7 @@
+ return getContentConnection(getUpdateLocation(module));
+ }
+
+- private String getUpdateLocation(final Module module) {
++ private String getUpdateLocation(final org.eclipse.osgi.container.Module module) {
+ if (System.getSecurityManager() == null)
+ return getUpdateLocation0(module);
+ return AccessController.doPrivileged(new PrivilegedAction<String>() {
+@@ -444,7 +444,7 @@
+ });
+ }
+
+- String getUpdateLocation0(Module module) {
++ String getUpdateLocation0(org.eclipse.osgi.container.Module module) {
+ ModuleRevision current = module.getCurrentRevision();
+ Generation generation = (Generation) current.getRevisionInfo();
+ String updateLocation = generation.getHeaders().get(Constants.BUNDLE_UPDATELOCATION);
+@@ -476,7 +476,7 @@
+ return new URL(spec);
+ }
+
+- public Generation install(Module origin, String bundleLocation, URLConnection content) throws BundleException {
++ public Generation install(org.eclipse.osgi.container.Module origin, String bundleLocation, URLConnection content) throws BundleException {
+ if (osgiLocation.isReadOnly()) {
+ throw new BundleException("The framework storage area is read only.", BundleException.INVALID_OPERATION); //$NON-NLS-1$
+ }
+@@ -492,7 +492,7 @@
+ // before doing the staging and generation creation.
+ // This is important since some installers seem to continually
+ // re-install bundles using the same location each startup
+- Module existingLocation = moduleContainer.getModule(bundleLocation);
++ org.eclipse.osgi.container.Module existingLocation = moduleContainer.getModule(bundleLocation);
+ if (existingLocation != null) {
+ // NOTE this same logic is also in the ModuleContainer
+ // This is necessary because the container does the location locking.
+@@ -529,7 +529,7 @@
+ setStorageHooks(generation);
+
+ ModuleRevisionBuilder builder = getBuilder(generation);
+- Module m = moduleContainer.install(origin, bundleLocation, builder, generation);
++ org.eclipse.osgi.container.Module m = moduleContainer.install(origin, bundleLocation, builder, generation);
+ if (!lockedID.equals(m.getId())) {
+ // this revision is already installed. delete the generation
+ generation.delete();
+@@ -699,7 +699,7 @@
+ return result.toString();
+ }
+
+- public Generation update(Module module, URLConnection content) throws BundleException {
++ public Generation update(org.eclipse.osgi.container.Module module, URLConnection content) throws BundleException {
+ if (osgiLocation.isReadOnly()) {
+ throw new BundleException("The framework storage area is read only.", BundleException.INVALID_OPERATION); //$NON-NLS-1$
+ }
+@@ -1084,9 +1084,9 @@
+ }
+
+ private void saveGenerations(DataOutputStream out) throws IOException {
+- List<Module> modules = moduleContainer.getModules();
++ List<org.eclipse.osgi.container.Module> modules = moduleContainer.getModules();
+ List<Generation> generations = new ArrayList<Generation>();
+- for (Module module : modules) {
++ for (org.eclipse.osgi.container.Module module : modules) {
+ ModuleRevision revision = module.getCurrentRevision();
+ if (revision != null) {
+ Generation generation = (Generation) revision.getRevisionInfo();
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java
+@@ -155,7 +155,7 @@
+ }
+ lockStateChange(ModuleEvent.STOPPED);
+ try {
+- if (Module.ACTIVE_SET.contains(getState())) {
++ if (org.eclipse.osgi.container.Module.ACTIVE_SET.contains(getState())) {
+ // TODO this still has a chance of a race condition:
+ // multiple threads could get started if stop is called over and over
+ Thread t = new Thread(new Runnable() {
+@@ -181,7 +181,7 @@
+ }
+ lockStateChange(ModuleEvent.UPDATED);
+ try {
+- if (Module.ACTIVE_SET.contains(getState())) {
++ if (org.eclipse.osgi.container.Module.ACTIVE_SET.contains(getState())) {
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+@@ -252,7 +252,7 @@
+ }
+
+ @Override
+- Module createSystemModule(ModuleContainer moduleContainer) {
++ org.eclipse.osgi.container.Module createSystemModule(ModuleContainer moduleContainer) {
+ return new EquinoxSystemModule(moduleContainer);
+ }
+
+@@ -297,12 +297,12 @@
+ }
+
+ private final EquinoxContainer equinoxContainer;
+- private final Module module;
++ private final org.eclipse.osgi.container.Module module;
+ private final Object monitor = new Object();
+ private BundleContextImpl context;
+ private volatile SignerInfo[] signerInfos;
+
+- private class EquinoxModule extends Module {
++ private class EquinoxModule extends org.eclipse.osgi.container.Module {
+
+ @Override
+ protected void startWorker() throws BundleException {
+@@ -344,7 +344,7 @@
+ this.module = new EquinoxModule(id, location, moduleContainer, settings, startlevel);
+ }
+
+- Module createSystemModule(ModuleContainer moduleContainer) {
++ org.eclipse.osgi.container.Module createSystemModule(ModuleContainer moduleContainer) {
+ throw new UnsupportedOperationException();
+ }
+
+@@ -387,7 +387,7 @@
+ if (options == 0) {
+ return new StartOptions[0];
+ }
+- Collection<StartOptions> result = new ArrayList<Module.StartOptions>(2);
++ Collection<StartOptions> result = new ArrayList<org.eclipse.osgi.container.Module.StartOptions>(2);
+ if ((options & Bundle.START_TRANSIENT) != 0) {
+ result.add(StartOptions.TRANSIENT);
+ }
+@@ -580,7 +580,7 @@
+
+ private ModuleClassLoader getModuleClassLoader(boolean logResolveError) {
+ ResolutionReport report = resolve();
+- if (logResolveError && !Module.RESOLVED_SET.contains(module.getState())) {
++ if (logResolveError && !org.eclipse.osgi.container.Module.RESOLVED_SET.contains(module.getState())) {
+ String reportMessage = report.getResolutionReportMessage(module.getCurrentRevision());
+ equinoxContainer.getEventPublisher().publishFrameworkEvent(FrameworkEvent.ERROR, this, new BundleException(reportMessage, BundleException.RESOLVE_ERROR));
+ }
+@@ -676,7 +676,7 @@
+ if (context == null) {
+ // only create the context if we are starting, active or stopping
+ // this is so that SCR can get the context for lazy-start bundles
+- if (Module.ACTIVE_SET.contains(module.getState())) {
++ if (org.eclipse.osgi.container.Module.ACTIVE_SET.contains(module.getState())) {
+ context = new BundleContextImpl(this, equinoxContainer);
+ }
+ }
+@@ -877,7 +877,7 @@
+ }
+
+ // Equinox extras
+- if (Module.class.equals(adapterType)) {
++ if (org.eclipse.osgi.container.Module.class.equals(adapterType)) {
+ return (A) module;
+ }
+ if (ProtectionDomain.class.equals(adapterType)) {
+@@ -910,7 +910,7 @@
+ return this;
+ }
+
+- public Module getModule() {
++ public org.eclipse.osgi.container.Module getModule() {
+ return module;
+ }
+
+@@ -954,7 +954,7 @@
+ }
+
+ ResolutionReport resolve() {
+- if (!Module.RESOLVED_SET.contains(module.getState())) {
++ if (!org.eclipse.osgi.container.Module.RESOLVED_SET.contains(module.getState())) {
+ return module.getContainer().resolve(Arrays.asList(module), true);
+ }
+ return null;
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
+@@ -56,7 +56,7 @@
+ }
+
+ @Override
+- public void filterCollisions(int operationType, Module target, Collection<Module> collisionCandidates) {
++ public void filterCollisions(int operationType, org.eclipse.osgi.container.Module target, Collection<org.eclipse.osgi.container.Module> collisionCandidates) {
+ switch (container.getConfiguration().BSN_VERSION) {
+ case EquinoxConfiguration.BSN_VERSION_SINGLE : {
+ return;
+@@ -67,8 +67,8 @@
+ }
+ case EquinoxConfiguration.BSN_VERSION_MANAGED : {
+ Bundle targetBundle = target.getBundle();
+- ArrayMap<Bundle, Module> candidateBundles = new ArrayMap<Bundle, Module>(collisionCandidates.size());
+- for (Module module : collisionCandidates) {
++ ArrayMap<Bundle, org.eclipse.osgi.container.Module> candidateBundles = new ArrayMap<Bundle, org.eclipse.osgi.container.Module>(collisionCandidates.size());
++ for (org.eclipse.osgi.container.Module module : collisionCandidates) {
+ candidateBundles.put(module.getBundle(), module);
+ }
+ notifyCollisionHooks(operationType, targetBundle, candidateBundles);
+@@ -186,7 +186,7 @@
+ Debug.println("ResolverHook.begin"); //$NON-NLS-1$
+ }
+ ModuleContainer mContainer = storage.getModuleContainer();
+- Module systemModule = mContainer == null ? null : mContainer.getModule(0);
++ org.eclipse.osgi.container.Module systemModule = mContainer == null ? null : mContainer.getModule(0);
+ ServiceRegistry registry = container.getServiceRegistry();
+ if (registry == null || systemModule == null) {
+ return new CoreResolverHook(Collections.<HookReference> emptyList(), systemModule);
+@@ -221,11 +221,11 @@
+
+ class CoreResolverHook implements ResolutionReport.Listener, ResolverHook {
+ private final List<HookReference> hooks;
+- private final Module systemModule;
++ private final org.eclipse.osgi.container.Module systemModule;
+
+ private volatile ResolutionReport resolutionReport;
+
+- CoreResolverHook(List<HookReference> hooks, Module systemModule) {
++ CoreResolverHook(List<HookReference> hooks, org.eclipse.osgi.container.Module systemModule) {
+ this.hooks = hooks;
+ this.systemModule = systemModule;
+ }
+@@ -266,7 +266,7 @@
+ }
+
+ private boolean isBootInit() {
+- return systemModule == null || !Module.RESOLVED_SET.contains(systemModule.getState()) || (systemModule.getState().equals(State.STARTING) && inInit);
++ return systemModule == null || !org.eclipse.osgi.container.Module.RESOLVED_SET.contains(systemModule.getState()) || (systemModule.getState().equals(State.STARTING) && inInit);
+ }
+
+ public void filterSingletonCollisions(BundleCapability singleton, Collection<BundleCapability> collisionCandidates) {
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java
+@@ -54,7 +54,7 @@
+ if (isDefaultLocale && currentDefault != null) {
+ return currentDefault;
+ }
+- if (generation.getRevision().getRevisions().getModule().getState().equals(Module.State.UNINSTALLED)) {
++ if (generation.getRevision().getRevisions().getModule().getState().equals(org.eclipse.osgi.container.Module.State.UNINSTALLED)) {
+ // defaultLocaleHeaders should have been initialized on uninstall
+ if (currentDefault != null)
+ return currentDefault;
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
+@@ -142,7 +142,7 @@
+ }
+
+ @Override
+- public void publishContainerEvent(ContainerEvent type, Module module, Throwable error, FrameworkListener... listeners) {
++ public void publishContainerEvent(ContainerEvent type, org.eclipse.osgi.container.Module module, Throwable error, FrameworkListener... listeners) {
+ EquinoxEventPublisher publisher = container.getEventPublisher();
+ if (publisher != null) {
+ publisher.publishFrameworkEvent(getType(type), module.getBundle(), error, listeners);
+@@ -150,7 +150,7 @@
+ }
+
+ @Override
+- public void publishModuleEvent(ModuleEvent type, Module module, Module origin) {
++ public void publishModuleEvent(ModuleEvent type, org.eclipse.osgi.container.Module module, org.eclipse.osgi.container.Module origin) {
+ EquinoxEventPublisher publisher = container.getEventPublisher();
+ if (publisher != null) {
+ publisher.publishBundleEvent(getType(type), module.getBundle(), origin.getBundle());
+@@ -158,7 +158,7 @@
+ }
+
+ @Override
+- public Module createModule(String location, long id, EnumSet<Settings> settings, int startlevel) {
++ public org.eclipse.osgi.container.Module createModule(String location, long id, EnumSet<Settings> settings, int startlevel) {
+ EquinoxBundle bundle = new EquinoxBundle(id, location, storage.getModuleContainer(), settings, startlevel, container);
+ return bundle.getModule();
+ }
+@@ -205,8 +205,8 @@
+ long updatedTimestamp = storage.getModuleDatabase().getRevisionsTimestamp();
+ if (System.getSecurityManager() != null && updatedTimestamp != lastSecurityAdminFlush.getAndSet(updatedTimestamp)) {
+ storage.getSecurityAdmin().clearCaches();
+- List<Module> modules = storage.getModuleContainer().getModules();
+- for (Module module : modules) {
++ List<org.eclipse.osgi.container.Module> modules = storage.getModuleContainer().getModules();
++ for (org.eclipse.osgi.container.Module module : modules) {
+ for (ModuleRevision revision : module.getRevisions().getModuleRevisions()) {
+ Generation generation = (Generation) revision.getRevisionInfo();
+ if (generation != null) {
+@@ -222,9 +222,9 @@
+ }
+
+ private void clearManifestCache(ModuleWiring moduleWiring) {
+- boolean frameworkActive = Module.ACTIVE_SET.contains(storage.getModuleContainer().getModule(0).getState());
++ boolean frameworkActive = org.eclipse.osgi.container.Module.ACTIVE_SET.contains(storage.getModuleContainer().getModule(0).getState());
+ ModuleRevision revision = moduleWiring.getRevision();
+- Module module = revision.getRevisions().getModule();
++ org.eclipse.osgi.container.Module module = revision.getRevisions().getModule();
+ boolean isUninstallingOrUninstalled = State.UNINSTALLED.equals(module.getState()) ^ module.holdsTransitionEventLock(ModuleEvent.UNINSTALLED);
+ if (!frameworkActive || !isUninstallingOrUninstalled) {
+ // only do this when the framework is not active or when the bundle is not uninstalled
+@@ -333,4 +333,4 @@
+ ((ExecutorService) current).shutdown();
+ }
+ }
+-}
+\ No newline at end of file
++}
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java
+@@ -66,7 +66,7 @@
+ if (bundle == null) {
+ return getExportedPackages((String) null);
+ }
+- Module module = StartLevelImpl.getModule(bundle);
++ org.eclipse.osgi.container.Module module = StartLevelImpl.getModule(bundle);
+ Collection<ModuleRevision> revisions = module == null ? Collections.<ModuleRevision> emptyList() : module.getRevisions().getModuleRevisions();
+
+ Collection<ExportedPackage> allExports = new ArrayList<ExportedPackage>();
+@@ -246,7 +246,7 @@
+ }
+
+ private ModuleWiring getWiring(Bundle bundle) {
+- Module module = StartLevelImpl.getModule(bundle);
++ org.eclipse.osgi.container.Module module = StartLevelImpl.getModule(bundle);
+ if (module == null) {
+ return null;
+ }
+@@ -277,7 +277,7 @@
+ }
+
+ public int getBundleType(Bundle bundle) {
+- Module module = StartLevelImpl.getModule(bundle);
++ org.eclipse.osgi.container.Module module = StartLevelImpl.getModule(bundle);
+ if (module == null) {
+ return 0;
+ }
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
+@@ -158,7 +158,7 @@
+ List<String> buddyList = (List<String>) (moduleDatas.isEmpty() ? null : moduleDatas.get(0).getAttributes().get(EquinoxModuleDataNamespace.CAPABILITY_BUDDY_POLICY));
+ policy = buddyList != null ? new PolicyHandler(this, buddyList, container.getPackageAdmin()) : null;
+ if (policy != null) {
+- Module systemModule = container.getStorage().getModuleContainer().getModule(0);
++ org.eclipse.osgi.container.Module systemModule = container.getStorage().getModuleContainer().getModule(0);
+ Bundle systemBundle = systemModule.getBundle();
+ policy.open(systemBundle.getBundleContext());
+ }
+@@ -279,7 +279,7 @@
+
+ public void close() {
+ if (policy != null) {
+- Module systemModule = container.getStorage().getModuleContainer().getModule(0);
++ org.eclipse.osgi.container.Module systemModule = container.getStorage().getModuleContainer().getModule(0);
+ BundleContext context = systemModule.getBundle().getBundleContext();
+ if (context != null) {
+ policy.close(context);
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java
+@@ -29,7 +29,7 @@
+ super(container, bundleEntry);
+ }
+
+- protected BundleEntry findBundleEntry(URL url, Module module) throws IOException {
++ protected BundleEntry findBundleEntry(URL url, org.eclipse.osgi.container.Module module) throws IOException {
+ ModuleRevision current = module.getCurrentRevision();
+ ModuleWiring wiring = current == null ? null : current.getWiring();
+ ModuleClassLoader classloader = (ModuleClassLoader) (current == null ? null : wiring.getClassLoader());
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java
+@@ -72,7 +72,7 @@
+ this.configuration = configuraiton;
+ }
+
+- public void addExtensionContent(final Collection<ModuleRevision> revisions, final Module systemModule) throws BundleException {
++ public void addExtensionContent(final Collection<ModuleRevision> revisions, final org.eclipse.osgi.container.Module systemModule) throws BundleException {
+ if (System.getSecurityManager() == null) {
+ addExtensionContent0(revisions, systemModule);
+ } else {
+@@ -90,7 +90,7 @@
+ }
+ }
+
+- void addExtensionContent0(Collection<ModuleRevision> revisions, Module systemModule) throws BundleException {
++ void addExtensionContent0(Collection<ModuleRevision> revisions, org.eclipse.osgi.container.Module systemModule) throws BundleException {
+ if (CL == null || ADD_FWK_URL_METHOD == null) {
+ return;
+ }
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java
+@@ -116,7 +116,7 @@
+ // are allowed access to the resource.
+ String authorized = SECURITY_UNCHECKED;
+ long bundleId = getBundleID(host);
+- Module module = getModule(bundleId);
++ org.eclipse.osgi.container.Module module = getModule(bundleId);
+ if (checkAuthorization(module))
+ authorized = SECURITY_CHECKED;
+ // Always force the use of the hash from the adaptor
+@@ -128,7 +128,7 @@
+ setURL(url, url.getProtocol(), host, resIndex, authorized, null, path, null, url.getRef());
+ }
+
+- private Module getModule(long id) {
++ private org.eclipse.osgi.container.Module getModule(long id) {
+ return container.getModule(id);
+ }
+
+@@ -156,7 +156,7 @@
+ } catch (NumberFormatException nfe) {
+ throw (MalformedURLException) new MalformedURLException(NLS.bind(Msg.URL_INVALID_BUNDLE_ID, host)).initCause(nfe);
+ }
+- Module module = getModule(bundleID);
++ org.eclipse.osgi.container.Module module = getModule(bundleID);
+ if (module == null)
+ throw new IOException(NLS.bind(Msg.URL_NO_BUNDLE_FOUND, url.toExternalForm()));
+ // check to make sure that this URL was created using the
+@@ -178,7 +178,7 @@
+ * @param module the module to find the entry for.
+ * @return the bundle entry
+ */
+- abstract protected BundleEntry findBundleEntry(URL url, Module module) throws IOException;
++ abstract protected BundleEntry findBundleEntry(URL url, org.eclipse.osgi.container.Module module) throws IOException;
+
+ /**
+ * Converts a bundle URL to a String.
+@@ -274,7 +274,7 @@
+ // URLs depending on how they were constructed.
+ }
+
+- protected boolean checkAuthorization(Module module) {
++ protected boolean checkAuthorization(org.eclipse.osgi.container.Module module) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ return true;
+--- a/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java
++++ b/eclipse-bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java
+@@ -29,7 +29,7 @@
+ super(container, bundleEntry);
+ }
+
+- protected BundleEntry findBundleEntry(URL url, Module module) throws IOException {
++ protected BundleEntry findBundleEntry(URL url, org.eclipse.osgi.container.Module module) throws IOException {
+ ModuleRevision revision = module.getCurrentRevision();
+ BundleInfo.Generation revisionInfo = (BundleInfo.Generation) revision.getRevisionInfo();
+ BundleEntry entry = revisionInfo == null ? null : revisionInfo.getBundleFile().getEntry(url.getPath());
+--- a/eclipse-bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java
++++ b/eclipse-bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java
+@@ -83,8 +83,8 @@
+ database.readLock();
+ try {
+ ModuleContainer container = equinoxContainer.getStorage().getModuleContainer();
+- List<Module> modules = equinoxContainer.getStorage().getModuleContainer().getModules();
+- for (Module module : modules) {
++ List<org.eclipse.osgi.container.Module> modules = equinoxContainer.getStorage().getModuleContainer().getModules();
++ for (org.eclipse.osgi.container.Module module : modules) {
+ ModuleRevision current = module.getCurrentRevision();
+ BundleDescription description = converter.createDescription(current);
+ state.addBundle(description);
diff --git a/debian/patches/series b/debian/patches/series
index 63e9d15..0e6ad74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix-sonatype-bug.patch
fix-neon.patch
#test.patch
plexus-compatibility.patch
+java9-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tycho.git
More information about the pkg-java-commits
mailing list