SHARE
TWEET

Untitled

a guest Feb 21st, 2012 109 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
  2. index 39c15e7..1c51c05 100644
  3. --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
  4. +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
  5. @@ -2,7 +2,7 @@ Manifest-Version: 1.0
  6.  Bundle-ManifestVersion: 2
  7.  Bundle-Name: %pluginName
  8.  Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin.equinox;singleton:=true
  9. -Bundle-Version: 1.0.400.qualifier
  10. +Bundle-Version: 1.0.400.v20110905-2042
  11.  Bundle-Vendor: %providerName
  12.  Bundle-Localization: plugin
  13.  Import-Package: org.eclipse.core.runtime.internal.adaptor,
  14. diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java
  15. index ff4c32b..01c9379 100644
  16. --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java
  17. +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java
  18. @@ -89,7 +89,7 @@ public class ParserUtils {
  19.  
  20.                 if (install != null) {
  21.                         if (install.startsWith(FILE_PROTOCOL))
  22. -                               install = install.substring(FILE_PROTOCOL.length() + 1);
  23. +                               install = install.substring(FILE_PROTOCOL.length());
  24.                         File installFile = new File(install);
  25.                         if (installFile.isAbsolute())
  26.                                 return installFile;
  27. @@ -103,7 +103,7 @@ public class ParserUtils {
  28.                                         URI startupURI = new URI(startup);
  29.                                         startup = new File(startupURI).getAbsolutePath();
  30.                                 } catch (URISyntaxException e) {
  31. -                                       startup = startup.substring(FILE_PROTOCOL.length() + 1);
  32. +                                       startup = startup.substring(FILE_PROTOCOL.length());
  33.                                 }
  34.                         }
  35.  
  36. diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/optimizer.launch b/bundles/org.eclipse.equinox.p2.artifact.optimizers/optimizer.launch
  37. index 65bf933..66266ee 100644
  38. --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/optimizer.launch
  39. +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/optimizer.launch
  40. @@ -7,18 +7,19 @@
  41.  <stringAttribute key="checked" value="[NONE]"/>
  42.  <booleanAttribute key="clearConfig" value="false"/>
  43.  <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/optimizer"/>
  44. +<booleanAttribute key="default" value="true"/>
  45.  <booleanAttribute key="default_auto_start" value="false"/>
  46.  <intAttribute key="default_start_level" value="4"/>
  47.  <booleanAttribute key="includeOptional" value="false"/>
  48.  <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
  49. -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.6.0"/>
  50.  <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog -application org.eclipse.equinox.p2.artifact.optimizers.pack200optimizer&#13;&#10;-artifactRepository file:d:/prov/repo&#13;&#10;-console"/>
  51.  <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
  52.  <stringAttribute key="pde.version" value="3.3"/>
  53.  <booleanAttribute key="show_selected_only" value="false"/>
  54. -<stringAttribute key="target_bundles" value="org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:default,org.eclipse.core.runtime.compatibility.registry@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default,org.eclipse.update.configurator@default:default"/>
  55. +<stringAttribute key="target_bundles" value="org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi,org.eclipse.osgi.services@default:default,org.eclipse.update.configurator@3:true"/>
  56.  <booleanAttribute key="tracing" value="false"/>
  57. +<booleanAttribute key="useCustomFeatures" value="false"/>
  58.  <booleanAttribute key="useDefaultConfigArea" value="true"/>
  59.  <booleanAttribute key="useNamedJRE" value="true"/>
  60. -<stringAttribute key="workspace_bundles" value="ie.wombat.jbdiff@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.download@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.sar@default:default"/>
  61. +<stringAttribute key="workspace_bundles" value="ie.wombat.jbdiff@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.sar@default:default"/>
  62.  </launchConfiguration>
  63. diff --git a/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.core.prefs
  64. index 5e1105f..b076b02 100644
  65. --- a/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.core.prefs
  66. +++ b/bundles/org.eclipse.equinox.p2.director/.settings/org.eclipse.jdt.core.prefs
  67. @@ -1,4 +1,3 @@
  68. -#Mon Dec 21 23:16:26 CET 2009
  69.  eclipse.preferences.version=1
  70.  org.eclipse.jdt.core.builder.cleanOutputFolder=clean
  71.  org.eclipse.jdt.core.builder.duplicateResourceTask=warning
  72. @@ -7,6 +6,11 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
  73.  org.eclipse.jdt.core.circularClasspath=error
  74.  org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
  75.  org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
  76. +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
  77. +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
  78. +org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
  79. +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
  80. +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
  81.  org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
  82.  org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14
  83.  org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
  84. @@ -19,17 +23,24 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
  85.  org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
  86.  org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
  87.  org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
  88. +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
  89. +org.eclipse.jdt.core.compiler.problem.deadCode=warning
  90.  org.eclipse.jdt.core.compiler.problem.deprecation=warning
  91.  org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
  92.  org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
  93. -org.eclipse.jdt.core.compiler.problem.discouragedReference=error
  94. +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
  95.  org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
  96.  org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
  97. +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
  98. +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
  99. +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
  100.  org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
  101.  org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
  102.  org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
  103.  org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
  104.  org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
  105. +org.eclipse.jdt.core.compiler.problem.includeFieldsInNullAnalysis=disabled
  106. +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
  107.  org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
  108.  org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
  109.  org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
  110. @@ -38,6 +49,7 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
  111.  org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
  112.  org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
  113.  org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
  114. +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
  115.  org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
  116.  org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
  117.  org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
  118. @@ -45,31 +57,56 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
  119.  org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
  120.  org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
  121.  org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
  122. +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
  123.  org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
  124. +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
  125.  org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
  126.  org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
  127.  org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
  128. +org.eclipse.jdt.core.compiler.problem.nullReference=warning
  129. +org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning
  130. +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
  131.  org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
  132. +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
  133.  org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
  134. +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
  135. +org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error
  136. +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
  137. +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
  138. +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
  139. +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
  140. +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
  141. +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
  142. +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
  143. +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
  144.  org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
  145.  org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
  146. +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
  147.  org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
  148.  org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
  149.  org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
  150. +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
  151.  org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
  152. +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
  153.  org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
  154.  org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
  155.  org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
  156.  org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
  157.  org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
  158.  org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
  159. +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
  160. +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
  161.  org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
  162.  org.eclipse.jdt.core.compiler.problem.unusedImport=error
  163. +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
  164.  org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
  165. +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
  166.  org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
  167. +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
  168.  org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
  169.  org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
  170.  org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
  171. +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
  172.  org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
  173.  org.eclipse.jdt.core.compiler.source=1.5
  174.  org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
  175. diff --git a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
  176. index 5bea11e..a5036d9 100644
  177. --- a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
  178. +++ b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
  179. @@ -2,7 +2,7 @@ Manifest-Version: 1.0
  180.  Bundle-ManifestVersion: 2
  181.  Bundle-Name: %pluginName
  182.  Bundle-SymbolicName: org.eclipse.equinox.p2.director;singleton:=true
  183. -Bundle-Version: 2.2.0.qualifier
  184. +Bundle-Version: 2.2.0.v20111231-2042
  185.  Bundle-ClassPath: .
  186.  Bundle-Activator: org.eclipse.equinox.internal.p2.director.DirectorActivator
  187.  Bundle-Vendor: %providerName
  188. @@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)",
  189.   org.sat4j.core;bundle-version="[2.2.0,2.4.0)",
  190.   org.sat4j.pb;bundle-version="[2.2.0,2.4.0)",
  191.   org.eclipse.core.jobs;bundle-version="[3.3.0,4.0.0)",
  192. - org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)"
  193. + org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
  194. + org.eclipse.equinox.p2.engine;bundle-version="2.2.0"
  195.  Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  196.   J2SE-1.4,
  197.   CDC-1.1/Foundation-1.1
  198. diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/DirectorActivator.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/DirectorActivator.java
  199. index d3d20b6..124b6b4 100644
  200. --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/DirectorActivator.java
  201. +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/DirectorActivator.java
  202. @@ -10,6 +10,13 @@
  203.   *******************************************************************************/
  204.  package org.eclipse.equinox.internal.p2.director;
  205.  
  206. +import java.util.Collection;
  207. +import org.eclipse.equinox.internal.p2.engine.IPlannerHelper;
  208. +import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry;
  209. +import org.eclipse.equinox.p2.core.IProvisioningAgent;
  210. +import org.eclipse.equinox.p2.engine.*;
  211. +import org.eclipse.equinox.p2.metadata.IInstallableUnit;
  212. +import org.eclipse.equinox.p2.planner.IPlanner;
  213.  import org.osgi.framework.BundleActivator;
  214.  import org.osgi.framework.BundleContext;
  215.  
  216. @@ -19,6 +26,16 @@ public class DirectorActivator implements BundleActivator {
  217.  
  218.         public void start(BundleContext ctx) throws Exception {
  219.                 context = ctx;
  220. +               SimpleProfileRegistry.helper = new IPlannerHelper() {
  221. +
  222. +                       public IProvisioningPlan getPlan(IProfile profile, Collection<IInstallableUnit> ius) {
  223. +                               ProfileChangeRequest request = new ProfileChangeRequest(profile);
  224. +                               request.addAll(ius);
  225. +                               IProvisioningAgent provisioningAgent = profile.getProvisioningAgent();
  226. +                               IPlanner planner = (IPlanner) provisioningAgent.getService(IPlanner.class.getName());
  227. +                               return planner.getProvisioningPlan(request, new ProvisioningContext(profile.getProvisioningAgent()), null);
  228. +                       }
  229. +               };
  230.         }
  231.  
  232.         public void stop(BundleContext ctx) throws Exception {
  233. diff --git a/bundles/org.eclipse.equinox.p2.engine/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.engine/.settings/org.eclipse.jdt.core.prefs
  234. index 0c57496..588fa65 100644
  235. --- a/bundles/org.eclipse.equinox.p2.engine/.settings/org.eclipse.jdt.core.prefs
  236. +++ b/bundles/org.eclipse.equinox.p2.engine/.settings/org.eclipse.jdt.core.prefs
  237. @@ -1,4 +1,3 @@
  238. -#Mon Dec 21 23:51:30 CET 2009
  239.  eclipse.preferences.version=1
  240.  instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
  241.  org.eclipse.jdt.core.builder.cleanOutputFolder=clean
  242. @@ -8,6 +7,11 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
  243.  org.eclipse.jdt.core.circularClasspath=error
  244.  org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
  245.  org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
  246. +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
  247. +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
  248. +org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
  249. +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
  250. +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
  251.  org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
  252.  org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14
  253.  org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
  254. @@ -20,17 +24,24 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
  255.  org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
  256.  org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
  257.  org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
  258. +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
  259. +org.eclipse.jdt.core.compiler.problem.deadCode=warning
  260.  org.eclipse.jdt.core.compiler.problem.deprecation=warning
  261.  org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
  262.  org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
  263. -org.eclipse.jdt.core.compiler.problem.discouragedReference=error
  264. +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
  265.  org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
  266.  org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
  267. +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
  268. +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
  269. +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
  270.  org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
  271.  org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
  272.  org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
  273.  org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
  274.  org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
  275. +org.eclipse.jdt.core.compiler.problem.includeFieldsInNullAnalysis=disabled
  276. +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
  277.  org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
  278.  org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
  279.  org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
  280. @@ -39,6 +50,7 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
  281.  org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
  282.  org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
  283.  org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
  284. +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
  285.  org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
  286.  org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
  287.  org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
  288. @@ -46,31 +58,56 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
  289.  org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
  290.  org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
  291.  org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
  292. +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
  293.  org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
  294. +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
  295.  org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
  296.  org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
  297.  org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
  298. +org.eclipse.jdt.core.compiler.problem.nullReference=warning
  299. +org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning
  300. +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
  301.  org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
  302. +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
  303.  org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
  304. +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
  305. +org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error
  306. +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
  307. +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
  308. +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
  309. +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
  310. +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
  311. +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
  312. +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
  313. +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
  314.  org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
  315.  org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
  316. +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
  317.  org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
  318.  org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
  319.  org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
  320. +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
  321.  org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
  322. +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
  323.  org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
  324.  org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
  325.  org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
  326.  org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
  327.  org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
  328.  org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
  329. +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
  330. +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
  331.  org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
  332. -org.eclipse.jdt.core.compiler.problem.unusedImport=error
  333. +org.eclipse.jdt.core.compiler.problem.unusedImport=warning
  334. +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
  335.  org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
  336. +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
  337.  org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
  338. +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
  339.  org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
  340.  org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
  341. -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
  342. +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
  343. +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
  344.  org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
  345.  org.eclipse.jdt.core.compiler.source=1.5
  346.  org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
  347. diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
  348. index 92d9198..05f965e 100644
  349. --- a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
  350. +++ b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
  351. @@ -2,7 +2,7 @@ Manifest-Version: 1.0
  352.  Bundle-ManifestVersion: 2
  353.  Bundle-Name: %pluginName
  354.  Bundle-SymbolicName: org.eclipse.equinox.p2.engine;singleton:=true
  355. -Bundle-Version: 2.2.0.qualifier
  356. +Bundle-Version: 2.2.0.v20120117-0330
  357.  Bundle-Activator: org.eclipse.equinox.internal.p2.engine.EngineActivator
  358.  Bundle-Vendor: %providerName
  359.  Bundle-Localization: plugin
  360. @@ -19,7 +19,11 @@ Export-Package: org.eclipse.equinox.internal.p2.engine;
  361.   org.eclipse.equinox.p2.engine.spi;version="2.0.0"
  362.  Require-Bundle: org.eclipse.equinox.common,
  363.   org.eclipse.equinox.registry,
  364. - org.eclipse.core.jobs;bundle-version="[3.4.0,4.0.0)"
  365. + org.eclipse.core.jobs;bundle-version="[3.4.0,4.0.0)",
  366. + org.eclipse.osgi,
  367. + org.eclipse.equinox.simpleconfigurator,
  368. + org.eclipse.equinox.frameworkadmin,
  369. + org.eclipse.equinox.frameworkadmin.equinox;bundle-version="1.0.400"
  370.  Eclipse-RegisterBuddy: org.eclipse.equinox.p2.metadata.repository
  371.  Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  372.   J2SE-1.4,
  373. @@ -34,8 +38,10 @@ Import-Package: javax.xml.parsers,
  374.   org.eclipse.equinox.internal.p2.metadata.index,
  375.   org.eclipse.equinox.internal.p2.metadata.repository.io,
  376.   org.eclipse.equinox.internal.p2.persistence,
  377. + org.eclipse.equinox.internal.provisional.frameworkadmin,
  378.   org.eclipse.equinox.internal.provisional.p2.core.eventbus,
  379.   org.eclipse.equinox.internal.provisional.p2.repository,
  380. + org.eclipse.equinox.internal.simpleconfigurator.utils,
  381.   org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
  382.   org.eclipse.equinox.p2.core.spi;version="[2.0.0,3.0.0)",
  383.   org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",
  384. diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
  385. index 0853c2c..4d1d150 100644
  386. --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
  387. +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
  388. @@ -20,17 +20,22 @@ import org.eclipse.core.runtime.*;
  389.  import org.eclipse.core.runtime.jobs.Job;
  390.  import org.eclipse.equinox.internal.p2.core.helpers.*;
  391.  import org.eclipse.equinox.internal.p2.metadata.TranslationSupport;
  392. +import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin;
  393.  import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
  394.  import org.eclipse.equinox.p2.core.*;
  395.  import org.eclipse.equinox.p2.core.spi.IAgentService;
  396.  import org.eclipse.equinox.p2.engine.*;
  397. -import org.eclipse.equinox.p2.metadata.*;
  398. +import org.eclipse.equinox.p2.metadata.IInstallableUnit;
  399. +import org.eclipse.equinox.p2.metadata.Version;
  400.  import org.eclipse.equinox.p2.query.IQueryResult;
  401.  import org.eclipse.equinox.p2.query.QueryUtil;
  402. +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
  403. +import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
  404.  import org.eclipse.osgi.service.datalocation.Location;
  405. +import org.eclipse.osgi.service.resolver.PlatformAdmin;
  406.  import org.eclipse.osgi.util.NLS;
  407. -import org.osgi.framework.BundleContext;
  408. -import org.osgi.framework.ServiceReference;
  409. +import org.osgi.framework.*;
  410. +import org.osgi.util.tracker.ServiceTracker;
  411.  import org.xml.sax.InputSource;
  412.  import org.xml.sax.SAXException;
  413.  
  414. @@ -44,6 +49,8 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
  415.         public static final String DEFAULT_STORAGE_DIR = "profileRegistry"; //$NON-NLS-1$
  416.         private static final String DATA_EXT = ".data"; //$NON-NLS-1$
  417.  
  418. +       public static IPlannerHelper helper;
  419. +
  420.         protected final IProvisioningAgent agent;
  421.  
  422.         /**
  423. @@ -166,11 +173,100 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
  424.  
  425.         public synchronized IProfile getProfile(String id) {
  426.                 Profile profile = internalGetProfile(id);
  427. -               if (profile == null)
  428. -                       return null;
  429. +               if (SELF.equals(id)) {
  430. +                       id = "PlatformProfile";
  431. +                       self = id;
  432. +               }
  433. +               if (profile == null) {
  434. +                       try {
  435. +                               PlatformAdmin platformAdmin = (PlatformAdmin) ServiceHelper.getService(EngineActivator.getContext(), PlatformAdmin.class.getName());
  436. +                               IProvisioningAgent agent = (IProvisioningAgent) ServiceHelper.getService(EngineActivator.getContext(), IProvisioningAgent.class.getName());
  437. +                               IProfileRegistry registry = (IProfileRegistry) agent.getService(IProfileRegistry.class.getName());
  438. +                               IEngine engine = (IEngine) agent.getService(IEngine.class.getName());
  439. +                               IMetadataRepositoryManager repoMgr = (IMetadataRepositoryManager) agent.getService(IMetadataRepositoryManager.class.getName());
  440. +                               IArtifactRepositoryManager artifactRepoMgr = (IArtifactRepositoryManager) agent.getService(IArtifactRepositoryManager.class.getName());
  441. +
  442. +                               Collection<IInstallableUnit> ius = new Reify().reify(platformAdmin);
  443. +
  444. +                               ius.add(Reify.createDefaultBundleConfigurationUnit());
  445. +                               ius.add(Reify.createUpdateConfiguratorConfigurationUnit());
  446. +                               ius.add(Reify.createDropinsConfigurationUnit());
  447. +                               ius.add(Reify.createDefaultFeatureConfigurationUnit(""));
  448. +
  449. +                               return spoofUpProfile(id, agent, registry, engine, ius);
  450. +                       } catch (ProvisionException e) {
  451. +                               e.printStackTrace();
  452. +                               return null;
  453. +                       }
  454. +               }
  455. +
  456.                 return profile.snapshot();
  457.         }
  458.  
  459. +       private synchronized IProfile spoofUpProfile(String id, IProvisioningAgent agent, IProfileRegistry registry, IEngine engine, Collection<IInstallableUnit> ius) throws ProvisionException {
  460. +
  461. +               Map<String, String> prop = new HashMap<String, String>();
  462. +
  463. +               Location installLocation = (Location) ServiceHelper.getService(EngineActivator.getContext(), Location.class.getName(), Location.INSTALL_FILTER);
  464. +               File installFolder = new File(installLocation.getURL().getPath());
  465. +
  466. +               Location configurationLocation = (Location) ServiceHelper.getService(EngineActivator.getContext(), Location.class.getName(), Location.CONFIGURATION_FILTER);
  467. +               File configurationFolder = new File(configurationLocation.getURL().getPath());
  468. +
  469. +               // We need to check that the configuration folder is not a file system root.
  470. +               // some of the profiles resources are stored as siblings to the configuration folder.
  471. +               // also see bug 230384
  472. +               if (configurationFolder.getParentFile() == null)
  473. +                       throw new IllegalArgumentException("Configuration folder must not be a file system root."); //$NON-NLS-1$
  474. +
  475. +               File launcherConfigFile = new File(configurationFolder, "eclipse.ini.ignored");
  476. +
  477. +               //              prop.put("org.eclipse.update.install.features", "true");
  478. +               prop.put(IProfile.PROP_ENVIRONMENTS, "osgi.nl=en_US,osgi.ws=gtk,osgi.arch=x86_64,osgi.os=linux");
  479. +
  480. +               prop.put(IProfile.PROP_INSTALL_FOLDER, installFolder.getAbsolutePath());
  481. +               prop.put(IProfile.PROP_SHARED_CACHE, installFolder.getAbsolutePath());
  482. +               prop.put(IProfile.PROP_ROAMING, Boolean.FALSE.toString());
  483. +               prop.put(IProfile.PROP_CONFIGURATION_FOLDER, configurationFolder.getAbsolutePath());
  484. +               prop.put(IProfile.PROP_CACHE, configurationFolder.getParentFile().getAbsolutePath());
  485. +               prop.put(IProfile.PROP_LAUNCHER_CONFIGURATION, launcherConfigFile.getAbsolutePath());
  486. +               prop.put("org.eclipse.update.install.features", "true");
  487. +
  488. +               IProfile profile = registry.addProfile(id, prop);
  489. +               IProvisioningPlan plan = helper.getPlan(profile, ius);
  490. +
  491. +               ((Profile) profile).setChanged(false);
  492. +               IPhaseSet phaseSet = PhaseSetFactory.createDefaultPhaseSetExcluding(new String[] {PhaseSetFactory.PHASE_CHECK_TRUST, PhaseSetFactory.PHASE_COLLECT, PhaseSetFactory.PHASE_CONFIGURE, PhaseSetFactory.PHASE_UNCONFIGURE, PhaseSetFactory.PHASE_UNINSTALL});
  493. +               IStatus status = engine.perform(plan, phaseSet, null);
  494. +
  495. +               if (!status.isOK())
  496. +                       return null;
  497. +
  498. +               return profile;
  499. +       }
  500. +
  501. +       private final static String FILTER_OBJECTCLASS = "(" + Constants.OBJECTCLASS + '=' + FrameworkAdmin.class.getName() + ')'; //$NON-NLS-1$
  502. +       private final static String filterFwName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_FW_NAME + "=Equinox)"; //$NON-NLS-1$ //$NON-NLS-2$
  503. +       private final static String filterLauncherName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME + "=Eclipse.exe)"; //$NON-NLS-1$ //$NON-NLS-2$
  504. +       private final static String filterFwAdmin = "(&" + FILTER_OBJECTCLASS + filterFwName + filterLauncherName + ')'; //$NON-NLS-1$;
  505. +
  506. +       public static FrameworkAdmin getFrameworkAdmin() {
  507. +               ServiceTracker<FrameworkAdmin, FrameworkAdmin> fwAdminTracker = null;
  508. +               try {
  509. +                       Filter filter = EngineActivator.getContext().createFilter(filterFwAdmin);
  510. +                       fwAdminTracker = new ServiceTracker<FrameworkAdmin, FrameworkAdmin>(EngineActivator.getContext(), filter, null);
  511. +                       fwAdminTracker.open();
  512. +                       FrameworkAdmin fwAdmin = fwAdminTracker.getService();
  513. +                       return fwAdmin;
  514. +               } catch (InvalidSyntaxException e) {
  515. +                       //Can't happen we are writing the filter ourselves
  516. +                       return null;
  517. +               } finally {
  518. +                       if (fwAdminTracker != null)
  519. +                               fwAdminTracker.close();
  520. +               }
  521. +       }
  522. +
  523.         public synchronized IProfile getProfile(String id, long timestamp) {
  524.                 if (SELF.equals(id))
  525.                         id = self;
  526. @@ -540,7 +636,7 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
  527.                         return false;
  528.  
  529.                 //check whether the profile contains the p2 engine from 3.5.0 or earlier
  530. -               return profile.available(QueryUtil.createIUQuery("org.eclipse.equinox.p2.engine", new VersionRange("[0.0.0, 1.0.101)")), null).isEmpty(); //$NON-NLS-1$//$NON-NLS-2$
  531. +               return profile.available(QueryUtil.createIUQuery("org.eclipse.equinox.p2.engine", new org.eclipse.equinox.p2.metadata.VersionRange("[0.0.0, 1.0.101)")), null).isEmpty(); //$NON-NLS-1$//$NON-NLS-2$
  532.         }
  533.  
  534.         private void deleteProfile(String profileId) {
  535. @@ -747,12 +843,12 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
  536.  
  537.                 boolean isCurrent = false;
  538.                 try {
  539. -                       if (profile.isChanged()) {
  540. +                       if (profile.isChanged() && false) {
  541.                                 if (DebugHelper.DEBUG_PROFILE_REGISTRY)
  542.                                         DebugHelper.debug(PROFILE_REGISTRY, "Profile is marked as changed."); //$NON-NLS-1$
  543.                                 throw new IllegalStateException(NLS.bind(Messages.profile_changed, profile.getProfileId()));
  544.                         }
  545. -                       if (!checkTimestamps(profile, internalProfile)) {
  546. +                       if (!checkTimestamps(profile, internalProfile) && false) {
  547.                                 if (DebugHelper.DEBUG_PROFILE_REGISTRY)
  548.                                         DebugHelper.debug(PROFILE_REGISTRY, "Unexpected timestamp difference in profile."); //$NON-NLS-1$
  549.                                 throw new IllegalStateException(NLS.bind(Messages.profile_not_current, new String[] {profile.getProfileId(), Long.toString(internalProfile.getTimestamp()), Long.toString(profile.getTimestamp())}));
  550. @@ -849,8 +945,11 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
  551.                         id = self;
  552.                 File profileDirectory = getProfileFolder(id);
  553.                 File profileDataArea = new File(profileDirectory, DATA_EXT);
  554. +               if (!profileDirectory.isDirectory() && !profileDirectory.mkdir()) {
  555. +                       System.out.println("Recreating " + profileDirectory.getAbsolutePath() + " failed");
  556. +               }
  557.                 if (!profileDataArea.isDirectory() && !profileDataArea.mkdir())
  558. -                       throw new IllegalStateException("Could not create profile data area " + profileDataArea.getAbsolutePath() + "for: " + id); //$NON-NLS-1$ //$NON-NLS-2$
  559. +                       throw new IllegalStateException("Could not create profile data area " + profileDataArea.getAbsolutePath() + " for: " + id); //$NON-NLS-1$ //$NON-NLS-2$
  560.                 return profileDataArea;
  561.         }
  562.  
  563. diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
  564. index 067f887..041c419 100644
  565. --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
  566. +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
  567. @@ -2,7 +2,7 @@ Manifest-Version: 1.0
  568.  Bundle-ManifestVersion: 2
  569.  Bundle-Name: %pluginName
  570.  Bundle-SymbolicName: org.eclipse.equinox.p2.reconciler.dropins;singleton:=true
  571. -Bundle-Version: 1.1.200.qualifier
  572. +Bundle-Version: 1.1.200.v20111213-1933
  573.  Bundle-Activator: org.eclipse.equinox.internal.p2.reconciler.dropins.Activator
  574.  Bundle-Vendor: %providerName
  575.  Bundle-Localization: plugin
  576. diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
  577. index d8da4f5..708ae7d 100644
  578. --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
  579. +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
  580. @@ -26,6 +26,7 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent;
  581.  import org.eclipse.equinox.p2.core.ProvisionException;
  582.  import org.eclipse.equinox.p2.engine.IProfile;
  583.  import org.eclipse.equinox.p2.engine.IProfileRegistry;
  584. +import org.eclipse.equinox.p2.planner.IPlanner;
  585.  import org.eclipse.equinox.p2.repository.IRepository;
  586.  import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
  587.  import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
  588. @@ -157,7 +158,8 @@ public class Activator implements BundleActivator {
  589.          */
  590.         public void start(BundleContext context) throws Exception {
  591.                 bundleContext = context;
  592. -
  593. +               ServiceHelper.getService(getContext(), IProvisioningAgent.SERVICE_NAME);
  594. +               ServiceHelper.getService(getContext(), IPlanner.class);
  595.                 // check to see if there is really any work to do. Do this after setting the context, and
  596.                 // doing other initialization in case others call our public methods later.
  597.                 if (isUpToDate()) {
  598. diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
  599. index b348995..49b65b4 100644
  600. --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
  601. +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
  602. @@ -2,7 +2,7 @@ Manifest-Version: 1.0
  603.  Bundle-ManifestVersion: 2
  604.  Bundle-Name: %pluginName
  605.  Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.eclipse;singleton:=true
  606. -Bundle-Version: 2.1.100.qualifier
  607. +Bundle-Version: 2.1.100.v20120117-0330
  608.  Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.eclipse.Activator
  609.  Bundle-Vendor: %providerName
  610.  Bundle-Localization: plugin
  611. diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
  612. index 4a2ecfe..b759c65 100644
  613. --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
  614. +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
  615. @@ -51,23 +51,30 @@ public class InstallBundleAction extends ProvisioningAction {
  616.                         return Status.OK_STATUS;
  617.                 }
  618.  
  619. +               String location = iu.getProperty("location");
  620. +               File bundleFile = null;
  621. +
  622.                 Collection<IArtifactKey> artifacts = iu.getArtifacts();
  623. -               if (artifacts == null || artifacts.isEmpty())
  624. +               if ((artifacts == null || artifacts.isEmpty()) && location == null)
  625.                         return Util.createError(NLS.bind(Messages.iu_contains_no_arifacts, iu));
  626.  
  627. -               IArtifactKey artifactKey = null;
  628. -               for (IArtifactKey candidate : artifacts) {
  629. -                       if (candidate.toString().equals(bundleId)) {
  630. -                               artifactKey = candidate;
  631. -                               break;
  632. +               if (location == null) {
  633. +                       IArtifactKey artifactKey = null;
  634. +                       for (IArtifactKey candidate : artifacts) {
  635. +                               if (candidate.toString().equals(bundleId)) {
  636. +                                       artifactKey = candidate;
  637. +                                       break;
  638. +                               }
  639.                         }
  640. -               }
  641. -               if (artifactKey == null)
  642. -                       throw new IllegalArgumentException(NLS.bind(Messages.no_matching_artifact, bundleId));
  643. +                       if (artifactKey == null)
  644. +                               throw new IllegalArgumentException(NLS.bind(Messages.no_matching_artifact, bundleId));
  645.  
  646. -               File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
  647. -               if (bundleFile == null || !bundleFile.exists())
  648. -                       return Util.createError(NLS.bind(Messages.artifact_file_not_found, artifactKey));
  649. +                       bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
  650. +                       if (bundleFile == null || !bundleFile.exists())
  651. +                               return Util.createError(NLS.bind(Messages.artifact_file_not_found, artifactKey));
  652. +               } else {
  653. +                       bundleFile = new File(location);
  654. +               }
  655.  
  656.                 BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
  657.                 if (bundleInfo == null)
  658. diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/P2 Replication.launch b/bundles/org.eclipse.equinox.p2.ui.importexport/P2 Replication.launch
  659. deleted file mode 100644
  660. index a3502fe..0000000
  661. --- a/bundles/org.eclipse.equinox.p2.ui.importexport/P2 Replication.launch     
  662. +++ /dev/null
  663. @@ -1,429 +0,0 @@
  664. -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
  665. -<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
  666. -<booleanAttribute key="append.args" value="true"/>
  667. -<booleanAttribute key="askclear" value="true"/>
  668. -<booleanAttribute key="automaticAdd" value="true"/>
  669. -<booleanAttribute key="automaticValidate" value="false"/>
  670. -<stringAttribute key="bootstrap" value=""/>
  671. -<stringAttribute key="checked" value="[NONE]"/>
  672. -<booleanAttribute key="clearConfig" value="true"/>
  673. -<booleanAttribute key="clearws" value="true"/>
  674. -<booleanAttribute key="clearwslog" value="false"/>
  675. -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/P2 Replication"/>
  676. -<booleanAttribute key="default" value="true"/>
  677. -<booleanAttribute key="generateProfile" value="true"/>
  678. -<booleanAttribute key="includeOptional" value="true"/>
  679. -<stringAttribute key="location" value="${workspace_loc}/runtime-New_configuration"/>
  680. -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console"/>
  681. -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
  682. -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#13;&#10;-Declipse.p2.profile=SDKProfile&#13;&#13;&#10;-Declipse.p2.data.area=${target_home}/p2"/>
  683. -<stringAttribute key="pde.version" value="3.3"/>
  684. -<stringAttribute key="product" value="org.eclipse.platform.ide"/>
  685. -<booleanAttribute key="show_selected_only" value="false"/>
  686. -<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
  687. -<booleanAttribute key="tracing" value="false"/>
  688. -<mapAttribute key="tracingOptions">
  689. -<mapEntry key="org.eclipse.cdt.core/debug" value="true"/>
  690. -<mapEntry key="org.eclipse.cdt.core/debug/ASTCache" value="false"/>
  691. -<mapEntry key="org.eclipse.cdt.core/debug/deltaprocessor" value="false"/>
  692. -<mapEntry key="org.eclipse.cdt.core/debug/formatter" value="false"/>
  693. -<mapEntry key="org.eclipse.cdt.core/debug/index/locks" value="false"/>
  694. -<mapEntry key="org.eclipse.cdt.core/debug/indexer/activity" value="false"/>
  695. -<mapEntry key="org.eclipse.cdt.core/debug/indexer/problems" value="false"/>
  696. -<mapEntry key="org.eclipse.cdt.core/debug/indexer/problems/inclusion" value="false"/>
  697. -<mapEntry key="org.eclipse.cdt.core/debug/indexer/problems/scanner" value="false"/>
  698. -<mapEntry key="org.eclipse.cdt.core/debug/indexer/problems/syntax" value="false"/>
  699. -<mapEntry key="org.eclipse.cdt.core/debug/indexer/statistics" value="false"/>
  700. -<mapEntry key="org.eclipse.cdt.core/debug/matchlocator" value="false"/>
  701. -<mapEntry key="org.eclipse.cdt.core/debug/model" value="false"/>
  702. -<mapEntry key="org.eclipse.cdt.core/debug/parser" value="false"/>
  703. -<mapEntry key="org.eclipse.cdt.core/debug/parser/exceptions" value="false"/>
  704. -<mapEntry key="org.eclipse.cdt.core/debug/scanner" value="false"/>
  705. -<mapEntry key="org.eclipse.cdt.core/debug/search" value="false"/>
  706. -<mapEntry key="org.eclipse.cdt.core/debug/typeresolver" value="false"/>
  707. -<mapEntry key="org.eclipse.cdt.debug.mi.core/debug" value="true"/>
  708. -<mapEntry key="org.eclipse.cdt.dsf.gdb/debug" value="false"/>
  709. -<mapEntry key="org.eclipse.cdt.dsf.ui/debug" value="false"/>
  710. -<mapEntry key="org.eclipse.cdt.dsf.ui/debug/disassembly" value="false"/>
  711. -<mapEntry key="org.eclipse.cdt.dsf.ui/debug/stepping" value="false"/>
  712. -<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/atomicUpdate" value="false"/>
  713. -<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/cache" value="false"/>
  714. -<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/contentProvider" value="false"/>
  715. -<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/delta" value="false"/>
  716. -<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/presentationId" value=""/>
  717. -<mapEntry key="org.eclipse.cdt.dsf/debug" value="false"/>
  718. -<mapEntry key="org.eclipse.cdt.dsf/debug/executor" value="false"/>
  719. -<mapEntry key="org.eclipse.cdt.dsf/debug/executorName" value=""/>
  720. -<mapEntry key="org.eclipse.cdt.ui/debug" value="true"/>
  721. -<mapEntry key="org.eclipse.cdt.ui/debug/SemanticHighlighting" value="false"/>
  722. -<mapEntry key="org.eclipse.cdt.ui/debug/contentassist" value="false"/>
  723. -<mapEntry key="org.eclipse.cdt.ui/debug/folding" value="false"/>
  724. -<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
  725. -<mapEntry key="org.eclipse.core.expressions/debug/TypeExtensionManager" value="false"/>
  726. -<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
  727. -<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
  728. -<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
  729. -<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
  730. -<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
  731. -<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
  732. -<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
  733. -<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
  734. -<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
  735. -<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
  736. -<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
  737. -<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
  738. -<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
  739. -<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
  740. -<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
  741. -<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
  742. -<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
  743. -<mapEntry key="org.eclipse.core.resources/history" value="false"/>
  744. -<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
  745. -<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
  746. -<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
  747. -<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
  748. -<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
  749. -<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
  750. -<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
  751. -<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
  752. -<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
  753. -<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
  754. -<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
  755. -<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
  756. -<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
  757. -<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
  758. -<mapEntry key="org.eclipse.core.resources/save" value="false"/>
  759. -<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
  760. -<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
  761. -<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
  762. -<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
  763. -<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
  764. -<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
  765. -<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
  766. -<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
  767. -<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
  768. -<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
  769. -<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
  770. -<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
  771. -<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
  772. -<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
  773. -<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
  774. -<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
  775. -<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
  776. -<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
  777. -<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
  778. -<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
  779. -<mapEntry key="org.eclipse.debug.ui/debug/breadcrumb" value="false"/>
  780. -<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
  781. -<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
  782. -<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
  783. -<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
  784. -<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
  785. -<mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/>
  786. -<mapEntry key="org.eclipse.debug.ui/debug/viewers/stateSaveRestore" value="false"/>
  787. -<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
  788. -<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
  789. -<mapEntry key="org.eclipse.equinox.ds/debug" value="false"/>
  790. -<mapEntry key="org.eclipse.equinox.ds/instantiate_all" value="false"/>
  791. -<mapEntry key="org.eclipse.equinox.ds/performance" value="true"/>
  792. -<mapEntry key="org.eclipse.equinox.ds/print_on_console" value="true"/>
  793. -<mapEntry key="org.eclipse.equinox.p2.engine/engine/debug" value="false"/>
  794. -<mapEntry key="org.eclipse.equinox.p2.engine/enginesession/debug" value="false"/>
  795. -<mapEntry key="org.eclipse.equinox.p2.engine/profileregistry/debug" value="false"/>
  796. -<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
  797. -<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
  798. -<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
  799. -<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
  800. -<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
  801. -<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
  802. -<mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/>
  803. -<mapEntry key="org.eclipse.equinox.security/debug" value="false"/>
  804. -<mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/>
  805. -<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
  806. -<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
  807. -<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
  808. -<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
  809. -<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
  810. -<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
  811. -<mapEntry key="org.eclipse.help/debug" value="true"/>
  812. -<mapEntry key="org.eclipse.help/debug/context" value="false"/>
  813. -<mapEntry key="org.eclipse.help/debug/search" value="false"/>
  814. -<mapEntry key="org.eclipse.help/debug/toc" value="false"/>
  815. -<mapEntry key="org.eclipse.jdt.apt.core/debug" value="false"/>
  816. -<mapEntry key="org.eclipse.jdt.apt.core/debug/compilationEnv" value="false"/>
  817. -<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFileMaps" value="false"/>
  818. -<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFiles" value="false"/>
  819. -<mapEntry key="org.eclipse.jdt.apt.pluggable.core/debug" value="false"/>
  820. -<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
  821. -<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
  822. -<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
  823. -<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
  824. -<mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/>
  825. -<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
  826. -<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
  827. -<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
  828. -<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
  829. -<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/>
  830. -<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
  831. -<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
  832. -<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
  833. -<mapEntry key="org.eclipse.jdt.core/debug/indexmanager/advanced" value="false"/>
  834. -<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
  835. -<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
  836. -<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
  837. -<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
  838. -<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
  839. -<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
  840. -<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
  841. -<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
  842. -<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
  843. -<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
  844. -<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
  845. -<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
  846. -<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
  847. -<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
  848. -<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
  849. -<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
  850. -<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
  851. -<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
  852. -<mapEntry key="org.eclipse.jdt.ui/debug/BreadcrumbItemDropDown" value="false"/>
  853. -<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
  854. -<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
  855. -<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
  856. -<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
  857. -<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
  858. -<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
  859. -<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
  860. -<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
  861. -<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
  862. -<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
  863. -<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
  864. -<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
  865. -<mapEntry key="org.eclipse.jface.text/assert/TextSelection/validConstructorArguments" value="false"/>
  866. -<mapEntry key="org.eclipse.jface.text/debug/AbstractInformationControlManager" value="false"/>
  867. -<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
  868. -<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
  869. -<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
  870. -<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
  871. -<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
  872. -<mapEntry key="org.eclipse.osgi/debug" value="false"/>
  873. -<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
  874. -<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
  875. -<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
  876. -<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
  877. -<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
  878. -<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
  879. -<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
  880. -<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
  881. -<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
  882. -<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
  883. -<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
  884. -<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
  885. -<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
  886. -<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
  887. -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
  888. -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
  889. -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
  890. -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
  891. -<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
  892. -<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
  893. -<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
  894. -<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
  895. -<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
  896. -<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
  897. -<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
  898. -<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
  899. -<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
  900. -<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
  901. -<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
  902. -<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
  903. -<mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/>
  904. -<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
  905. -<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
  906. -<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
  907. -<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
  908. -<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
  909. -<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
  910. -<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
  911. -<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
  912. -<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
  913. -<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
  914. -<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
  915. -<mapEntry key="org.eclipse.team.core/debug" value="false"/>
  916. -<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
  917. -<mapEntry key="org.eclipse.team.core/streams" value="false"/>
  918. -<mapEntry key="org.eclipse.team.core/threading" value="false"/>
  919. -<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
  920. -<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
  921. -<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
  922. -<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
  923. -<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
  924. -<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
  925. -<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
  926. -<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
  927. -<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
  928. -<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
  929. -<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
  930. -<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
  931. -<mapEntry key="org.eclipse.ui.ide/debug/markers" value="false"/>
  932. -<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
  933. -<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
  934. -<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
  935. -<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
  936. -<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
  937. -<mapEntry key="org.eclipse.ui.intro/debug/toolbar" value="false"/>
  938. -<mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/>
  939. -<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
  940. -<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
  941. -<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
  942. -<mapEntry key="org.eclipse.ui.navigator/debug" value="false"/>
  943. -<mapEntry key="org.eclipse.ui.navigator/debug/dnd" value="false"/>
  944. -<mapEntry key="org.eclipse.ui.navigator/debug/resolution" value="false"/>
  945. -<mapEntry key="org.eclipse.ui.navigator/debug/setup" value="false"/>
  946. -<mapEntry key="org.eclipse.ui.navigator/debug/sort" value="false"/>
  947. -<mapEntry key="org.eclipse.ui.navigator/debug/viewermap" value="false"/>
  948. -<mapEntry key="org.eclipse.ui.navigator/perf/explorer/createPartControl" value="1300"/>
  949. -<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
  950. -<mapEntry key="org.eclipse.ui/debug" value="false"/>
  951. -<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
  952. -<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
  953. -<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
  954. -<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
  955. -<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
  956. -<mapEntry key="org.eclipse.ui/debug/swtdebugglobal" value="false"/>
  957. -<mapEntry key="org.eclipse.ui/debug/workingSets" value="false"/>
  958. -<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
  959. -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
  960. -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
  961. -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
  962. -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
  963. -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
  964. -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
  965. -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
  966. -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
  967. -<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
  968. -<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
  969. -<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
  970. -<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
  971. -<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
  972. -<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
  973. -<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
  974. -<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
  975. -<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
  976. -<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
  977. -<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
  978. -<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
  979. -<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
  980. -<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
  981. -<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
  982. -<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
  983. -<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
  984. -<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
  985. -<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
  986. -<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
  987. -<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
  988. -<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
  989. -<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
  990. -<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
  991. -<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
  992. -<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
  993. -<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
  994. -<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
  995. -<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
  996. -<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
  997. -<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
  998. -<mapEntry key="org.eclipse.update.core/debug" value="true"/>
  999. -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
  1000. -<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
  1001. -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
  1002. -<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
  1003. -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
  1004. -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
  1005. -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
  1006. -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
  1007. -<mapEntry key="org.eclipse.wst.common.environment/debug" value="true"/>
  1008. -<mapEntry key="org.eclipse.wst.common.environment/trace/command" value="true"/>
  1009. -<mapEntry key="org.eclipse.wst.common.environment/trace/data" value="true"/>
  1010. -<mapEntry key="org.eclipse.wst.common.environment/trace/emitter" value="true"/>
  1011. -<mapEntry key="org.eclipse.wst.common.environment/trace/error" value="true"/>
  1012. -<mapEntry key="org.eclipse.wst.common.environment/trace/info" value="true"/>
  1013. -<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/>
  1014. -<mapEntry key="org.eclipse.wst.common.environment/trace/ws_ant" value="true"/>
  1015. -<mapEntry key="org.eclipse.wst.common.environment/trace/ws_dt_cmd_engine" value="true"/>
  1016. -<mapEntry key="org.eclipse.wst.common.environment/trace/ws_framework" value="true"/>
  1017. -<mapEntry key="org.eclipse.wst.common.project.facet.core/actionSorting" value="false"/>
  1018. -<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/>
  1019. -<mapEntry key="org.eclipse.wst.common.project.facet.core/delegate/calls" value="false"/>
  1020. -<mapEntry key="org.eclipse.wst.common.project.facet.core/events/project" value="false"/>
  1021. -<mapEntry key="org.eclipse.wst.common.project.facet.core/events/project/stacktrace" value="false"/>
  1022. -<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/>
  1023. -<mapEntry key="org.eclipse.wst.sse.core/debug" value="true"/>
  1024. -<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time" value="false"/>
  1025. -<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/>
  1026. -<mapEntry key="org.eclipse.wst.sse.core/filebuffers/leaks" value="true"/>
  1027. -<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/>
  1028. -<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/>
  1029. -<mapEntry key="org.eclipse.wst.sse.core/format" value="false"/>
  1030. -<mapEntry key="org.eclipse.wst.sse.core/structureddocument" value="false"/>
  1031. -<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/>
  1032. -<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/locks" value="true"/>
  1033. -<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/modelmanager" value="false"/>
  1034. -<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/state" value="false"/>
  1035. -<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/>
  1036. -<mapEntry key="org.eclipse.wst.sse.core/tasks/detection" value="false"/>
  1037. -<mapEntry key="org.eclipse.wst.sse.core/tasks/job" value="false"/>
  1038. -<mapEntry key="org.eclipse.wst.sse.core/tasks/overalltime" value="false"/>
  1039. -<mapEntry key="org.eclipse.wst.sse.core/tasks/preferences" value="false"/>
  1040. -<mapEntry key="org.eclipse.wst.sse.core/tasks/registry" value="false"/>
  1041. -<mapEntry key="org.eclipse.wst.sse.core/tasks/time" value="false"/>
  1042. -<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/>
  1043. -<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/>
  1044. -<mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/>
  1045. -<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling" value="false"/>
  1046. -<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling/showProblems" value="false"/>
  1047. -<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidators" value="false"/>
  1048. -<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerjob" value="false"/>
  1049. -<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/>
  1050. -<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="false"/>
  1051. -<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/>
  1052. -<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="false"/>
  1053. -<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/>
  1054. -<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugmenu" value="false"/>
  1055. -<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugpopup" value="false"/>
  1056. -<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugtoolbar" value="false"/>
  1057. -<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/readtime" value="false"/>
  1058. -<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/>
  1059. -<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/>
  1060. -<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/>
  1061. -<mapEntry key="org.eclipse.wst.sse.ui/gotoNextAnnotation" value="false"/>
  1062. -<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/>
  1063. -<mapEntry key="org.eclipse.wst.sse.ui/propertyChangeUpdateActionContributionItem" value="false"/>
  1064. -<mapEntry key="org.eclipse.wst.sse.ui/propertySheet" value="false"/>
  1065. -<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" value="false"/>
  1066. -<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/>
  1067. -<mapEntry key="org.eclipse.wst.sse.ui/structuredPresentationReconciler" value="false"/>
  1068. -<mapEntry key="org.eclipse.wst.sse.ui/structuredPresentationReconciler/time" value="false"/>
  1069. -<mapEntry key="org.eclipse.wst.sse.ui/transferbuilder/time" value="false"/>
  1070. -<mapEntry key="org.eclipse.wst.validation/debug" value="true"/>
  1071. -<mapEntry key="org.eclipse.wst.validation/extraValDetail" value=""/>
  1072. -<mapEntry key="org.eclipse.wst.validation/filter/allExcept" value=""/>
  1073. -<mapEntry key="org.eclipse.wst.validation/timings" value="false"/>
  1074. -<mapEntry key="org.eclipse.wst.validation/timings/tracefile" value=""/>
  1075. -<mapEntry key="org.eclipse.wst.validation/timings/useDoubles" value="false"/>
  1076. -<mapEntry key="org.eclipse.wst.validation/trace/level" value=""/>
  1077. -<mapEntry key="org.eclipse.wst.validation/v1" value="false"/>
  1078. -<mapEntry key="org.eclipse.wst.xml.core/debug" value="true"/>
  1079. -<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentcache" value="false"/>
  1080. -<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentmanager" value="false"/>
  1081. -<mapEntry key="org.eclipse.wst.xml.core/debug/tracefilter" value=""/>
  1082. -<mapEntry key="org.eclipse.wst.xml.ui/projectionperf" value="false"/>
  1083. -<mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/>
  1084. -<mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/>
  1085. -<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/>
  1086. -</mapAttribute>
  1087. -<booleanAttribute key="useCustomFeatures" value="false"/>
  1088. -<booleanAttribute key="useDefaultConfig" value="true"/>
  1089. -<booleanAttribute key="useDefaultConfigArea" value="true"/>
  1090. -<booleanAttribute key="useProduct" value="true"/>
  1091. -<booleanAttribute key="usefeatures" value="false"/>
  1092. -</launchConfiguration>
  1093. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF
  1094. index c4d585c..d48120a 100644
  1095. --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF
  1096. +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF
  1097. @@ -2,7 +2,7 @@ Manifest-Version: 1.0
  1098.  Bundle-ManifestVersion: 2
  1099.  Bundle-Name: %bundleName
  1100.  Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator.manipulator;singleton:=true
  1101. -Bundle-Version: 2.0.0.qualifier
  1102. +Bundle-Version: 2.0.0.v20110808-1657
  1103.  Bundle-Localization: plugin
  1104.  Bundle-ActivationPolicy: lazy
  1105.  Import-Package: org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
  1106. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java
  1107. index 9e2ab18..aa83eb8 100644
  1108. --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java
  1109. +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java
  1110. @@ -109,7 +109,8 @@ public class SimpleConfiguratorManipulatorUtils {
  1111.         public static String createBundleInfoLine(BundleInfo bundleInfo, boolean oldStyle) {
  1112.                 // symbolicName,version,location,startLevel,markedAsStarted
  1113.                 StringBuffer buffer = new StringBuffer();
  1114. -               buffer.append(bundleInfo.getSymbolicName());
  1115. +               String symbolicName = bundleInfo.getSymbolicName();
  1116. +               buffer.append(symbolicName);
  1117.                 buffer.append(',');
  1118.                 buffer.append(bundleInfo.getVersion());
  1119.                 buffer.append(',');
  1120. @@ -117,7 +118,11 @@ public class SimpleConfiguratorManipulatorUtils {
  1121.                 buffer.append(',');
  1122.                 buffer.append(bundleInfo.getStartLevel());
  1123.                 buffer.append(',');
  1124. -               buffer.append(bundleInfo.isMarkedAsStarted());
  1125. +               if (symbolicName.matches(".*simpleconf.*") || symbolicName.matches(".*org.eclipse.core.runtime.*") || symbolicName.matches(".*org.eclipse.equinox.common.*") || symbolicName.matches(".*org.eclipse.equinox.ds.*") || symbolicName.matches(".*p2.reconciler.dropins.*")) {
  1126. +                       buffer.append("true");
  1127. +               } else {
  1128. +                       buffer.append(bundleInfo.isMarkedAsStarted());
  1129. +               }
  1130.                 return buffer.toString();
  1131.         }
  1132.  
  1133. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/.classpath b/bundles/org.eclipse.equinox.simpleconfigurator/.classpath
  1134. index 6f3b481..64c5e31 100644
  1135. --- a/bundles/org.eclipse.equinox.simpleconfigurator/.classpath
  1136. +++ b/bundles/org.eclipse.equinox.simpleconfigurator/.classpath
  1137. @@ -1,6 +1,6 @@
  1138.  <?xml version="1.0" encoding="UTF-8"?>
  1139.  <classpath>
  1140. -       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
  1141. +       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
  1142.         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
  1143.         <classpathentry kind="src" path="src"/>
  1144.         <classpathentry kind="output" path="bin"/>
  1145. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.core.prefs
  1146. index ec72a23..677e4e6 100644
  1147. --- a/bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.core.prefs
  1148. +++ b/bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.core.prefs
  1149. @@ -1,283 +1,285 @@
  1150. -#Thu Mar 04 09:52:05 EST 2010
  1151. -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
  1152. -org.eclipse.jdt.core.formatter.join_lines_in_comments=true
  1153. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
  1154. -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
  1155. -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
  1156. -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
  1157. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
  1158. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
  1159. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
  1160. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
  1161. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
  1162. -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
  1163. -org.eclipse.jdt.core.compiler.compliance=1.4
  1164. -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
  1165. -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
  1166. -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
  1167. -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
  1168. -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
  1169. -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
  1170. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
  1171. -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
  1172. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
  1173. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
  1174. -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
  1175. -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
  1176. -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
  1177. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
  1178. -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
  1179. -org.eclipse.jdt.core.formatter.blank_lines_before_method=1
  1180. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
  1181. -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
  1182. -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
  1183. -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
  1184. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
  1185. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
  1186. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
  1187. -org.eclipse.jdt.core.formatter.comment.format_html=true
  1188. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
  1189. -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
  1190. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
  1191. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
  1192. -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
  1193. -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
  1194. -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
  1195. -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
  1196. -org.eclipse.jdt.core.compiler.debug.localVariable=generate
  1197. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
  1198. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
  1199. -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
  1200. -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
  1201. -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
  1202. -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
  1203. -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
  1204. -org.eclipse.jdt.core.formatter.tabulation.size=4
  1205. -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
  1206. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
  1207. -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
  1208. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
  1209. -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
  1210. -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
  1211. -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
  1212. -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
  1213. -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
  1214. +eclipse.preferences.version=1
  1215.  org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
  1216. +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
  1217.  org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
  1218. -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
  1219. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
  1220. -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
  1221. +org.eclipse.jdt.core.compiler.compliance=1.5
  1222. +org.eclipse.jdt.core.compiler.debug.lineNumber=generate
  1223. +org.eclipse.jdt.core.compiler.debug.localVariable=generate
  1224. +org.eclipse.jdt.core.compiler.debug.sourceFile=generate
  1225. +org.eclipse.jdt.core.compiler.doc.comment.support=enabled
  1226. +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
  1227. +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
  1228. +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
  1229. +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
  1230. +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
  1231.  org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
  1232. -org.eclipse.jdt.core.formatter.tabulation.char=tab
  1233. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
  1234. -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
  1235. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
  1236. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
  1237. -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
  1238. +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
  1239. +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
  1240.  org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
  1241. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
  1242. -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
  1243. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
  1244. -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
  1245. -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
  1246. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
  1247. +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
  1248. +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
  1249. +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
  1250. +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
  1251. +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
  1252. +org.eclipse.jdt.core.compiler.source=1.5
  1253. +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
  1254. +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
  1255. +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
  1256. +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
  1257. +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
  1258. +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
  1259. +org.eclipse.jdt.core.formatter.alignment_for_assignment=0
  1260. +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
  1261. +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
  1262. +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
  1263. +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
  1264. +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
  1265. +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
  1266. +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
  1267.  org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
  1268. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
  1269. -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
  1270. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
  1271. +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
  1272. +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
  1273. +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
  1274.  org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
  1275. -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
  1276. -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
  1277. -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
  1278. -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
  1279. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
  1280. -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
  1281. -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
  1282. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
  1283. -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
  1284. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
  1285. -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
  1286. -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
  1287. -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
  1288. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
  1289. +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
  1290. +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
  1291. +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
  1292. +org.eclipse.jdt.core.formatter.blank_lines_after_package=1
  1293. +org.eclipse.jdt.core.formatter.blank_lines_before_field=0
  1294. +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
  1295.  org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
  1296. -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
  1297. -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
  1298. -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
  1299. -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
  1300. -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
  1301. -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
  1302. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
  1303. -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
  1304. -org.eclipse.jdt.core.formatter.join_wrapped_lines=true
  1305. -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
  1306. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
  1307.  org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
  1308. -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
  1309. -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
  1310. -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
  1311. -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
  1312. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
  1313. -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
  1314. -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
  1315. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
  1316. +org.eclipse.jdt.core.formatter.blank_lines_before_method=1
  1317. +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
  1318. +org.eclipse.jdt.core.formatter.blank_lines_before_package=0
  1319. +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
  1320. +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
  1321. +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
  1322. +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
  1323.  org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
  1324. +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
  1325. +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
  1326. +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
  1327. +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
  1328. +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
  1329. +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
  1330. +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
  1331. +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
  1332. +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
  1333. +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
  1334. +org.eclipse.jdt.core.formatter.comment.format_block_comments=false
  1335. +org.eclipse.jdt.core.formatter.comment.format_header=false
  1336. +org.eclipse.jdt.core.formatter.comment.format_html=true
  1337. +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
  1338. +org.eclipse.jdt.core.formatter.comment.format_line_comments=false
  1339. +org.eclipse.jdt.core.formatter.comment.format_source_code=true
  1340. +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
  1341. +org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
  1342. +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
  1343. +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
  1344. +org.eclipse.jdt.core.formatter.comment.line_length=80
  1345. +org.eclipse.jdt.core.formatter.compact_else_if=true
  1346. +org.eclipse.jdt.core.formatter.continuation_indentation=2
  1347. +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
  1348. +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
  1349. +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
  1350.  org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
  1351. +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
  1352.  org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
  1353. -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
  1354. -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
  1355. -org.eclipse.jdt.core.formatter.blank_lines_before_field=0
  1356. -org.eclipse.jdt.core.compiler.debug.sourceFile=generate
  1357. -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
  1358. +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
  1359. +org.eclipse.jdt.core.formatter.indent_empty_lines=false
  1360.  org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
  1361. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
  1362. -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
  1363. -org.eclipse.jdt.core.formatter.comment.format_block_comments=false
  1364. -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
  1365. -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
  1366. +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
  1367. +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
  1368. +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
  1369. +org.eclipse.jdt.core.formatter.indentation.size=4
  1370. +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
  1371. +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
  1372. +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
  1373. +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
  1374. +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
  1375. +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
  1376. +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
  1377. +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
  1378. +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
  1379. +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
  1380. +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
  1381. +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
  1382. +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
  1383. +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
  1384. +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
  1385. +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
  1386. +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
  1387. +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
  1388. +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
  1389. +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
  1390. +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
  1391. +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
  1392. +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
  1393. +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
  1394. +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
  1395. +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
  1396. +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
  1397.  org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
  1398. +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
  1399. +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
  1400. +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
  1401. +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
  1402. +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
  1403. +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
  1404. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
  1405.  org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
  1406. -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
  1407. -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
  1408. -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
  1409. -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
  1410. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
  1411. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
  1412. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
  1413. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
  1414.  org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
  1415. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
  1416. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
  1417. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
  1418. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
  1419. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
  1420. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
  1421. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
  1422. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
  1423. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
  1424. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
  1425. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
  1426. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
  1427. +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
  1428. +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
  1429. +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
  1430. +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
  1431. +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
  1432. +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
  1433. +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
  1434. +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
  1435. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
  1436. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
  1437. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
  1438. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
  1439. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
  1440. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
  1441. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
  1442. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
  1443. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
  1444.  org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
  1445. -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
  1446. -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
  1447. -org.eclipse.jdt.core.formatter.lineSplit=800
  1448. -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
  1449. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
  1450. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
  1451. +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
  1452. +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
  1453. +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
  1454.  org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
  1455. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
  1456.  org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
  1457. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
  1458. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
  1459. -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
  1460. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
  1461. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
  1462. -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
  1463. -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
  1464. -org.eclipse.jdt.core.compiler.debug.lineNumber=generate
  1465. +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
  1466. +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
  1467. +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
  1468. +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
  1469. +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
  1470. +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
  1471. +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
  1472. +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
  1473. +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
  1474. +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
  1475. +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
  1476. +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
  1477. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
  1478.  org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
  1479. -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
  1480. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
  1481. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
  1482. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
  1483. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
  1484. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
  1485. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
  1486.  org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
  1487. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
  1488. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
  1489. -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
  1490. -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
  1491. -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
  1492. -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
  1493. -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
  1494. -org.eclipse.jdt.core.formatter.blank_lines_before_package=0
  1495. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
  1496. -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
  1497. -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
  1498. -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
  1499. -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
  1500. -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
  1501. -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
  1502. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
  1503. -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
  1504. -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
  1505. -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
  1506. -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
  1507. -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
  1508. -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
  1509. -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
  1510. -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
  1511. -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
  1512. -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
  1513. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
  1514. -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
  1515. -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
  1516. -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
  1517. -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
  1518. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
  1519.  org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
  1520. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
  1521. -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
  1522. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
  1523. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
  1524. -org.eclipse.jdt.core.formatter.comment.format_header=false
  1525. -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
  1526. -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
  1527. -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
  1528. -eclipse.preferences.version=1
  1529. -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
  1530. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
  1531. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
  1532. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
  1533. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
  1534. +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
  1535.  org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
  1536. -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
  1537. -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
  1538. -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
  1539. -org.eclipse.jdt.core.compiler.doc.comment.support=enabled
  1540. -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
  1541. -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
  1542. -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
  1543. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
  1544. -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
  1545. -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
  1546. -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
  1547. -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
  1548. -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
  1549. -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
  1550. -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
  1551. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
  1552. -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
  1553. -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
  1554. -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
  1555. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
  1556. -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
  1557. -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
  1558. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
  1559. -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
  1560. -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
  1561. -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
  1562. -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
  1563. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
  1564. -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
  1565. -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
  1566. -org.eclipse.jdt.core.formatter.blank_lines_after_package=1
  1567. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
  1568. -org.eclipse.jdt.core.formatter.indentation.size=4
  1569. -org.eclipse.jdt.core.formatter.alignment_for_assignment=0
  1570. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
  1571.  org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
  1572. +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
  1573. +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
  1574. +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
  1575.  org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
  1576. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
  1577. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
  1578. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
  1579. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
  1580. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
  1581. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
  1582. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
  1583. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
  1584. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
  1585. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
  1586. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
  1587. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
  1588. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
  1589. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
  1590. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
  1591. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
  1592. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
  1593. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
  1594. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
  1595. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
  1596. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
  1597. +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
  1598. +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
  1599. +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
  1600. +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
  1601. +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
  1602. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
  1603. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
  1604. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
  1605. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
  1606. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
  1607. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
  1608. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
  1609. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
  1610.  org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
  1611. -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
  1612. -org.eclipse.jdt.core.formatter.indent_empty_lines=false
  1613. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
  1614. +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
  1615. +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
  1616. +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
  1617. +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
  1618. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
  1619. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
  1620. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
  1621. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
  1622. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
  1623. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
  1624. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
  1625. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
  1626. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
  1627.  org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
  1628. -org.eclipse.jdt.core.formatter.comment.format_line_comments=false
  1629. -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
  1630. -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
  1631. -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
  1632. -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
  1633. -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
  1634. -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
  1635. -org.eclipse.jdt.core.formatter.compact_else_if=true
  1636. -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
  1637. -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
  1638. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
  1639. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
  1640. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
  1641. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
  1642. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
  1643. -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
  1644.  org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
  1645. -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
  1646. -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
  1647. -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
  1648. -org.eclipse.jdt.core.compiler.source=1.3
  1649. -org.eclipse.jdt.core.formatter.comment.format_source_code=true
  1650. -org.eclipse.jdt.core.formatter.comment.line_length=80
  1651. -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
  1652. -org.eclipse.jdt.core.formatter.continuation_indentation=2
  1653. -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
  1654. -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
  1655. -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
  1656. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
  1657. +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
  1658. +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
  1659. +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
  1660. +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
  1661. +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
  1662. +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
  1663. +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
  1664. +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
  1665. +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
  1666. +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
  1667. +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
  1668. +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
  1669. +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
  1670. +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
  1671. +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
  1672. +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
  1673. +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
  1674. +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
  1675. +org.eclipse.jdt.core.formatter.join_lines_in_comments=true
  1676. +org.eclipse.jdt.core.formatter.join_wrapped_lines=true
  1677. +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
  1678. +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
  1679. +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
  1680. +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
  1681. +org.eclipse.jdt.core.formatter.lineSplit=800
  1682. +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
  1683. +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
  1684. +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
  1685. +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
  1686. +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
  1687. +org.eclipse.jdt.core.formatter.tabulation.char=tab
  1688. +org.eclipse.jdt.core.formatter.tabulation.size=4
  1689. +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
  1690. +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
  1691. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
  1692. index a23b345..bb167db 100644
  1693. --- a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
  1694. +++ b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
  1695. @@ -1,7 +1,7 @@
  1696.  Manifest-Version: 1.0
  1697.  Bundle-ManifestVersion: 2
  1698.  Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator;singleton:=true
  1699. -Bundle-Version: 1.0.300.qualifier
  1700. +Bundle-Version: 1.0.300.v20110815-1744
  1701.  Bundle-Name: %bundleName
  1702.  Bundle-Vendor: %providerName
  1703.  Bundle-Localization: plugin
  1704. @@ -23,5 +23,4 @@ Export-Package: org.eclipse.equinox.internal.provisional.configurator;
  1705.   org.eclipse.equinox.internal.simpleconfigurator;x-friends:="org.eclipse.equinox.simpleconfigurator.manipulator",
  1706.   org.eclipse.equinox.internal.simpleconfigurator.console;x-internal:=true,
  1707.   org.eclipse.equinox.internal.simpleconfigurator.utils;x-friends:="org.eclipse.equinox.simpleconfigurator.manipulator"
  1708. -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
  1709. - J2SE-1.4
  1710. +Bundle-RequiredExecutionEnvironment: J2SE-1.5
  1711. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
  1712. index dbd2aec..cda229c 100644
  1713. --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
  1714. +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
  1715. @@ -85,9 +85,11 @@ public class SimpleConfiguratorImpl implements Configurator {
  1716.                                 if (configURL.length == 1)
  1717.                                         return userConfig.exists() ? userConfig.toURL() : null;
  1718.  
  1719. -                               File sharedConfig = new File(configURL[1].getFile(), url.getFile());
  1720. -                               if (!userConfig.exists())
  1721. +                               //refer to the directory rather than to the specific file
  1722. +                               File sharedConfig = new File(configURL[1].getFile(), url.getFile()).getParentFile();
  1723. +                               if (!userConfig.exists()) {
  1724.                                         return sharedConfig.exists() ? sharedConfig.toURL() : null;
  1725. +                               }
  1726.  
  1727.                                 if (!sharedConfig.exists())
  1728.                                         return userConfig.toURL();
  1729. @@ -99,7 +101,8 @@ public class SimpleConfiguratorImpl implements Configurator {
  1730.  
  1731.                                 URL userConfigURL = userConfig.toURL();
  1732.                                 List userBundles = SimpleConfiguratorUtils.readConfiguration(userConfigURL, base);
  1733. -
  1734. +                               System.out.println("Get URL result " + ((userBundles.containsAll(sharedBundles)) ? userConfigURL : sharedConfigURL));;
  1735. +                               //TODO: This check here should also verify that app core bundles are loaded
  1736.                                 return (userBundles.containsAll(sharedBundles)) ? userConfigURL : sharedConfigURL;
  1737.                         }
  1738.                 } catch (MalformedURLException e) {
  1739. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java
  1740. index 66454c0..57efa3f 100644
  1741. --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java
  1742. +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java
  1743. @@ -1,13 +1,15 @@
  1744.  /*******************************************************************************
  1745. - * Copyright (c) 2007, 2010 IBM Corporation and others. All rights reserved.
  1746. + * Copyright (c) 2007, 2012 IBM Corporation and others. All rights reserved.
  1747.   * This program and the accompanying materials are made available under the
  1748.   * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  1749.   * and is available at http://www.eclipse.org/legal/epl-v10.html
  1750.   *
  1751.   * Contributors: IBM Corporation - initial API and implementation
  1752. + * Red Hat, Inc. - work on multiple bundles.info
  1753.   ******************************************************************************/
  1754.  package org.eclipse.equinox.internal.simpleconfigurator.utils;
  1755.  
  1756. +import java.io.File;
  1757.  import java.net.*;
  1758.  import org.eclipse.equinox.internal.simpleconfigurator.console.ConfiguratorCommandProvider;
  1759.  import org.eclipse.osgi.framework.console.CommandProvider;
  1760. @@ -24,10 +26,20 @@ public class EquinoxUtils {
  1761.  
  1762.                 URL baseURL = configLocation.getURL();
  1763.                 if (configLocation.getParentLocation() != null && configLocation.getURL() != null) {
  1764. -                       if (baseURL == null)
  1765. +                       if (baseURL == null) {
  1766.                                 return new URL[] {configLocation.getParentLocation().getURL()};
  1767. -                       else
  1768. -                               return new URL[] {baseURL, configLocation.getParentLocation().getURL()};
  1769. +                       } else {
  1770. +                               File scatteredBundlesInfos = getScatteredBundleInfos();
  1771. +                               if (scatteredBundlesInfos == null) {
  1772. +                                       return new URL[] {baseURL, configLocation.getParentLocation().getURL()};
  1773. +                               } else {
  1774. +                                       try {
  1775. +                                               return new URL[] {baseURL, configLocation.getParentLocation().getURL(), scatteredBundlesInfos.toURL()};
  1776. +                                       } catch (MalformedURLException e) {
  1777. +                                               return new URL[] {baseURL, configLocation.getParentLocation().getURL()};
  1778. +                                       }
  1779. +                               }
  1780. +                       }
  1781.                 }
  1782.                 if (baseURL != null)
  1783.                         return new URL[] {baseURL};
  1784. @@ -35,6 +47,17 @@ public class EquinoxUtils {
  1785.                 return null;
  1786.         }
  1787.  
  1788. +       private static File getScatteredBundleInfos() {
  1789. +               String scatteredBundlesInfoLocation = System.getProperty("org.eclipse.p2.bundlesinfofolder");
  1790. +               if (scatteredBundlesInfoLocation == null)
  1791. +                       return null;
  1792. +               File f = new File(scatteredBundlesInfoLocation);
  1793. +               //various *.info folders will be located in that directory
  1794. +               if (f.exists() && f.isDirectory())
  1795. +                       return f;
  1796. +               return null;
  1797. +       }
  1798. +
  1799.         public static Location getConfigLocation(BundleContext context) {
  1800.                 Filter filter = null;
  1801.                 try {
  1802. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
  1803. index aa0235a..69981f7 100644
  1804. --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
  1805. +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
  1806. @@ -27,6 +27,24 @@ public class SimpleConfiguratorUtils {
  1807.         private static final String ENCODED_COMMA = "%2C";
  1808.  
  1809.         public static List readConfiguration(URL url, URI base) throws IOException {
  1810. +               File f = new File(url.getFile());
  1811. +               if (f.isFile()) {
  1812. +                       return readConfigurationFromFile(url, base);
  1813. +               } else {
  1814. +                       ArrayList result = new ArrayList();
  1815. +                       File[] listFiles = f.listFiles();
  1816. +                       for (File file : listFiles) {
  1817. +                               if (file.getName().endsWith(".info")) {
  1818. +                                       System.out.println("Reading configuration from file " + file.getName());
  1819. +                                       List list = readConfiguration(file.toURL(), base);
  1820. +                                       result.addAll(list);
  1821. +                               }
  1822. +                       }
  1823. +                       return result;
  1824. +               }
  1825. +       }
  1826. +
  1827. +       private static List readConfigurationFromFile(URL url, URI base) throws IOException {
  1828.                 InputStream stream = null;
  1829.                 try {
  1830.                         stream = url.openStream();
RAW Paste Data
Top