About

From b5efb78a837b7ae02ba08412fd04e395493a1800 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Thu, 27 Jul 2017 09:45:20 +0200 Subject: Bug 520227 - Remove 2.0 plug-in support plug-in and feature from OSGI Change-Id: I48f170c79e0f297e31a33933735edcc49ec16180 Signed-off-by: Lars Vogel --- .../.classpath | 7 - .../.gitignore | 1 - .../.settings/org.eclipse.jdt.core.prefs | 105 --- .../.settings/org.eclipse.pde.core.prefs | 3 - .../META-INF/MANIFEST.MF | 8 - .../OSGI-INF/l10n/bundle.properties | 3 - .../about.html | 28 - .../build.properties | 8 - .../hookconfigurators.properties | 12 - .../org.eclipse.osgi.compatibility.plugins/pom.xml | 24 - .../eclipse/osgi/compatibility/plugins/IModel.java | 92 --- .../osgi/compatibility/plugins/IPluginInfo.java | 52 -- .../compatibility/plugins/PluginConverterHook.java | 108 --- .../compatibility/plugins/PluginConverterImpl.java | 819 --------------------- .../compatibility/plugins/PluginConverterMsg.java | 37 - .../plugins/PluginConverterMsg.properties | 25 - .../osgi/compatibility/plugins/PluginParser.java | 708 ------------------ 17 files changed, 2040 deletions(-) delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/.classpath delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/.gitignore delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/.settings/org.eclipse.jdt.core.prefs delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/.settings/org.eclipse.pde.core.prefs delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/META-INF/MANIFEST.MF delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/OSGI-INF/l10n/bundle.properties delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/about.html delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/build.properties delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/hookconfigurators.properties delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/pom.xml delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/IModel.java delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/IPluginInfo.java delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterImpl.java delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterMsg.java delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterMsg.properties delete mode 100644 bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginParser.java (limited to 'bundles/org.eclipse.osgi.compatibility.plugins') diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/.classpath b/bundles/org.eclipse.osgi.compatibility.plugins/.classpath deleted file mode 100644 index 098194ca4..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/.gitignore b/bundles/org.eclipse.osgi.compatibility.plugins/.gitignore deleted file mode 100644 index 5e56e040e..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi.compatibility.plugins/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 589f0aafa..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,105 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.osgi.compatibility.plugins/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index f29e940a0..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.compatibility.plugins/META-INF/MANIFEST.MF deleted file mode 100644 index a4d178648..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/META-INF/MANIFEST.MF +++ /dev/null @@ -1,8 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-SymbolicName: org.eclipse.osgi.compatibility.plugins -Bundle-Version: 1.1.0.qualifier -Fragment-Host: org.eclipse.osgi;bundle-version="3.12.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Bundle-Vendor: %Bundle-Vendor diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.osgi.compatibility.plugins/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 82b8f0726..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for org.eclipse.osgi.compatibility.plugins -Bundle-Vendor = Eclipse.org - Equinox -Bundle-Name = Equinox Compatibility Fragment for Eclipse 2.0 Plugins \ No newline at end of file diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/about.html b/bundles/org.eclipse.osgi.compatibility.plugins/about.html deleted file mode 100644 index 460233046..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/about.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - -About - - -

About This Content

- -

June 2, 2006

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

- - - \ No newline at end of file diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/build.properties b/bundles/org.eclipse.osgi.compatibility.plugins/build.properties deleted file mode 100644 index bf4ae9871..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - hookconfigurators.properties,\ - OSGI-INF/l10n/bundle.properties,\ - about.html -src.includes = about.html diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/hookconfigurators.properties b/bundles/org.eclipse.osgi.compatibility.plugins/hookconfigurators.properties deleted file mode 100644 index 5e02cbe82..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/hookconfigurators.properties +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################### -# Copyright (c) 2013 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -hook.configurators= \ - org.eclipse.osgi.compatibility.plugins.PluginConverterHook diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml b/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml deleted file mode 100644 index 2f870de90..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - rt.equinox.framework - org.eclipse.equinox.framework - 4.8.0-SNAPSHOT - ../../ - - org.eclipse.osgi - org.eclipse.osgi.compatibility.plugins - 1.1.0-SNAPSHOT - eclipse-plugin - diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/IModel.java b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/IModel.java deleted file mode 100644 index d53ed6882..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/IModel.java +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.osgi.compatibility.plugins; - -/** - * Internal class. - */ -public interface IModel { - public static final int INDENT = 2; - public static final int RADIX = 36; - - public static final String TRUE = "true"; //$NON-NLS-1$ - public static final String FALSE = "false"; //$NON-NLS-1$ - - public static final String REGISTRY = "plugin-registry"; //$NON-NLS-1$ - public static final String REGISTRY_PATH = "path"; //$NON-NLS-1$ - - public static final String FRAGMENT = "fragment"; //$NON-NLS-1$ - public static final String FRAGMENT_ID = "id"; //$NON-NLS-1$ - public static final String FRAGMENT_NAME = "name"; //$NON-NLS-1$ - public static final String FRAGMENT_PROVIDER = "provider-name"; //$NON-NLS-1$ - public static final String FRAGMENT_VERSION = "version"; //$NON-NLS-1$ - public static final String FRAGMENT_PLUGIN_ID = "plugin-id"; //$NON-NLS-1$ - public static final String FRAGMENT_PLUGIN_VERSION = "plugin-version"; //$NON-NLS-1$ - public static final String FRAGMENT_PLUGIN_MATCH = "match"; //$NON-NLS-1$ - public static final String FRAGMENT_PLUGIN_MATCH_PERFECT = "perfect"; //$NON-NLS-1$ - public static final String FRAGMENT_PLUGIN_MATCH_EQUIVALENT = "equivalent"; //$NON-NLS-1$ - public static final String FRAGMENT_PLUGIN_MATCH_COMPATIBLE = "compatible"; //$NON-NLS-1$ - public static final String FRAGMENT_PLUGIN_MATCH_GREATER_OR_EQUAL = "greaterOrEqual"; //$NON-NLS-1$ - - public static final String PLUGIN = "plugin"; //$NON-NLS-1$ - public static final String PLUGIN_ID = "id"; //$NON-NLS-1$ - public static final String PLUGIN_NAME = "name"; //$NON-NLS-1$ - public static final String PLUGIN_VENDOR = "vendor-name"; //$NON-NLS-1$ - public static final String PLUGIN_PROVIDER = "provider-name"; //$NON-NLS-1$ - public static final String PLUGIN_VERSION = "version"; //$NON-NLS-1$ - public static final String PLUGIN_CLASS = "class"; //$NON-NLS-1$ - - public static final String PLUGIN_REQUIRES = "requires"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_PLATFORM = "platform-version"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_PLUGIN = "plugin"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_PLUGIN_VERSION = "version"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_OPTIONAL = "optional"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_IMPORT = "import"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_EXPORT = "export"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_MATCH = "match"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_MATCH_EXACT = "exact"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_MATCH_PERFECT = "perfect"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_MATCH_EQUIVALENT = "equivalent"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_MATCH_COMPATIBLE = "compatible"; //$NON-NLS-1$ - public static final String PLUGIN_REQUIRES_MATCH_GREATER_OR_EQUAL = "greaterOrEqual"; //$NON-NLS-1$ - - public static final String PLUGIN_KEY_VERSION_SEPARATOR = "_"; //$NON-NLS-1$ - - public static final String RUNTIME = "runtime"; //$NON-NLS-1$ - - public static final String LIBRARY = "library"; //$NON-NLS-1$ - public static final String LIBRARY_NAME = "name"; //$NON-NLS-1$ - public static final String LIBRARY_SOURCE = "source"; //$NON-NLS-1$ - public static final String LIBRARY_TYPE = "type"; //$NON-NLS-1$ - public static final String LIBRARY_EXPORT = "export"; //$NON-NLS-1$ - public static final String LIBRARY_EXPORT_MASK = "name"; //$NON-NLS-1$ - public static final String LIBRARY_PACKAGES = "packages"; //$NON-NLS-1$ - public static final String LIBRARY_PACKAGES_PREFIXES = "prefixes"; //$NON-NLS-1$ - - public static final String EXTENSION_POINT = "extension-point"; //$NON-NLS-1$ - public static final String EXTENSION_POINT_NAME = "name"; //$NON-NLS-1$ - public static final String EXTENSION_POINT_ID = "id"; //$NON-NLS-1$ - public static final String EXTENSION_POINT_SCHEMA = "schema"; //$NON-NLS-1$ - - public static final String EXTENSION = "extension"; //$NON-NLS-1$ - public static final String EXTENSION_NAME = "name"; //$NON-NLS-1$ - public static final String EXTENSION_ID = "id"; //$NON-NLS-1$ - public static final String EXTENSION_TARGET = "point"; //$NON-NLS-1$ - - public static final String ELEMENT = "element"; //$NON-NLS-1$ - public static final String ELEMENT_NAME = "name"; //$NON-NLS-1$ - public static final String ELEMENT_VALUE = "value"; //$NON-NLS-1$ - - public static final String PROPERTY = "property"; //$NON-NLS-1$ - public static final String PROPERTY_NAME = "name"; //$NON-NLS-1$ - public static final String PROPERTY_VALUE = "value"; //$NON-NLS-1$ -} diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/IPluginInfo.java b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/IPluginInfo.java deleted file mode 100644 index 214c95d2d..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/IPluginInfo.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.osgi.compatibility.plugins; - -import java.util.*; - -/** - * Interface used as an entry to the IPluginConverter - * - *

Internal class.

- */ -public interface IPluginInfo { - public Map> getLibraries(); - - public String[] getLibrariesName(); - - public ArrayList getRequires(); - - public String getMasterId(); - - public String getMasterVersion(); - - public String getMasterMatch(); - - public String getPluginClass(); - - public String getUniqueId(); - - public String getVersion(); - - public boolean isFragment(); - - public Set getPackageFilters(); - - public String getPluginName(); - - public String getProviderName(); - - public boolean isSingleton(); - - public boolean hasExtensionExtensionPoints(); - - String validateForm(); -} diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java deleted file mode 100644 index 3ff76b4b8..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java +++ /dev/null @@ -1,108 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.osgi.compatibility.plugins; - -import java.io.File; -import java.io.IOException; -import java.util.Map; - -import org.eclipse.osgi.framework.util.CaseInsensitiveDictionaryMap; -import org.eclipse.osgi.internal.hookregistry.ActivatorHookFactory; -import org.eclipse.osgi.internal.hookregistry.BundleFileWrapperFactoryHook; -import org.eclipse.osgi.internal.hookregistry.HookConfigurator; -import org.eclipse.osgi.internal.hookregistry.HookRegistry; -import org.eclipse.osgi.service.pluginconversion.PluginConversionException; -import org.eclipse.osgi.service.pluginconversion.PluginConverter; -import org.eclipse.osgi.storage.BundleInfo.Generation; -import org.eclipse.osgi.storage.bundlefile.BundleEntry; -import org.eclipse.osgi.storage.bundlefile.BundleFile; -import org.eclipse.osgi.storage.bundlefile.BundleFileWrapper; -import org.eclipse.osgi.storage.bundlefile.FileBundleEntry; -import org.eclipse.osgi.util.ManifestElement; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceRegistration; - -public class PluginConverterHook implements HookConfigurator { - @Override - public void addHooks(final HookRegistry hookRegistry) { - PluginConverterImpl tempConverter; - try { - tempConverter = new PluginConverterImpl(hookRegistry); - } catch (IOException e) { - throw new RuntimeException(e); - } - final PluginConverterImpl converter = tempConverter; - hookRegistry.addBundleFileWrapperFactoryHook(new BundleFileWrapperFactoryHook() { - - @Override - public BundleFileWrapper wrapBundleFile(BundleFile bundleFile, Generation generation, boolean base) { - if (!base) { - return null; - } - return new BundleFileWrapper(bundleFile) { - - @Override - public BundleEntry getEntry(String path) { - BundleEntry entry = getBundleFile().getEntry(path); - if (!PluginConverterImpl.OSGI_BUNDLE_MANIFEST.equals(path)) { - return entry; - } - Map headers = null; - if (entry != null) { - try { - headers = ManifestElement.parseBundleManifest(entry.getInputStream(), new CaseInsensitiveDictionaryMap()); - } catch (Exception e) { - throw new RuntimeException(e); - } - if (headers.containsKey(Constants.BUNDLE_MANIFESTVERSION)) { - return entry; - } - if (headers.containsKey(Constants.BUNDLE_SYMBOLICNAME)) { - return entry; - } - } - try { - File manifest = converter.convertManifest(getBaseFile(), null, true, null, true, null, false); - if (manifest == null) { - return entry; - } - return new FileBundleEntry(manifest, PluginConverterImpl.OSGI_BUNDLE_MANIFEST); - } catch (PluginConversionException e) { - throw new RuntimeException(e); - } - } - }; - } - }); - - hookRegistry.addActivatorHookFactory(new ActivatorHookFactory() { - - @Override - public BundleActivator createActivator() { - return new BundleActivator() { - ServiceRegistration reg; - - @Override - public void start(BundleContext context) throws Exception { - reg = context.registerService(PluginConverter.class, converter, null); - } - - @Override - public void stop(BundleContext context) throws Exception { - reg.unregister(); - } - }; - } - }); - } -} diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterImpl.java b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterImpl.java deleted file mode 100644 index 7bba1320d..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterImpl.java +++ /dev/null @@ -1,819 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.osgi.compatibility.plugins; - -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -import org.eclipse.osgi.framework.log.FrameworkLogEntry; -import org.eclipse.osgi.internal.framework.EquinoxConfiguration; -import org.eclipse.osgi.internal.framework.EquinoxContainer; -import org.eclipse.osgi.internal.hookregistry.HookRegistry; -import org.eclipse.osgi.service.datalocation.Location; -import org.eclipse.osgi.service.pluginconversion.PluginConversionException; -import org.eclipse.osgi.service.pluginconversion.PluginConverter; -import org.eclipse.osgi.service.resolver.VersionRange; -import org.eclipse.osgi.util.ManifestElement; -import org.eclipse.osgi.util.NLS; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; -import org.osgi.framework.Version; - -/** - * Internal class. - */ -public class PluginConverterImpl implements PluginConverter { - public static boolean DEBUG = false; - /** bundle manifest type unknown */ - static public final byte MANIFEST_TYPE_UNKNOWN = 0x00; - /** bundle manifest type bundle (META-INF/MANIFEST.MF) */ - static public final byte MANIFEST_TYPE_BUNDLE = 0x01; - /** bundle manifest type plugin (plugin.xml) */ - static public final byte MANIFEST_TYPE_PLUGIN = 0x02; - /** bundle manifest type fragment (fragment.xml) */ - static public final byte MANIFEST_TYPE_FRAGMENT = 0x04; - /** bundle manifest type jared bundle */ - static public final byte MANIFEST_TYPE_JAR = 0x08; - private static final String SEMICOLON = "; "; //$NON-NLS-1$ - private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$ - private static final String LIST_SEPARATOR = ",\n "; //$NON-NLS-1$ - private static final String LINE_SEPARATOR = "\n "; //$NON-NLS-1$ - private static final String DOT = "."; //$NON-NLS-1$ - private static int MAXLINE = 511; - private final EquinoxConfiguration configuration; - private final File cacheLocation; - private BufferedWriter out; - private IPluginInfo pluginInfo; - private File pluginManifestLocation; - private ZipFile pluginZip; - private Dictionary generatedManifest; - private byte manifestType; - private Version target; - private Dictionary devProperties; - static final Version TARGET31 = new Version(3, 1, 0); - static final Version TARGET32 = new Version(3, 2, 0); - private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$ - private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$ - @SuppressWarnings("deprecation") - private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64}; - static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$ - static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$ - static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$ - private static final String[] OS_LIST = {org.eclipse.osgi.service.environment.Constants.OS_AIX, org.eclipse.osgi.service.environment.Constants.OS_HPUX, org.eclipse.osgi.service.environment.Constants.OS_LINUX, org.eclipse.osgi.service.environment.Constants.OS_MACOSX, org.eclipse.osgi.service.environment.Constants.OS_QNX, org.eclipse.osgi.service.environment.Constants.OS_SOLARIS, org.eclipse.osgi.service.environment.Constants.OS_WIN32}; - protected static final String PI_RUNTIME = "org.eclipse.core.runtime"; //$NON-NLS-1$ - protected static final String PI_BOOT = "org.eclipse.core.boot"; //$NON-NLS-1$ - protected static final String PI_RUNTIME_COMPATIBILITY = "org.eclipse.core.runtime.compatibility"; //$NON-NLS-1$ - static public final String PLUGIN_MANIFEST = "plugin.xml"; //$NON-NLS-1$ - private static final String COMPATIBILITY_ACTIVATOR = "org.eclipse.core.internal.compatibility.PluginActivator"; //$NON-NLS-1$ - private static final String[] WS_LIST = {org.eclipse.osgi.service.environment.Constants.WS_CARBON, org.eclipse.osgi.service.environment.Constants.WS_GTK, org.eclipse.osgi.service.environment.Constants.WS_MOTIF, org.eclipse.osgi.service.environment.Constants.WS_PHOTON, org.eclipse.osgi.service.environment.Constants.WS_WIN32}; - private static final String IGNORE_DOT = "@ignoredot@"; //$NON-NLS-1$ - - public static final String PLUGIN_CLASS = "Plugin-Class"; //$NON-NLS-1$ - public static final String PROVIDE_PACKAGE = "Provide-Package"; //$NON-NLS-1$ - public final static String REPROVIDE_ATTRIBUTE = "reprovide"; //$NON-NLS-1$ - public final static String OPTIONAL_ATTRIBUTE = "optional"; //$NON-NLS-1$ - public static final String ECLIPSE_LAZYSTART = "Eclipse-LazyStart"; //$NON-NLS-1$ - public static final String ECLIPSE_LAZYSTART_EXCEPTIONS = "exceptions"; //$NON-NLS-1$ - - /** - * Manifest header used to specify the auto start properties of a bundle - * @deprecated use {@link #ECLIPSE_LAZYSTART} - */ - public static final String ECLIPSE_AUTOSTART = "Eclipse-AutoStart"; //$NON-NLS-1$ - public static final String OSGI_BUNDLE_MANIFEST = "META-INF/MANIFEST.MF"; //$NON-NLS-1$ - - public PluginConverterImpl(HookRegistry hookRegistry) throws IOException { - this.configuration = hookRegistry.getConfiguration(); - Location configLocation = hookRegistry.getContainer().getLocations().getConfigurationLocation(); - URL cacheURL = configLocation.getDataArea("org.eclipse.osgi.compatibility.plugin"); //$NON-NLS-1$ - this.cacheLocation = new File(cacheURL.getPath()); - } - - private void init() { - // need to make sure these fields are cleared out for each conversion. - out = null; - pluginInfo = null; - pluginManifestLocation = null; - pluginZip = null; - generatedManifest = new Hashtable<>(10); - manifestType = MANIFEST_TYPE_UNKNOWN; - target = null; - devProperties = null; - } - - private boolean fillPluginInfo(File pluginBaseLocation) throws PluginConversionException { - pluginManifestLocation = pluginBaseLocation; - if (pluginManifestLocation == null) - throw new IllegalArgumentException(); - InputStream pluginFile = null; - try { - try { - pluginFile = findPluginManifest(pluginBaseLocation); - } catch (IOException e) { - throw new PluginConversionException(NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_FILENOTFOUND, pluginBaseLocation.getAbsolutePath()), e); - } - if (pluginFile == null) - return false; - pluginInfo = parsePluginInfo(pluginFile); - } finally { - if (pluginZip != null) - try { - pluginZip.close(); - pluginZip = null; - } catch (IOException e) { - // ignore - } - } - String validation = pluginInfo.validateForm(); - if (validation != null) - throw new PluginConversionException(validation); - return true; - } - - private Set filterExport(Set exportToFilter, Collection filter) { - if (filter == null || filter.contains("*")) //$NON-NLS-1$ - return exportToFilter; - Set filteredExport = new HashSet<>(exportToFilter.size()); - for (String anExport : exportToFilter) { - for (String aFilter : filter) { - int dotStar = aFilter.indexOf(".*"); //$NON-NLS-1$ - if (dotStar != -1) - aFilter = aFilter.substring(0, dotStar); - if (anExport.equals(aFilter)) { - filteredExport.add(anExport); - break; - } - } - } - return filteredExport; - } - - private List findOSJars(File pluginRoot, String path, boolean filter) { - path = path.substring(4); - List found = new ArrayList<>(0); - for (int i = 0; i < OS_LIST.length; i++) { - //look for os/osname/path - String searchedPath = "os/" + OS_LIST[i] + "/" + path; //$NON-NLS-1$ //$NON-NLS-2$ - if (new File(pluginRoot, searchedPath).exists()) - found.add(searchedPath + (filter ? ";(os=" + WS_LIST[i] + ")" : "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - //look for os/osname/archname/path - for (int j = 0; j < ARCH_LIST.length; j++) { - searchedPath = "os/" + OS_LIST[i] + "/" + ARCH_LIST[j] + "/" + path; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - if (new File(pluginRoot, searchedPath).exists()) { - found.add(searchedPath + (filter ? ";(& (os=" + WS_LIST[i] + ") (arch=" + ARCH_LIST[j] + ")" : "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - } - } - } - return found; - } - - private InputStream findPluginManifest(File baseLocation) throws IOException { - //Here, we can not use the bundlefile because it may explode the jar and returns a location from which we will not be able to derive the jars location - if (pluginZip != null) - try { - pluginZip.close(); - } catch (IOException e) { - // ignore - } - pluginZip = null; - if (!baseLocation.isDirectory()) { - manifestType |= MANIFEST_TYPE_JAR; - pluginZip = new ZipFile(baseLocation); - } - - if (pluginZip != null) { - ZipEntry manifestEntry = pluginZip.getEntry(PLUGIN_MANIFEST); - if (manifestEntry != null) { - manifestType |= MANIFEST_TYPE_PLUGIN; - return pluginZip.getInputStream(manifestEntry); - } - } else { - File manifestFile = new File(baseLocation, PLUGIN_MANIFEST); - if (manifestFile.exists()) { - manifestType |= MANIFEST_TYPE_PLUGIN; - return new FileInputStream(manifestFile); - } - } - - if (pluginZip != null) { - ZipEntry manifestEntry = pluginZip.getEntry(FRAGMENT_MANIFEST); - if (manifestEntry != null) { - manifestType |= MANIFEST_TYPE_PLUGIN; - return pluginZip.getInputStream(manifestEntry); - } - } else { - File manifestFile = new File(baseLocation, FRAGMENT_MANIFEST); - if (manifestFile.exists()) { - manifestType |= MANIFEST_TYPE_FRAGMENT; - return new FileInputStream(manifestFile); - } - } - - return null; - } - - private List findWSJars(File pluginRoot, String path, boolean filter) { - path = path.substring(4); - List found = new ArrayList<>(0); - for (int i = 0; i < WS_LIST.length; i++) { - String searchedPath = "ws/" + WS_LIST[i] + path; //$NON-NLS-1$ - if (new File(pluginRoot, searchedPath).exists()) { - found.add(searchedPath + (filter ? ";(ws=" + WS_LIST[i] + ")" : "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - } - return found; - } - - protected void fillManifest(boolean compatibilityManifest, boolean analyseJars) { - generateManifestVersion(); - generateHeaders(); - generateClasspath(); - generateActivator(); - generatePluginClass(); - if (analyseJars) - generateProvidePackage(); - generateRequireBundle(); - generateLocalizationEntry(); - generateEclipseHeaders(); - if (compatibilityManifest) { - generateTimestamp(); - } - } - - private Map convertDictionaryToMap(Dictionary dictionary) { - if (dictionary == null) - return Collections.emptyMap(); - Map result = new HashMap<>(dictionary.size()); - Enumeration keys = dictionary.keys(); - while (keys.hasMoreElements()) { - K key = keys.nextElement(); - result.put(key, dictionary.get(key)); - } - return result; - } - - public void writeManifest(File generationLocation, Dictionary manifestToWrite, boolean compatibilityManifest) throws PluginConversionException { - long start = System.currentTimeMillis(); - try { - File parentFile = new File(generationLocation.getParent()); - parentFile.mkdirs(); - generationLocation.createNewFile(); - if (!generationLocation.isFile()) { - String message = NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_ERROR_CREATING_BUNDLE_MANIFEST, this.pluginInfo.getUniqueId(), generationLocation); - throw new PluginConversionException(message); - } - // replaces any eventual existing file - manifestToWrite = new Hashtable<>(convertDictionaryToMap(manifestToWrite)); - // MANIFEST.MF files must be written using UTF-8 - out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(generationLocation), UTF_8)); - writeEntry(MANIFEST_VERSION, manifestToWrite.remove(MANIFEST_VERSION)); - writeEntry(GENERATED_FROM, manifestToWrite.remove(GENERATED_FROM)); //Need to do this first uptoDate check expect the generated-from tag to be in the first line - // always attempt to write the Bundle-ManifestVersion header if it exists (bug 109863) - writeEntry(Constants.BUNDLE_MANIFESTVERSION, manifestToWrite.remove(Constants.BUNDLE_MANIFESTVERSION)); - writeEntry(Constants.BUNDLE_NAME, manifestToWrite.remove(Constants.BUNDLE_NAME)); - writeEntry(Constants.BUNDLE_SYMBOLICNAME, manifestToWrite.remove(Constants.BUNDLE_SYMBOLICNAME)); - writeEntry(Constants.BUNDLE_VERSION, manifestToWrite.remove(Constants.BUNDLE_VERSION)); - writeEntry(Constants.BUNDLE_CLASSPATH, manifestToWrite.remove(Constants.BUNDLE_CLASSPATH)); - writeEntry(Constants.BUNDLE_ACTIVATOR, manifestToWrite.remove(Constants.BUNDLE_ACTIVATOR)); - writeEntry(Constants.BUNDLE_VENDOR, manifestToWrite.remove(Constants.BUNDLE_VENDOR)); - writeEntry(Constants.FRAGMENT_HOST, manifestToWrite.remove(Constants.FRAGMENT_HOST)); - writeEntry(Constants.BUNDLE_LOCALIZATION, manifestToWrite.remove(Constants.BUNDLE_LOCALIZATION)); - // always attempt to write the Export-Package header if it exists (bug 109863) - writeEntry(Constants.EXPORT_PACKAGE, manifestToWrite.remove(Constants.EXPORT_PACKAGE)); - // always attempt to write the Provide-Package header if it exists (bug 109863) - writeEntry(PluginConverterImpl.PROVIDE_PACKAGE, manifestToWrite.remove(PluginConverterImpl.PROVIDE_PACKAGE)); - writeEntry(Constants.REQUIRE_BUNDLE, manifestToWrite.remove(Constants.REQUIRE_BUNDLE)); - Enumeration keys = manifestToWrite.keys(); - while (keys.hasMoreElements()) { - String key = keys.nextElement(); - writeEntry(key, manifestToWrite.get(key)); - } - out.flush(); - } catch (IOException e) { - String message = NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_ERROR_CREATING_BUNDLE_MANIFEST, this.pluginInfo.getUniqueId(), generationLocation); - throw new PluginConversionException(message, e); - } finally { - if (out != null) - try { - out.close(); - } catch (IOException e) { - // only report problems writing to/flushing the file - } - } - if (DEBUG) - System.out.println("Time to write out converted manifest to: " + generationLocation + ": " + (System.currentTimeMillis() - start) + "ms."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - private void generateLocalizationEntry() { - generatedManifest.put(Constants.BUNDLE_LOCALIZATION, PLUGIN_PROPERTIES_FILENAME); - } - - private void generateManifestVersion() { - generatedManifest.put(MANIFEST_VERSION, "1.0"); //$NON-NLS-1$ - } - - private boolean requireRuntimeCompatibility() { - ArrayList requireList = pluginInfo.getRequires(); - for (Iterator iter = requireList.iterator(); iter.hasNext();) { - if (iter.next().getName().equalsIgnoreCase(PI_RUNTIME_COMPATIBILITY)) - return true; - } - return false; - } - - private void generateActivator() { - if (!pluginInfo.isFragment()) - if (!requireRuntimeCompatibility()) { - String pluginClass = pluginInfo.getPluginClass(); - if (pluginClass != null && !pluginClass.trim().equals("")) //$NON-NLS-1$ - generatedManifest.put(Constants.BUNDLE_ACTIVATOR, pluginClass); - } else { - generatedManifest.put(Constants.BUNDLE_ACTIVATOR, COMPATIBILITY_ACTIVATOR); - } - } - - private void generateClasspath() { - String[] classpath = pluginInfo.getLibrariesName(); - if (classpath.length != 0) - generatedManifest.put(Constants.BUNDLE_CLASSPATH, getStringFromArray(classpath, LIST_SEPARATOR)); - } - - private void generateHeaders() { - if (TARGET31.compareTo(target) <= 0) - generatedManifest.put(Constants.BUNDLE_MANIFESTVERSION, "2"); //$NON-NLS-1$ - generatedManifest.put(Constants.BUNDLE_NAME, pluginInfo.getPluginName()); - generatedManifest.put(Constants.BUNDLE_VERSION, pluginInfo.getVersion()); - generatedManifest.put(Constants.BUNDLE_SYMBOLICNAME, getSymbolicNameEntry()); - String provider = pluginInfo.getProviderName(); - if (provider != null) - generatedManifest.put(Constants.BUNDLE_VENDOR, provider); - if (pluginInfo.isFragment()) { - StringBuffer hostBundle = new StringBuffer(); - hostBundle.append(pluginInfo.getMasterId()); - String versionRange = getVersionRange(pluginInfo.getMasterVersion(), pluginInfo.getMasterMatch()); // TODO need to get match rule here! - if (versionRange != null) - hostBundle.append(versionRange); - generatedManifest.put(Constants.FRAGMENT_HOST, hostBundle.toString()); - } - } - - /* - * Generates an entry in the form: - * [; singleton=true] - */ - private String getSymbolicNameEntry() { - // false is the default, so don't bother adding anything - if (!pluginInfo.isSingleton()) - return pluginInfo.getUniqueId(); - StringBuffer result = new StringBuffer(pluginInfo.getUniqueId()); - result.append(SEMICOLON); - result.append(Constants.SINGLETON_DIRECTIVE); - String assignment = TARGET31.compareTo(target) <= 0 ? ":=" : "="; //$NON-NLS-1$ //$NON-NLS-2$ - result.append(assignment).append("true"); //$NON-NLS-1$ - return result.toString(); - } - - private void generatePluginClass() { - if (requireRuntimeCompatibility()) { - String pluginClass = pluginInfo.getPluginClass(); - if (pluginClass != null) - generatedManifest.put(PluginConverterImpl.PLUGIN_CLASS, pluginClass); - } - } - - private void generateProvidePackage() { - Set exports = getExports(); - if (exports != null && exports.size() != 0) { - generatedManifest.put(TARGET31.compareTo(target) <= 0 ? Constants.EXPORT_PACKAGE : PluginConverterImpl.PROVIDE_PACKAGE, getStringFromCollection(exports, LIST_SEPARATOR)); - } - } - - private void generateRequireBundle() { - ArrayList requiredBundles = pluginInfo.getRequires(); - if (requiredBundles.size() == 0) - return; - StringBuffer bundleRequire = new StringBuffer(); - for (Iterator iter = requiredBundles.iterator(); iter.hasNext();) { - PluginParser.Prerequisite element = iter.next(); - StringBuffer modImport = new StringBuffer(element.getName()); - String versionRange = getVersionRange(element.getVersion(), element.getMatch()); - if (versionRange != null) - modImport.append(versionRange); - if (element.isExported()) { - if (TARGET31.compareTo(target) <= 0) - modImport.append(';').append(Constants.VISIBILITY_DIRECTIVE).append(":=").append(Constants.VISIBILITY_REEXPORT);//$NON-NLS-1$ - else - modImport.append(';').append(PluginConverterImpl.REPROVIDE_ATTRIBUTE).append("=true");//$NON-NLS-1$ - } - if (element.isOptional()) { - if (TARGET31.compareTo(target) <= 0) - modImport.append(';').append(Constants.RESOLUTION_DIRECTIVE).append(":=").append(Constants.RESOLUTION_OPTIONAL);//$NON-NLS-1$ - else - modImport.append(';').append(PluginConverterImpl.OPTIONAL_ATTRIBUTE).append("=true");//$NON-NLS-1$ - } - bundleRequire.append(modImport.toString()); - if (iter.hasNext()) - bundleRequire.append(LIST_SEPARATOR); - } - generatedManifest.put(Constants.REQUIRE_BUNDLE, bundleRequire.toString()); - } - - private void generateTimestamp() { - // so it is easy to tell which ones are generated - generatedManifest.put(GENERATED_FROM, Long.toString(getTimeStamp(pluginManifestLocation, manifestType)) + ";" + MANIFEST_TYPE_ATTRIBUTE + "=" + manifestType); //$NON-NLS-1$ //$NON-NLS-2$ - } - - private void generateEclipseHeaders() { - if (pluginInfo.isFragment()) - return; - - String pluginClass = pluginInfo.getPluginClass(); - if (pluginInfo.hasExtensionExtensionPoints() || (pluginClass != null && !pluginClass.trim().equals(""))) //$NON-NLS-1$ - generatedManifest.put(TARGET32.compareTo(target) <= 0 ? PluginConverterImpl.ECLIPSE_LAZYSTART : PluginConverterImpl.ECLIPSE_AUTOSTART, "true"); //$NON-NLS-1$ - } - - private Set getExports() { - Map> libs = pluginInfo.getLibraries(); - if (libs == null) - return null; - - //If we are in dev mode, then add the binary folders on the list libs with the export clause set to be the cumulation of the export clause of the real libs - if (devProperties != null || configuration.inDevelopmentMode()) { - String[] devClassPath = configuration.getDevClassPath(pluginInfo.getUniqueId(), devProperties); - // collect export clauses - List allExportClauses = new ArrayList<>(libs.size()); - Set>> libEntries = libs.entrySet(); - for (Iterator>> iter = libEntries.iterator(); iter.hasNext();) { - Map.Entry> element = iter.next(); - allExportClauses.addAll(element.getValue()); - } - if (devClassPath != null) { - // bug 88498 - // if there is a devClassPath defined for this plugin and the @ignoredot@ flag is true - // then we will ignore the '.' library specified in the plugin.xml - String[] ignoreDotProp = configuration.getDevClassPath(IGNORE_DOT, devProperties); - if (devClassPath.length > 0 && ignoreDotProp != null && ignoreDotProp.length > 0 && "true".equals(ignoreDotProp[0])) //$NON-NLS-1$ - libs.remove(DOT); - for (int i = 0; i < devClassPath.length; i++) - libs.put(devClassPath[i], allExportClauses); - } - } - - Set result = new TreeSet<>(); - Set>> libEntries = libs.entrySet(); - for (Iterator>> iter = libEntries.iterator(); iter.hasNext();) { - Map.Entry> element = iter.next(); - List filter = element.getValue(); - if (filter.size() == 0) //If the library is not exported, then ignore it - continue; - String libEntryText = element.getKey().trim(); - File libraryLocation; - if (libEntryText.equals(DOT)) - libraryLocation = pluginManifestLocation; - else { - // in development time, libEntries may contain absolute locations (linked folders) - File libEntryAsPath = new File(libEntryText); - libraryLocation = libEntryAsPath.isAbsolute() ? libEntryAsPath : new File(pluginManifestLocation, libEntryText); - } - Set exports = null; - if (libraryLocation.exists()) { - if (libraryLocation.isFile()) - exports = filterExport(getExportsFromJAR(libraryLocation), filter); //TODO Need to handle $xx$ variables - else if (libraryLocation.isDirectory()) - exports = filterExport(getExportsFromDir(libraryLocation), filter); - } else { - List expandedLibs = getLibrariesExpandingVariables(element.getKey(), false); - exports = new HashSet<>(); - for (Iterator iterator = expandedLibs.iterator(); iterator.hasNext();) { - String libName = iterator.next(); - File libFile = new File(pluginManifestLocation, libName); - if (libFile.isFile()) { - exports.addAll(filterExport(getExportsFromJAR(libFile), filter)); - } - } - } - if (exports != null) - result.addAll(exports); - } - return result; - } - - private Set getExportsFromDir(File location) { - return getExportsFromDir(location, ""); //$NON-NLS-1$ - } - - private Set getExportsFromDir(File location, String packageName) { - String prefix = (packageName.length() > 0) ? (packageName + '.') : ""; //$NON-NLS-1$ - String[] files = location.list(); - Set exportedPaths = new HashSet<>(); - boolean containsFile = false; - if (files != null) - for (int i = 0; i < files.length; i++) { - if (!isValidPackageName(files[i])) - continue; - File pkgFile = new File(location, files[i]); - if (pkgFile.isDirectory()) - exportedPaths.addAll(getExportsFromDir(pkgFile, prefix + files[i])); - else - containsFile = true; - } - if (containsFile) - // Allow the default package to be provided. If the default package - // contains a File then use "." as the package name to provide for default. - if (packageName.length() > 0) - exportedPaths.add(packageName); - else - exportedPaths.add(DOT); - return exportedPaths; - } - - private Set getExportsFromJAR(File jarFile) { - Set names = new HashSet<>(); - ZipFile file = null; - try { - file = new ZipFile(jarFile); - } catch (IOException e) { - String message = NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_PLUGIN_LIBRARY_IGNORED, jarFile, pluginInfo.getUniqueId()); - configuration.getHookRegistry().getContainer().getLogServices().log(EquinoxContainer.NAME, FrameworkLogEntry.ERROR, message, null); - return names; - } - //Run through the entries - for (Enumeration entriesEnum = file.entries(); entriesEnum.hasMoreElements();) { - ZipEntry entry = entriesEnum.nextElement(); - String name = entry.getName(); - if (!isValidPackageName(name)) - continue; - int lastSlash = name.lastIndexOf("/"); //$NON-NLS-1$ - //Ignore folders that do not contain files - if (lastSlash != -1) { - if (lastSlash != name.length() - 1 && name.lastIndexOf(' ') == -1) - names.add(name.substring(0, lastSlash).replace('/', '.')); - } else { - // Allow the default package to be provided. If the default package - // contains a File then use "." as the package name to provide for default. - names.add(DOT); - } - } - try { - file.close(); - } catch (IOException e) { - // Nothing to do - } - return names; - } - - private List getLibrariesExpandingVariables(String libraryPath, boolean filter) { - String var = hasPrefix(libraryPath); - if (var == null) { - List returnValue = new ArrayList<>(1); - returnValue.add(libraryPath); - return returnValue; - } - if (var.equals("ws")) { //$NON-NLS-1$ - return findWSJars(pluginManifestLocation, libraryPath, filter); - } - if (var.equals("os")) { //$NON-NLS-1$ - return findOSJars(pluginManifestLocation, libraryPath, filter); - } - return new ArrayList<>(0); - } - - //return a String representing the string found between the $s - private String hasPrefix(String libPath) { - if (libPath.startsWith("$ws$")) //$NON-NLS-1$ - return "ws"; //$NON-NLS-1$ - if (libPath.startsWith("$os$")) //$NON-NLS-1$ - return "os"; //$NON-NLS-1$ - if (libPath.startsWith("$nl$")) //$NON-NLS-1$ - return "nl"; //$NON-NLS-1$ - return null; - } - - private boolean isValidPackageName(String name) { - if (name.indexOf(' ') > 0 || name.equalsIgnoreCase("META-INF") || name.startsWith("META-INF/")) //$NON-NLS-1$ //$NON-NLS-2$ - return false; - return true; - } - - /** - * Parses the plugin manifest to find out: - the plug-in unique identifier - - * the plug-in version - runtime/libraries entries - the plug-in class - - * the master plugin (for a fragment) - */ - private IPluginInfo parsePluginInfo(InputStream pluginLocation) throws PluginConversionException { - InputStream input = null; - try { - input = new BufferedInputStream(pluginLocation); - return new PluginParser(configuration, target).parsePlugin(input); - } catch (Exception e) { - String message = NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_ERROR_PARSING_PLUGIN_MANIFEST, pluginManifestLocation); - throw new PluginConversionException(message, e); - } finally { - if (input != null) - try { - input.close(); - } catch (IOException e) { - //ignore exception - } - } - } - - public static boolean upToDate(File generationLocation, File pluginLocation, byte manifestType) { - if (!generationLocation.isFile()) - return false; - String secondLine = null; - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader(new FileInputStream(generationLocation))); - reader.readLine(); - secondLine = reader.readLine(); - } catch (IOException e) { - // not a big deal - we could not read an existing manifest - return false; - } finally { - if (reader != null) - try { - reader.close(); - } catch (IOException e) { - // ignore - } - } - String tag = GENERATED_FROM + ": "; //$NON-NLS-1$ - if (secondLine == null || !secondLine.startsWith(tag)) - return false; - - secondLine = secondLine.substring(tag.length()); - ManifestElement generatedFrom; - try { - generatedFrom = ManifestElement.parseHeader(PluginConverterImpl.GENERATED_FROM, secondLine)[0]; - } catch (BundleException be) { - return false; - } - String timestampStr = generatedFrom.getValue(); - try { - return Long.parseLong(timestampStr.trim()) == getTimeStamp(pluginLocation, manifestType); - } catch (NumberFormatException nfe) { - // not a big deal - just a bogus existing manifest that will be ignored - } - return false; - } - - public static long getTimeStamp(File pluginLocation, byte manifestType) { - if ((manifestType & MANIFEST_TYPE_JAR) != 0) - return pluginLocation.lastModified(); - else if ((manifestType & MANIFEST_TYPE_PLUGIN) != 0) - return new File(pluginLocation, PLUGIN_MANIFEST).lastModified(); - else if ((manifestType & MANIFEST_TYPE_FRAGMENT) != 0) - return new File(pluginLocation, FRAGMENT_MANIFEST).lastModified(); - else if ((manifestType & MANIFEST_TYPE_BUNDLE) != 0) - return new File(pluginLocation, PluginConverterImpl.OSGI_BUNDLE_MANIFEST).lastModified(); - return -1; - } - - private void writeEntry(String key, String value) throws IOException { - if (value != null && value.length() > 0) { - out.write(splitOnComma(key + ": " + value)); //$NON-NLS-1$ - out.write('\n'); - } - } - - private String splitOnComma(String value) { - if (value.length() < MAXLINE || value.indexOf(LINE_SEPARATOR) >= 0) - return value; // assume the line is already split - String[] values = ManifestElement.getArrayFromList(value); - if (values == null || values.length == 0) - return value; - StringBuffer sb = new StringBuffer(value.length() + ((values.length - 1) * LIST_SEPARATOR.length())); - for (int i = 0; i < values.length - 1; i++) - sb.append(values[i]).append(LIST_SEPARATOR); - sb.append(values[values.length - 1]); - return sb.toString(); - } - - private String getStringFromArray(String[] values, String separator) { - if (values == null) - return ""; //$NON-NLS-1$ - StringBuffer result = new StringBuffer(); - for (int i = 0; i < values.length; i++) { - if (i > 0) - result.append(separator); - result.append(values[i]); - } - return result.toString(); - } - - private String getStringFromCollection(Collection collection, String separator) { - StringBuffer result = new StringBuffer(); - boolean first = true; - for (Iterator i = collection.iterator(); i.hasNext();) { - if (first) - first = false; - else - result.append(separator); - result.append(i.next()); - } - return result.toString(); - } - - private synchronized Dictionary convertManifest(File pluginBaseLocation, boolean compatibility, String targetVersion, boolean analyseJars, Dictionary devProps, boolean failOnNoManifest) throws PluginConversionException { - long start = System.currentTimeMillis(); - if (DEBUG) - System.out.println("Convert " + pluginBaseLocation); //$NON-NLS-1$ - init(); - this.target = targetVersion == null ? TARGET32 : new Version(targetVersion); - this.devProperties = devProps; - if (!fillPluginInfo(pluginBaseLocation)) { - if (failOnNoManifest) { - throw new PluginConversionException(NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_FILENOTFOUND, pluginBaseLocation.getAbsolutePath())); - } - return null; - } - fillManifest(compatibility, analyseJars); - if (DEBUG) - System.out.println("Time to convert manifest for: " + pluginBaseLocation + ": " + (System.currentTimeMillis() - start) + "ms."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - return generatedManifest; - } - - public Dictionary convertManifest(File pluginBaseLocation, boolean compatibility, String targetVersion, boolean analyseJars, Dictionary devProps) throws PluginConversionException { - return convertManifest(pluginBaseLocation, compatibility, targetVersion, analyseJars, devProps, true); - } - - synchronized File convertManifest(File pluginBaseLocation, File bundleManifestLocation, boolean compatibilityManifest, String targetVersion, boolean analyseJars, Dictionary devProps, boolean failOnNoManifest) throws PluginConversionException { - Dictionary converted = convertManifest(pluginBaseLocation, compatibilityManifest, targetVersion, analyseJars, devProps, failOnNoManifest); - if (converted == null) { - return null; - } - if (bundleManifestLocation == null) { - bundleManifestLocation = new File(cacheLocation, pluginInfo.getUniqueId() + '_' + pluginInfo.getVersion() + ".MF"); //$NON-NLS-1$ - } - if (upToDate(bundleManifestLocation, pluginManifestLocation, manifestType)) - return bundleManifestLocation; - writeManifest(bundleManifestLocation, generatedManifest, compatibilityManifest); - return bundleManifestLocation; - } - - public File convertManifest(File pluginBaseLocation, File bundleManifestLocation, boolean compatibilityManifest, String targetVersion, boolean analyseJars, Dictionary devProps) throws PluginConversionException { - return convertManifest(pluginBaseLocation, bundleManifestLocation, compatibilityManifest, targetVersion, analyseJars, devProps, true); - } - - private String getVersionRange(String reqVersion, String matchRule) { - if (reqVersion == null) - return null; - - Version minVersion = Version.parseVersion(reqVersion); - String versionRange; - if (matchRule != null) { - if (matchRule.equalsIgnoreCase(IModel.PLUGIN_REQUIRES_MATCH_PERFECT)) { - versionRange = new VersionRange(minVersion, true, minVersion, true).toString(); - } else if (matchRule.equalsIgnoreCase(IModel.PLUGIN_REQUIRES_MATCH_EQUIVALENT)) { - versionRange = new VersionRange(minVersion, true, new Version(minVersion.getMajor(), minVersion.getMinor() + 1, 0, ""), false).toString(); //$NON-NLS-1$ - } else if (matchRule.equalsIgnoreCase(IModel.PLUGIN_REQUIRES_MATCH_COMPATIBLE)) { - versionRange = new VersionRange(minVersion, true, new Version(minVersion.getMajor() + 1, 0, 0, ""), false).toString(); //$NON-NLS-1$ - } else if (matchRule.equalsIgnoreCase(IModel.PLUGIN_REQUIRES_MATCH_GREATER_OR_EQUAL)) { - // just return the reqVersion here without any version range - versionRange = reqVersion; - } else { - versionRange = new VersionRange(minVersion, true, new Version(minVersion.getMajor() + 1, 0, 0, ""), false).toString(); //$NON-NLS-1$ - } - } else { - versionRange = new VersionRange(minVersion, true, new Version(minVersion.getMajor() + 1, 0, 0, ""), false).toString(); //$NON-NLS-1$ - } - - StringBuffer result = new StringBuffer(); - result.append(';').append(Constants.BUNDLE_VERSION_ATTRIBUTE).append('='); - result.append('\"').append(versionRange).append('\"'); - return result.toString(); - } -} diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterMsg.java b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterMsg.java deleted file mode 100644 index 8bec72eec..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterMsg.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.osgi.compatibility.plugins; - -import org.eclipse.osgi.util.NLS; - -public class PluginConverterMsg extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.osgi.compatibility.plugins.PluginConverterMsg"; //$NON-NLS-1$ - - public static String ECLIPSE_CONVERTER_ERROR_CONVERTING; - - public static String ECLIPSE_CONVERTER_FILENOTFOUND; - public static String ECLIPSE_CONVERTER_ERROR_CREATING_BUNDLE_MANIFEST; - public static String ECLIPSE_CONVERTER_PLUGIN_LIBRARY_IGNORED; - - public static String ECLIPSE_CONVERTER_ERROR_PARSING_PLUGIN_MANIFEST; - public static String ECLIPSE_CONVERTER_MISSING_ATTRIBUTE; - public static String parse_error; - public static String parse_errorNameLineColumn; - - public static String ECLIPSE_CONVERTER_NO_SAX_FACTORY; - public static String ECLIPSE_CONVERTER_PARSE_UNKNOWNTOP_ELEMENT; - - static { - // initialize resource bundles - NLS.initializeMessages(BUNDLE_NAME, PluginConverterMsg.class); - } - -} diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterMsg.properties b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterMsg.properties deleted file mode 100644 index 4ad20856b..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterMsg.properties +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################### -# Copyright (c) 2004, 2013 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -#External Messages for EN locale - -#Conversion messages -ECLIPSE_CONVERTER_ERROR_CONVERTING=Error converting plugin at {0}. -ECLIPSE_CONVERTER_ERROR_CREATING_BUNDLE_MANIFEST=Error creating bundle manifest file for {0} at {1}. -ECLIPSE_CONVERTER_ERROR_PARSING_PLUGIN_MANIFEST=Error parsing plugin manifest file {0} at {1}. -ECLIPSE_CONVERTER_MISSING_ATTRIBUTE=Error parsing {0} manifest. Missing attribute \"{1}\" in element \"{2}\". -ECLIPSE_CONVERTER_PLUGIN_LIBRARY_IGNORED=Plugin library {0} ignored when creating manifest for {1}. -ECLIPSE_CONVERTER_NO_SAX_FACTORY=No SAX factory parser has been found. -ECLIPSE_CONVERTER_PARSE_UNKNOWNTOP_ELEMENT = Unknown element \"{0}\", found at the top level, ignored. -ECLIPSE_CONVERTER_FILENOTFOUND = Could not find a META-INF/MANIFEST.MF, plugin.xml or a fragment.xml in {0}. -parse_error=Error parsing manifest: {0} -parse_errorNameLineColumn=Error parsing manifest at \"{0}\" line \"{1}\" column \"{2}\": {3} - diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginParser.java b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginParser.java deleted file mode 100644 index 933114d3b..000000000 --- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginParser.java +++ /dev/null @@ -1,708 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.osgi.compatibility.plugins; - -import java.io.InputStream; -import java.util.*; -import javax.xml.parsers.SAXParserFactory; -import org.eclipse.osgi.container.Module; -import org.eclipse.osgi.framework.log.FrameworkLogEntry; -import org.eclipse.osgi.internal.framework.EquinoxConfiguration; -import org.eclipse.osgi.internal.framework.EquinoxContainer; -import org.eclipse.osgi.util.NLS; -import org.osgi.framework.*; -import org.osgi.util.tracker.ServiceTracker; -import org.xml.sax.*; -import org.xml.sax.helpers.DefaultHandler; - -/** - * Internal class. - */ -public class PluginParser extends DefaultHandler implements IModel { - private static ServiceTracker xmlTracker = null; - - private final EquinoxConfiguration configuration; - private PluginInfo manifestInfo = new PluginInfo(); - Version target; // The targeted platform for the given manifest - static final Version TARGET21 = new Version(2, 1, 0); - - public class PluginInfo implements IPluginInfo { - String schemaVersion; - String pluginId; - String version; - String vendor; - - // an ordered list of library path names. - List libraryPaths; - // TODO Should get rid of the libraries map and just have a - // list of library export statements instead. Library paths must - // preserve order. - Map> libraries; //represent the libraries and their export statement - ArrayList requires; - private boolean requiresExpanded = false; //indicates if the requires have been processed. - boolean compatibilityFound = false; //set to true is the requirement list contain compatilibity - String pluginClass; - String masterPluginId; - String masterVersion; - String masterMatch; - private Set filters; - String pluginName; - boolean singleton; - boolean fragment; - private final static String TARGET21_STRING = "2.1"; //$NON-NLS-1$ - boolean hasExtensionExtensionPoints = false; - - public boolean isFragment() { - return fragment; - } - - public String toString() { - return "plugin-id: " + pluginId + " version: " + version + " libraries: " + libraries + " class:" + pluginClass + " master: " + masterPluginId + " master-version: " + masterVersion + " requires: " + requires + " singleton: " + singleton; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ - } - - public Map> getLibraries() { - if (libraries == null) - return new HashMap<>(0); - return libraries; - } - - public ArrayList getRequires() { - if (!TARGET21.equals(target) && schemaVersion == null && !requiresExpanded) { - requiresExpanded = true; - if (requires == null) { - requires = new ArrayList<>(1); - requires.add(new Prerequisite(PluginConverterImpl.PI_RUNTIME, TARGET21_STRING, false, false, IModel.PLUGIN_REQUIRES_MATCH_GREATER_OR_EQUAL)); - requires.add(new Prerequisite(PluginConverterImpl.PI_RUNTIME_COMPATIBILITY, null, false, false, null)); - } else { - //Add elements on the requirement list of ui and help. - for (int i = 0; i < requires.size(); i++) { - Prerequisite analyzed = requires.get(i); - if ("org.eclipse.ui".equals(analyzed.getName())) { //$NON-NLS-1$ - requires.add(i + 1, new Prerequisite("org.eclipse.ui.workbench.texteditor", null, true, analyzed.isExported(), null)); //$NON-NLS-1$ - requires.add(i + 1, new Prerequisite("org.eclipse.jface.text", null, true, analyzed.isExported(), null)); //$NON-NLS-1$ - requires.add(i + 1, new Prerequisite("org.eclipse.ui.editors", null, true, analyzed.isExported(), null)); //$NON-NLS-1$ - requires.add(i + 1, new Prerequisite("org.eclipse.ui.views", null, true, analyzed.isExported(), null)); //$NON-NLS-1$ - requires.add(i + 1, new Prerequisite("org.eclipse.ui.ide", null, true, analyzed.isExported(), null)); //$NON-NLS-1$ - } else if ("org.eclipse.help".equals(analyzed.getName())) { //$NON-NLS-1$ - requires.add(i + 1, new Prerequisite("org.eclipse.help.base", null, true, analyzed.isExported(), null)); //$NON-NLS-1$ - } else if (PluginConverterImpl.PI_RUNTIME.equals(analyzed.getName()) && !compatibilityFound) { - requires.add(i + 1, new Prerequisite(PluginConverterImpl.PI_RUNTIME_COMPATIBILITY, null, false, analyzed.isExported(), null)); - } - } - if (!requires.contains(new Prerequisite(PluginConverterImpl.PI_RUNTIME_COMPATIBILITY, null, false, false, null))) { - requires.add(new Prerequisite(PluginConverterImpl.PI_RUNTIME_COMPATIBILITY, null, false, false, null)); - } - //Remove any prereq on runtime and add a prereq on runtime 2.1 - //This is used to recognize the version for which the given plugin was initially targeted. - Prerequisite runtimePrereq = new Prerequisite(PluginConverterImpl.PI_RUNTIME, null, false, false, null); - requires.remove(runtimePrereq); - requires.add(new Prerequisite(PluginConverterImpl.PI_RUNTIME, TARGET21_STRING, false, false, IModel.PLUGIN_REQUIRES_MATCH_GREATER_OR_EQUAL)); - } - } - if (requires == null) - return requires = new ArrayList<>(0); - - return requires; - } - - public String getMasterId() { - return masterPluginId; - } - - public String getMasterVersion() { - return masterVersion; - } - - public String getMasterMatch() { - return masterMatch; - } - - public String getPluginClass() { - return pluginClass; - } - - public String getUniqueId() { - return pluginId; - } - - public String getVersion() { - return version; - } - - public Set getPackageFilters() { - return filters; - } - - public String[] getLibrariesName() { - if (libraryPaths == null) - return new String[0]; - return libraryPaths.toArray(new String[libraryPaths.size()]); - } - - public String getPluginName() { - return pluginName; - } - - public String getProviderName() { - return vendor; - } - - public boolean isSingleton() { - return singleton; - } - - public boolean hasExtensionExtensionPoints() { - return hasExtensionExtensionPoints; - } - - public String getRoot() { - return isFragment() ? FRAGMENT : PLUGIN; - } - - /* - * Provides some basic form of validation. Since plugin/fragment is the only mandatory - * attribute, it is the only one we cara about here. - */ - public String validateForm() { - if (this.pluginId == null) - return NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_MISSING_ATTRIBUTE, new String[] {getRoot(), PLUGIN_ID, getRoot()}); - if (this.pluginName == null) - return NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_MISSING_ATTRIBUTE, new String[] {getRoot(), PLUGIN_NAME, getRoot()}); - if (this.version == null) - return NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_MISSING_ATTRIBUTE, new String[] {getRoot(), PLUGIN_VERSION, getRoot()}); - if (isFragment() && this.masterPluginId == null) - return NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_MISSING_ATTRIBUTE, new String[] {getRoot(), FRAGMENT_PLUGIN_ID, getRoot()}); - if (isFragment() && this.masterVersion == null) - return NLS.bind(PluginConverterMsg.ECLIPSE_CONVERTER_MISSING_ATTRIBUTE, new String[] {getRoot(), FRAGMENT_PLUGIN_VERSION, getRoot()}); - return null; - } - } - - // Current State Information - Stack stateStack = new Stack<>(); - - // Current object stack (used to hold the current object we are populating in this plugin info - Stack