Move the container impl to org.eclipse.osgi

2 files changed, 29 insertions, 4 deletions

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&lt;String&gt;, 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