diff options
author | Thomas Watson | 2012-06-07 17:14:24 +0000 |
---|---|---|
committer | Thomas Watson | 2012-06-07 17:14:24 +0000 |
commit | 883f1251263debbff303100af87e8b5e5ce872ac (patch) | |
tree | cdf46f9a380638008904aa02422b6af19ab2d98d | |
parent | 499ac70cc96fd37279f31bb8b700f9c6b7778391 (diff) | |
download | rt.equinox.framework-883f1251263debbff303100af87e8b5e5ce872ac.tar.gz rt.equinox.framework-883f1251263debbff303100af87e8b5e5ce872ac.tar.xz rt.equinox.framework-883f1251263debbff303100af87e8b5e5ce872ac.zip |
Move the container impl to org.eclipse.osgi
-rw-r--r-- | bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF | 8 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/.classpath | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/.settings/.api_filters | 26 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs | 7 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/META-INF/MANIFEST.MF | 8 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/about.html | 17 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/build.properties | 5 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/Module.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleCapability.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleClassLoader.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleClassLoader.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleCollisionHook.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleContainer.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleContainerAdaptor.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDataBase.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleDataBase.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRequirement.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleResolver.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevision.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevisionBuilder.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevisions.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleWire.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleWiring.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/SystemModule.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/Capabilities.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Converters.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/Converters.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java (renamed from bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/LockSet.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Activator.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Activator.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Candidates.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Candidates.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Logger.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Logger.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ResolverImpl.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/ResolverImpl.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ShadowList.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/ShadowList.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/SimpleHostedCapability.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/SimpleHostedCapability.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Util.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Util.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WireImpl.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WireImpl.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedCapability.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedCapability.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedRequirement.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedRequirement.java) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedResource.java (renamed from bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedResource.java) | 0 |
39 files changed, 61 insertions, 13 deletions
diff --git a/bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF index 9f1759b36..8bbb846d9 100644 --- a/bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF @@ -4,9 +4,11 @@ Bundle-Name: Junit Bundle-SymbolicName: org.eclipse.osgi.container.tests Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="4.8.2", - org.eclipse.osgi.container;bundle-version="1.0.0" -Import-Package: org.eclipse.osgi.util;version="1.1.0", +Require-Bundle: org.junit;bundle-version="4.8.2" +Import-Package: org.eclipse.osgi.container;version="1.0.0", + org.eclipse.osgi.container.builders;version="1.0.0", + org.eclipse.osgi.container.namespaces;version="1.0.0", + org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.7.0", org.osgi.framework.hooks.bundle;version="1.1.0", org.osgi.framework.hooks.resolver;version="1.0.0", diff --git a/bundles/org.eclipse.osgi/.classpath b/bundles/org.eclipse.osgi/.classpath index 5e737b490..61f80c36c 100644 --- a/bundles/org.eclipse.osgi/.classpath +++ b/bundles/org.eclipse.osgi/.classpath @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="osgi/src"/> <classpathentry kind="src" path="supplement/src"/> <classpathentry kind="src" path="core/adaptor"/> + <classpathentry kind="src" path="container/src"/> <classpathentry kind="src" path="core/framework"/> <classpathentry kind="src" path="core/composite"/> <classpathentry kind="src" path="resolver/src"/> diff --git a/bundles/org.eclipse.osgi/.settings/.api_filters b/bundles/org.eclipse.osgi/.settings/.api_filters index 22e7fc6fa..05077ceed 100644 --- a/bundles/org.eclipse.osgi/.settings/.api_filters +++ b/bundles/org.eclipse.osgi/.settings/.api_filters @@ -1,5 +1,31 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.osgi" version="2"> + <resource path="container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java" type="org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory"> + <filter id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory.addPackageImports(ModuleRevisionBuilder, ManifestElement[], Collection<String>, boolean)"/> + <message_argument value="StringBuilder"/> + <message_argument value="length()"/> + <message_argument value="JavaSE-1.6"/> + </message_arguments> + </filter> + <filter id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory.getFragmentHost(ModuleRevisionBuilder, ManifestElement[])"/> + <message_argument value="StringBuilder"/> + <message_argument value="length()"/> + <message_argument value="JavaSE-1.6"/> + </message_arguments> + </filter> + <filter id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory.getRequireBundle(ModuleRevisionBuilder, ManifestElement[])"/> + <message_argument value="StringBuilder"/> + <message_argument value="length()"/> + <message_argument value="JavaSE-1.6"/> + </message_arguments> + </filter> + </resource> <resource path="core/framework/org/eclipse/osgi/framework/internal/protocol/URLStreamHandlerFactoryProxyFor15.java" type="org.eclipse.osgi.framework.internal.protocol.URLStreamHandlerFactoryProxyFor15"> <filter comment="Code is protected when running on a limited environment" id="646971428"> <message_arguments> diff --git a/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs index 4f32b45f6..df8c0b940 100644 --- a/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Thu Feb 17 07:54:09 CST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,9 +7,9 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -100,7 +99,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF index e24d90a9a..33b5d8e0d 100644 --- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF @@ -1,6 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Export-Package: org.eclipse.osgi.event;version="1.0", +Export-Package: org.eclipse.osgi.container;version="1.0", + org.eclipse.osgi.container.builders;version="1.0", + org.eclipse.osgi.container.namespaces;version="1.0", + org.eclipse.osgi.event;version="1.0", org.eclipse.osgi.framework.console;version="1.1", org.eclipse.osgi.framework.eventmgr;version="1.2", org.eclipse.osgi.framework.log;version="1.1", @@ -85,6 +88,5 @@ Bundle-DocUrl: http://www.eclipse.org Eclipse-ExtensibleAPI: true Eclipse-SystemBundle: true Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - OSGi/Minimum-1.2 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-BundleShape: jar diff --git a/bundles/org.eclipse.osgi/about.html b/bundles/org.eclipse.osgi/about.html index 60a8dda5f..7aa669046 100644 --- a/bundles/org.eclipse.osgi/about.html +++ b/bundles/org.eclipse.osgi/about.html @@ -67,6 +67,23 @@ in the file <a href="about_files/LICENSE-2.0.txt" target="_blank">LICENSE-2.0.tx or may not be a member of the OSGi Alliance). The OSGi Alliance and its members are not responsible and shall not be held responsible in any manner for identifying or failing to identify any or all such third party intellectual property rights.</p> +<h4>Apache Felix Resolver</h4> + +<p>This bundle includes software developed by The Apache Software Foundation as part of the Felix project. +this includes all files in the following sub-directories (and their sub-directories):</p> +<ul> + <li>org/apache/felix/resolver</li> +</ul> + +<p>Your use of the Resolver code is subject to the terms and conditions of the Apache Software License 2.0. A copy of the license is contained + in the file <a href="about_files/LICENSE-2.0.txt">LICENSE-2.0.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. + +<p>The names "Felix Resolver" and "Apache Software Foundation" must not be used to endorse or promote products derived from this + software without prior written permission. For written permission, please contact <a href="mailto:apache@apache.org">apache@apache.org</a>.</p> + +<p> + Original binaries and source are available from the <a href="http://felix.apache.org/">Apache Felix website</a>.</p> + <small>OSGi™ is a trademark, registered trademark, or service mark of The OSGi Alliance in the US and other countries. Java is a trademark, registered trademark, or service mark of Sun Microsystems, Inc. in the US and other countries. All other trademarks, registered trademarks, or service marks used in the Content are the property of their respective owners and are hereby recognized.</small> diff --git a/bundles/org.eclipse.osgi/build.properties b/bundles/org.eclipse.osgi/build.properties index deea927bc..fdcd7b508 100644 --- a/bundles/org.eclipse.osgi/build.properties +++ b/bundles/org.eclipse.osgi/build.properties @@ -28,7 +28,8 @@ source.. = osgi/src,\ eclipseAdaptor/src/,\ console/src/,\ supplement/src/,\ - security/src/ + security/src/,\ + container/src/ output.. = bin/ jre.compilation.profile = J2SE-1.5 @@ -44,4 +45,4 @@ javacTarget=jsr14 # and use the .classpath.osgisource as the .classpath file. # customBuildCallbacks=customBuildCallbacks.xml -javacWarnings..=-deadCode,-raw,-unchecked
\ No newline at end of file +javacWarnings..=-deadCode,-raw,-unchecked diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/Module.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java index b950a49a0..b950a49a0 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/Module.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleCapability.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java index 83e0f67c8..83e0f67c8 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleCapability.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleClassLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleClassLoader.java index 475eb40ab..475eb40ab 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleClassLoader.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleClassLoader.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleCollisionHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java index 94b562c9f..94b562c9f 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleCollisionHook.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java index c7e0abc25..c7e0abc25 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleContainer.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleContainerAdaptor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java index 14dc4642b..14dc4642b 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleContainerAdaptor.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleDataBase.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDataBase.java index 95f42d643..95f42d643 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleDataBase.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDataBase.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRequirement.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java index 886630625..886630625 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRequirement.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java index f2b1b3b3b..f2b1b3b3b 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleResolver.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevision.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java index 7610b3f9a..7610b3f9a 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevision.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevisionBuilder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java index 941337523..941337523 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevisionBuilder.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevisions.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java index 06e4a3767..06e4a3767 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleRevisions.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleWire.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java index 085f1dd9e..085f1dd9e 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleWire.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleWiring.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java index 883ac3856..883ac3856 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/ModuleWiring.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/SystemModule.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java index 28a69b8c5..28a69b8c5 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/SystemModule.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java index 6e8355cc7..6e8355cc7 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java index b89822495..b89822495 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java index 3b2ab29c5..3b2ab29c5 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/Capabilities.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java index 0fb7cf970..0fb7cf970 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/Capabilities.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/Converters.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Converters.java index 5c2c0fc64..5c2c0fc64 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/Converters.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Converters.java diff --git a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/LockSet.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java index 764c6b69a..764c6b69a 100644 --- a/bundles/org.eclipse.osgi.container/container/org/eclipse/osgi/internal/container/LockSet.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Activator.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Activator.java index 2ed989a0c..2ed989a0c 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Activator.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Activator.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Candidates.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Candidates.java index 3bffc1995..3bffc1995 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Candidates.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Candidates.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Logger.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Logger.java index 9eaa21212..9eaa21212 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Logger.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Logger.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/ResolverImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ResolverImpl.java index 754d2865d..754d2865d 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/ResolverImpl.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ResolverImpl.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/ShadowList.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ShadowList.java index 05734da46..05734da46 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/ShadowList.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ShadowList.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/SimpleHostedCapability.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/SimpleHostedCapability.java index 98e2d4f3d..98e2d4f3d 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/SimpleHostedCapability.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/SimpleHostedCapability.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Util.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Util.java index dc5a10003..dc5a10003 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/Util.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Util.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WireImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WireImpl.java index a79ac7114..a79ac7114 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WireImpl.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WireImpl.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedCapability.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedCapability.java index 9bbec36e2..9bbec36e2 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedCapability.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedCapability.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedRequirement.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedRequirement.java index a9d66dfea..a9d66dfea 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedRequirement.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedRequirement.java diff --git a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedResource.java b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedResource.java index 693e8bbcd..693e8bbcd 100644 --- a/bundles/org.eclipse.osgi.container/resolver/org/apache/felix/resolver/WrappedResource.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedResource.java |