diff options
36 files changed, 7 insertions, 749 deletions
diff --git a/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch b/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch index b8541dcab..7d927a0b5 100644 --- a/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch +++ b/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch @@ -18,5 +18,5 @@ <stringAttribute key="target_bundles" value="org.eclipse.osgi.services@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.common@2:true,org.eclipse.core.net@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.app@default:default,org.eclipse.ecf@default:default,javax.servlet@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.logging@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.preferences@default:default,org.apache.commons.httpclient@default:default,org.eclipse.core.jobs@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.core.variables@default:default"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<stringAttribute key="workspace_bundles" value="org.eclipse.equinox.p2.touchpoint.osgi@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.exemplarysetup@default:true,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.console@default:true,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.sat4j.core@default:default,org.eclipse.equinox.simpleconfigurator@1:true"/> +<stringAttribute key="workspace_bundles" value="org.eclipse.equinox.p2.touchpoint.osgi@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.exemplarysetup@default:true,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.console@default:true,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.sat4j.core@default:default,org.eclipse.equinox.simpleconfigurator@1:true"/> </launchConfiguration> diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF index 19c380c86..394b34494 100644 --- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF @@ -27,7 +27,6 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ org.eclipse.equinox.p2.operations, org.eclipse.equinox.p2.publisher, org.eclipse.equinox.p2.publisher.eclipse, - org.eclipse.equinox.p2.ql, org.eclipse.equinox.p2.reconciler.dropins, org.eclipse.equinox.p2.repository, org.eclipse.equinox.p2.repository.tools, diff --git a/bundles/org.eclipse.equinox.p2.installer/installer.product b/bundles/org.eclipse.equinox.p2.installer/installer.product index aa1cbd51f..67afddb5a 100644 --- a/bundles/org.eclipse.equinox.p2.installer/installer.product +++ b/bundles/org.eclipse.equinox.p2.installer/installer.product @@ -69,7 +69,6 @@ <plugin id="org.eclipse.equinox.p2.jarprocessor"/> <plugin id="org.eclipse.equinox.p2.metadata"/> <plugin id="org.eclipse.equinox.p2.metadata.repository"/> - <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/> diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF index 5663eb53b..cb228c068 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; org.eclipse.equinox.p2.metadata.repository, org.eclipse.equinox.p2.operations, org.eclipse.equinox.p2.publisher, - org.eclipse.equinox.p2.ql, org.eclipse.equinox.p2.ui, org.eclipse.equinox.p2.touchpoint.eclipse, org.eclipse.equinox.p2.repository.tools, @@ -29,9 +28,8 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; x-friends:="org.eclipse.equinox.p2.artifact.repository, org.eclipse.equinox.p2.directorywatcher, org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.publisher, - org.eclipse.equinox.p2.ql", - org.eclipse.equinox.internal.p2.metadata.expression.parser;x-friends:="org.eclipse.equinox.p2.ql", + org.eclipse.equinox.p2.publisher", + org.eclipse.equinox.internal.p2.metadata.expression.parser, org.eclipse.equinox.internal.p2.metadata.index; x-friends:="org.eclipse.equinox.p2.artifact.repository, org.eclipse.equinox.p2.director, @@ -41,7 +39,6 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; org.eclipse.equinox.p2.engine, org.eclipse.equinox.p2.metadata.repository, org.eclipse.equinox.p2.publisher, - org.eclipse.equinox.p2.ql, org.eclipse.equinox.p2.ui, org.eclipse.equinox.p2.operations, org.eclipse.equinox.p2.tests, @@ -66,7 +63,6 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; org.eclipse.equinox.p2.metadata.repository, org.eclipse.equinox.p2.operations, org.eclipse.equinox.p2.publisher, - org.eclipse.equinox.p2.ql, org.eclipse.equinox.p2.reconciler.dropins, org.eclipse.equinox.p2.repository.tools, org.eclipse.equinox.p2.touchpoint.eclipse, diff --git a/bundles/org.eclipse.equinox.p2.ql/.classpath b/bundles/org.eclipse.equinox.p2.ql/.classpath deleted file mode 100644 index 64c5e31b7..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/bundles/org.eclipse.equinox.p2.ql/.gitignore b/bundles/org.eclipse.equinox.p2.ql/.gitignore deleted file mode 100644 index c5e82d745..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/.gitignore +++ /dev/null @@ -1 +0,0 @@ -bin
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.p2.ql/.project b/bundles/org.eclipse.equinox.p2.ql/.project deleted file mode 100644 index bf129f044..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/.project +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.equinox.p2.ql</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ds.core.builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> diff --git a/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index b069b3cf4..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Nov 12 08:11:03 CET 2009 -eclipse.preferences.version=1 -encoding//model/p2ql.ecorediag=UTF-8 diff --git a/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8ed50e139..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,371 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=error -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=false -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false -org.eclipse.jdt.core.formatter.comment.format_line_comments=false -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=800 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 014501b61..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,57 +0,0 @@ -#Sun Sep 23 11:57:54 EDT 2007 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_core -formatter_settings_version=11 -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=; -org.eclipse.jdt.ui.ondemandthreshold=3 -org.eclipse.jdt.ui.staticondemandthreshold=3 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/> -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.format_source_code=true -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/bundles/org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF deleted file mode 100644 index 9d028fdec..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.equinox.p2.ql;singleton:=true -Bundle-Version: 2.0.200.qualifier -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Export-Package: org.eclipse.equinox.p2.ql;version="2.0.0" -Require-Bundle: org.eclipse.equinox.common;bundle-version="3.5.1" -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - J2SE-1.4, - CDC-1.1/Foundation-1.1 -Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.equinox.p2.metadata.expression;version="[2.0.0,3.0.0)" diff --git a/bundles/org.eclipse.equinox.p2.ql/about.html b/bundles/org.eclipse.equinox.p2.ql/about.html deleted file mode 100644 index 460233046..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 2, 2006</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -</body> -</html>
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.p2.ql/build.properties b/bundles/org.eclipse.equinox.p2.ql/build.properties deleted file mode 100644 index 3c57487e7..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################### -# Copyright (c) 2011 Cloudsmith Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Cloudsmith Inc. - initial API and implementation -# Ericsson AB (Pascal Rapicault) - enable standalone p2 build -############################################################################### -bin.includes = .,\ - META-INF/,\ - plugin.properties,\ - about.html -source.. = src/ -output.. = bin/ -src.includes = about.html,\ - model/ -javacWarnings..=+fieldHiding diff --git a/bundles/org.eclipse.equinox.p2.ql/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.p2.ql/forceQualifierUpdate.txt deleted file mode 100644 index 56f1032a8..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/forceQualifierUpdate.txt +++ /dev/null @@ -1,2 +0,0 @@ -# To force a version qualifier update add the bug here -Bug 403352 - Update all parent versions to match our build stream diff --git a/bundles/org.eclipse.equinox.p2.ql/model/p2ql.bnf b/bundles/org.eclipse.equinox.p2.ql/model/p2ql.bnf deleted file mode 100644 index 476f54187..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/model/p2ql.bnf +++ /dev/null @@ -1,67 +0,0 @@ -condition - : orExpression ( '?' orExpression ':' orExpression )? - ; - -orExpression : andExpression ( '||' andExpression )* ; - -andExpression : binaryExpression ( '&&' binaryExpression )* ; - -binaryExpression : notExpression ( op notExpression )?; - -op : '=' | '!=' | '>' | '>=' | '<' | '<=' | '~=' ; - -notExpression - : '!' notExpression - | collectionExpression - ; - -collectionExpression - : memberExpression ( '.' collectionFunction )* - ; - -memberExpression : constructor ( ( '.' ID ) | ( '[' memberExpression ']' ) )* ; - -constructor - : ( filter | version | range | class ) '(' unaryExpression ')' - | set '(' ( collectionExpression ( ',' collectionExpression )* )? ')' - | unaryExpression - ; - -collectionFunction - : ( select | reject | exists | all | traverse ) '(' lambdaDefinition ')' - | limit '(' memberExpression ')' - | unique '(' memberExpression? ')' - | latest '(' lambdaDefinition? ')' - ; - -lambdaDefinition - : initializer ( ',' initializer )* ( ',' '{' lambda '}' )? - | '{' lambda '}' - | lambda - ; - -initializer - : '_' - | condition - ; - -lambda - : ( ID ( ',' ID )* )? '|' condition - ; - -unaryExpression - : '(' condition ')' - | '[' condition ( ',' condition )* ']' // #array construct - | '/' regexpPattern '/' - | STRING - | INT - | parameter - | 'null' - | 'true' - | 'false' - | ID - ; - -parameter - : '$' INT | ID - ; diff --git a/bundles/org.eclipse.equinox.p2.ql/plugin.properties b/bundles/org.eclipse.equinox.p2.ql/plugin.properties deleted file mode 100644 index 298bb7abc..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/plugin.properties +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################### -# Copyright (c) 2011 Cloudsmith Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Cloudsmith Inc. - initial API and implementation -############################################################################### - -# <copyright> -# </copyright> -# -# $Id: plugin.properties,v 1.3 2011/05/02 22:47:26 irbull Exp $ - -pluginName = Equinox Provisioning p2 query language -providerName = Eclipse.org - Equinox diff --git a/bundles/org.eclipse.equinox.p2.ql/pom.xml b/bundles/org.eclipse.equinox.p2.ql/pom.xml deleted file mode 100644 index 93ace6c44..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>org.eclipse.equinox.p2-parent</artifactId> - <groupId>org.eclipse</groupId> - <version>4.5.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath> - </parent> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.p2.ql</artifactId> - <version>2.0.200-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project> diff --git a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/IQLExpression.java b/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/IQLExpression.java deleted file mode 100644 index 4e25f1f04..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/IQLExpression.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Cloudsmith Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cloudsmith Inc. - initial API and implementation - *******************************************************************************/ -package org.eclipse.equinox.p2.ql; - -import org.eclipse.equinox.p2.metadata.expression.IExpression; - -/** - * @noextend This interface is not intended to be extended by clients. - * @noimplement This interface is not intended to be implemented by clients. - * @since 2.0 - */ -public interface IQLExpression extends IExpression { - // -} diff --git a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/IQLFactory.java b/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/IQLFactory.java deleted file mode 100644 index 05e0a7bca..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/IQLFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Cloudsmith Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cloudsmith Inc. - initial API and implementation - *******************************************************************************/ -package org.eclipse.equinox.p2.ql; - -import org.eclipse.equinox.p2.metadata.expression.IExpressionFactory; - -/** - * This interface provides all the factory methods needed to create the all possible - * nodes of the expression tree. - */ -public interface IQLFactory extends IExpressionFactory { - // -} diff --git a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/package.html b/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/package.html deleted file mode 100644 index b23b0f12e..000000000 --- a/bundles/org.eclipse.equinox.p2.ql/src/org/eclipse/equinox/p2/ql/package.html +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>Package-level Javadoc</title> -</head> -<body> -A query language specialized in the querying of p2 constructs. -<h2> -Package Specification</h2> -<p> -This package specifies a query language specialized in the handling p2 constructs. -service. -<p> -@since 2.0 -<p> -</body> -</html> diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product b/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product index 0fc475c6d..8d66e77f7 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product @@ -50,7 +50,6 @@ <plugin id="org.eclipse.equinox.p2.metadata"/> <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.publisher"/> - <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.reconciler.dropins"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch b/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch index b8fa20175..8105a3f91 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch +++ b/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch @@ -60,8 +60,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.browser@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.maven.ide.eclipse.editor.xml@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.pde.api.tools.ee.j2se14@default:false,aniefer.junit.headless@default:default,org.eclipse.ui.views@default:default,org.eclipse.team.core@default:default,org.maven.ide.eclipse.nexus_indexer@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.core.databinding.beans@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.search@default:default,org.eclipse.pde@default:default,com.mountainminds.eclemma.doc@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.ui@default:default,org.apache.jasper@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.wst.common.emf@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.forms@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.pde.api.tools.ee.javase16@default:false,org.eclipse.pde.runtime@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.maven.ide.eclipse.maven_embedder@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ant.launching@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.equinox.simpleconfigurator@default:default,org.eclipse.pde.api.tools.ee.j2se15@default:false,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.wst.validation@default:default,org.eclipse.releng.tools@default:default,org.eclipse.help.base@default:default,org.apache.ant@default:default,org.eclipse.xsd@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.externaltools@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.debug.ui@default:default,org.eclipse.jdt.launching.macosx@default:default,org.knoplerfish.httpconsole@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.core.filebuffers@default:default,org.maven.ide.eclipse.launching@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.team.svn@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.maven.ide.eclipse@default:default,org.eclipse.ui@default:default,org.eclipse.help.ui@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.pde.api.tools.ee.osgiminimum10@default:false,org.eclipse.ui.ide@default:default,org.eclipse.team.ui@default:default,org.eclipse.help@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.intro@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.update.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.commands@default:default,org.eclipse.pde.api.tools.ui@default:default,org.apache.xerces@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi.services@default:default,org.eclipse.zest.core@default:default,org.apache.commons.codec@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.common@2:true,org.maven.ide.eclipse.refactoring@default:default,org.maven.ide.eclipse.maven_model_edit@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.pde.build@default:default,org.objectweb.asm@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ant.ui@default:default,org.eclipse.help.appserver@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.runtime@default:true,com.mountainminds.eclemma.core@default:default,org.eclipse.jdt.debug.ui@default:default,com.mountainminds.eclemma.ui@default:default,org.eclipse.jgit@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.emf.common.ui@default:default,org.sat4j.pb@default:default,org.junit*3.8.2.v20090203-1005@default:default,org.eclipse.help.webapp@default:default,org.eclipse.jdt.junit.runtime@default:default,org.apache.commons.el@default:default,org.hamcrest.core@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.junit*4.8.1.v4_8_1_v20100114-1600@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.cvs@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt@default:default,org.eclipse.pde.ua.ui@default:default,com.ibm.icu@default:default,org.eclipse.platform@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.net@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.pde.api.tools.ee.j2se12@default:false,org.eclipse.compare.core@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.pde.api.tools.ee.osgiminimum11@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.pde.api.tools.ee.j2se13@default:false,org.eclipse.core.boot@default:default,org.eclipse.sdk@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.core.externaltools@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.debug.core@default:default,org.eclipse.osgi.util@default:default,Shape1@default:default,org.eclipse.jsch.core@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.compare@default:default,javax.xml@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.registry@default:default,org.sat4j.core@default:default,org.eclipse.pde.api.tools.ee.cdcfoundation11@default:false,org.eclipse.equinox.p2.ql@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.egit.ui@default:default,org.eclipse.wst.common.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.egit.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.junit4@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.pde.core@default:default,org.eclipse.ant.core@default:default,org.maven.ide.eclipse.pr@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.http.registry@default:default,org.maven.ide.eclipse.editor@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.jdt.core@default:default,org.apache.lucene@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.text@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.maven.ide.eclipse.dependency_tree@default:default,org.eclipse.pde.api.tools.ee.cdcfoundation10@default:false,org.eclipse.rcp@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.maven.ide.eclipse.archetype_common@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.publisher@default:default,org.maven.ide.eclipse.jdt@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.pde.api.tools.ee.osgiminimum12@default:false,org.eclipse.egit@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.runtime.compatibility@default:default,org.apache.commons.logging@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.pde.api.tools.ee.jre11@default:false,org.eclipse.jdt.doc.user@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.preferences@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.filesystem@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.osgi,org.eclipse.team.cvs.ui@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jem.util@default:default,org.apache.xml.resolver@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,ie.wombat.jbdiff.test@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.testserver@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.sat4j.core@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.examples.rcp.prestartupdate@default:default,org.eclipse.equinox.p2.tests.ui@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.equinox.p2.afterthefact@default:default,org.easymock@default:default,org.eclipse.equinox.p2.tests.optimizers@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.ui.admin@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.pde.ui@default:default,org.eclipse.equinox.p2.tests.discovery@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,com.sonatype.nexus.p2.installer.ui@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.tests@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.pde@default:default,org.eclipse.test.performance@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.tests.verifier@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.examples.rcp.cloud@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.apache.commons.codec@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.core.tests.harness@default:default,org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.commons.logging@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.pde.build.tests@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.frameworkadmin.test@default:default,org.eclipse.pde.build@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.installer@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.equinox.p2.diagnostic@default:default,org.eclipse.equinox.p2.ui.admin.rcp@default:default,org.eclipse.equinox.http@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.pde.ui.tests@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.apache.commons.httpclient@default:default,org.eclipse.pde.core@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.browser@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.maven.ide.eclipse.editor.xml@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.pde.api.tools.ee.j2se14@default:false,aniefer.junit.headless@default:default,org.eclipse.ui.views@default:default,org.eclipse.team.core@default:default,org.maven.ide.eclipse.nexus_indexer@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.core.databinding.beans@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.search@default:default,org.eclipse.pde@default:default,com.mountainminds.eclemma.doc@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.ui@default:default,org.apache.jasper@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.wst.common.emf@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.forms@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.pde.api.tools.ee.javase16@default:false,org.eclipse.pde.runtime@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.maven.ide.eclipse.maven_embedder@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ant.launching@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.equinox.simpleconfigurator@default:default,org.eclipse.pde.api.tools.ee.j2se15@default:false,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.wst.validation@default:default,org.eclipse.releng.tools@default:default,org.eclipse.help.base@default:default,org.apache.ant@default:default,org.eclipse.xsd@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.externaltools@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.debug.ui@default:default,org.eclipse.jdt.launching.macosx@default:default,org.knoplerfish.httpconsole@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.core.filebuffers@default:default,org.maven.ide.eclipse.launching@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.team.svn@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.maven.ide.eclipse@default:default,org.eclipse.ui@default:default,org.eclipse.help.ui@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.pde.api.tools.ee.osgiminimum10@default:false,org.eclipse.ui.ide@default:default,org.eclipse.team.ui@default:default,org.eclipse.help@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.intro@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.update.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.commands@default:default,org.eclipse.pde.api.tools.ui@default:default,org.apache.xerces@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi.services@default:default,org.eclipse.zest.core@default:default,org.apache.commons.codec@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.common@2:true,org.maven.ide.eclipse.refactoring@default:default,org.maven.ide.eclipse.maven_model_edit@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.pde.build@default:default,org.objectweb.asm@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ant.ui@default:default,org.eclipse.help.appserver@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.runtime@default:true,com.mountainminds.eclemma.core@default:default,org.eclipse.jdt.debug.ui@default:default,com.mountainminds.eclemma.ui@default:default,org.eclipse.jgit@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.emf.common.ui@default:default,org.sat4j.pb@default:default,org.junit*3.8.2.v20090203-1005@default:default,org.eclipse.help.webapp@default:default,org.eclipse.jdt.junit.runtime@default:default,org.apache.commons.el@default:default,org.hamcrest.core@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.junit*4.8.1.v4_8_1_v20100114-1600@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.cvs@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt@default:default,org.eclipse.pde.ua.ui@default:default,com.ibm.icu@default:default,org.eclipse.platform@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.net@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.pde.api.tools.ee.j2se12@default:false,org.eclipse.compare.core@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.pde.api.tools.ee.osgiminimum11@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.pde.api.tools.ee.j2se13@default:false,org.eclipse.core.boot@default:default,org.eclipse.sdk@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.core.externaltools@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.debug.core@default:default,org.eclipse.osgi.util@default:default,Shape1@default:default,org.eclipse.jsch.core@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.compare@default:default,javax.xml@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.registry@default:default,org.sat4j.core@default:default,org.eclipse.pde.api.tools.ee.cdcfoundation11@default:false,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.egit.ui@default:default,org.eclipse.wst.common.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.egit.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.junit4@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.pde.core@default:default,org.eclipse.ant.core@default:default,org.maven.ide.eclipse.pr@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.http.registry@default:default,org.maven.ide.eclipse.editor@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.jdt.core@default:default,org.apache.lucene@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.text@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.maven.ide.eclipse.dependency_tree@default:default,org.eclipse.pde.api.tools.ee.cdcfoundation10@default:false,org.eclipse.rcp@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.maven.ide.eclipse.archetype_common@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.publisher@default:default,org.maven.ide.eclipse.jdt@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.pde.api.tools.ee.osgiminimum12@default:false,org.eclipse.egit@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.runtime.compatibility@default:default,org.apache.commons.logging@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.pde.api.tools.ee.jre11@default:false,org.eclipse.jdt.doc.user@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.preferences@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.filesystem@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.osgi,org.eclipse.team.cvs.ui@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jem.util@default:default,org.apache.xml.resolver@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,ie.wombat.jbdiff.test@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.testserver@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.sat4j.core@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.examples.rcp.prestartupdate@default:default,org.eclipse.equinox.p2.tests.ui@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.equinox.p2.afterthefact@default:default,org.easymock@default:default,org.eclipse.equinox.p2.tests.optimizers@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.ui.admin@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.pde.ui@default:default,org.eclipse.equinox.p2.tests.discovery@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,com.sonatype.nexus.p2.installer.ui@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.tests@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.pde@default:default,org.eclipse.test.performance@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.tests.verifier@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.examples.rcp.cloud@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.apache.commons.codec@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.core.tests.harness@default:default,org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.commons.logging@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.pde.build.tests@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.frameworkadmin.test@default:default,org.eclipse.pde.build@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.installer@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.equinox.p2.diagnostic@default:default,org.eclipse.equinox.p2.ui.admin.rcp@default:default,org.eclipse.equinox.http@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.pde.ui.tests@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.apache.commons.httpclient@default:default,org.eclipse.pde.core@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF index e06420336..167761509 100644 --- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF @@ -37,7 +37,6 @@ Require-Bundle: org.eclipse.equinox.frameworkadmin, org.eclipse.equinox.p2.tests.verifier;bundle-version="1.0.0", org.eclipse.equinox.security;bundle-version="1.0.0", org.eclipse.equinox.p2.engine;bundle-version="2.0.0", - org.eclipse.equinox.p2.ql, org.eclipse.equinox.p2.updatesite;bundle-version="1.0.200", org.eclipse.equinox.p2.garbagecollector;bundle-version="1.0.100", org.sat4j.core;bundle-version="2.2.0", @@ -99,7 +98,6 @@ Import-Package: javax.xml.parsers, org.eclipse.equinox.p2.metadata.expression;version="[2.0.0,3.0.0)", org.eclipse.equinox.p2.metadata.io, org.eclipse.equinox.p2.planner;version="[2.0.0,3.0.0)", - org.eclipse.equinox.p2.ql;version="[2.0.0,3.0.0)", org.eclipse.equinox.p2.query;version="[2.0.0,3.0.0)", org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)", org.eclipse.equinox.p2.repository.metadata.spi;version="[2.0.0,3.0.0)", diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch index 20af33589..4bb1849e9 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch @@ -303,5 +303,5 @@ </mapAttribute> <booleanAttribute key="useDefaultConfigArea" value="true"/> <booleanAttribute key="useNamedJRE" value="false"/> -<stringAttribute key="workspace_bundles" value="org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.ui.admin@default:default,org.eclipse.equinox.frameworkadmin.equinox@2:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@3:true,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.ui.admin.rcp@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.frameworkadmin@2:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.ui@default:default"/> +<stringAttribute key="workspace_bundles" value="org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.ui.admin@default:default,org.eclipse.equinox.frameworkadmin.equinox@2:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@3:true,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.ui.admin.rcp@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.frameworkadmin@2:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.ui@default:default"/> </launchConfiguration> diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product index 3c0b2995d..94b827f5d 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product @@ -180,7 +180,6 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.operations"/> <plugin id="org.eclipse.equinox.p2.publisher"/> - <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.repository.tools"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product index 917ae236f..c9690cef1 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product @@ -72,7 +72,6 @@ <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.operations"/> <plugin id="org.eclipse.equinox.p2.publisher"/> - <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product.launch b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product.launch index 1dc4e4204..95ed4ca9c 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product.launch +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product.launch @@ -22,7 +22,7 @@ <stringAttribute key="product" value="org.eclipse.equinox.p2.examples.rcp.cloud.product"/> <stringAttribute key="productFile" value="\org.eclipse.equinox.p2.examples.rcp.cloud\cloud.product"/> <stringAttribute key="selected_target_plugins" value="org.eclipse.core.variables@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.databinding.observable@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.databinding@default:default,org.apache.commons.codec*1.3.0.v20080530-1600@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.ds@1:true,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,javax.servlet@default:default,org.apache.commons.httpclient@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.swt@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.event@default:default,org.eclipse.core.commands@default:default,org.eclipse.osgi@-1:true,org.eclipse.help@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.core.net.win32.x86@default:false,com.ibm.icu@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.jobs@default:default,org.apache.commons.logging@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.browser@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime@default:true"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.examples.rcp.cloud*1.0.0.qualifier@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ui@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.examples.rcp.cloud*1.0.0.qualifier@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ui@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/cloud.product b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/cloud.product index 5a2b36e5e..9a02ba664 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/cloud.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/cloud.product @@ -75,7 +75,6 @@ <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.operations"/> <plugin id="org.eclipse.equinox.p2.publisher"/> - <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/prestartupdate.product b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/prestartupdate.product index c85369b93..ddd1fffb0 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/prestartupdate.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/prestartupdate.product @@ -72,7 +72,6 @@ <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.operations"/> <plugin id="org.eclipse.equinox.p2.publisher"/> - <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/sdkbundlevisibility.product b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/sdkbundlevisibility.product index c791093f9..2d6d28510 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/sdkbundlevisibility.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/sdkbundlevisibility.product @@ -72,7 +72,6 @@ <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.operations"/> <plugin id="org.eclipse.equinox.p2.publisher"/> - <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> <plugin id="org.eclipse.equinox.p2.ui"/> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/sdkui.product b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/sdkui.product index 5d8f28e92..351ada14f 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/sdkui.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/sdkui.product @@ -78,7 +78,6 @@ <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.operations"/> <plugin id="org.eclipse.equinox.p2.publisher"/> - <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> <plugin id="org.eclipse.equinox.p2.ui"/> diff --git a/features/org.eclipse.equinox.p2.core.feature/feature.xml b/features/org.eclipse.equinox.p2.core.feature/feature.xml index 2922b2cc2..63e6ca3cb 100644 --- a/features/org.eclipse.equinox.p2.core.feature/feature.xml +++ b/features/org.eclipse.equinox.p2.core.feature/feature.xml @@ -162,13 +162,6 @@ unpack="false"/> <plugin - id="org.eclipse.equinox.p2.ql" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.equinox.p2.transport.ecf" download-size="0" install-size="0" diff --git a/features/org.eclipse.equinox.p2.sdk/build.properties b/features/org.eclipse.equinox.p2.sdk/build.properties index b316b57f2..7fab700b3 100644 --- a/features/org.eclipse.equinox.p2.sdk/build.properties +++ b/features/org.eclipse.equinox.p2.sdk/build.properties @@ -39,7 +39,6 @@ generate.plugin@org.eclipse.equinox.p2.metadata.repository.source=org.eclipse.eq generate.plugin@org.eclipse.equinox.p2.metadata.source=org.eclipse.equinox.p2.metadata generate.plugin@org.eclipse.equinox.p2.operations.source=org.eclipse.equinox.p2.operations generate.plugin@org.eclipse.equinox.p2.publisher.source=org.eclipse.equinox.p2.publisher -generate.plugin@org.eclipse.equinox.p2.ql.source=org.eclipse.equinox.p2.ql generate.plugin@org.eclipse.equinox.p2.reconciler.dropins.source=org.eclipse.equinox.p2.reconciler.dropins generate.plugin@org.eclipse.equinox.p2.repository.source=org.eclipse.equinox.p2.repository generate.plugin@org.eclipse.equinox.p2.repository.tools.source=org.eclipse.equinox.p2.repository.tools diff --git a/features/org.eclipse.equinox.p2.sdk/feature.xml b/features/org.eclipse.equinox.p2.sdk/feature.xml index 2177373e9..ebf2a467e 100644 --- a/features/org.eclipse.equinox.p2.sdk/feature.xml +++ b/features/org.eclipse.equinox.p2.sdk/feature.xml @@ -493,20 +493,6 @@ unpack="false"/> <plugin - id="org.eclipse.equinox.p2.ql" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.equinox.p2.ql.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.equinox.p2.transport.ecf" download-size="0" install-size="0" diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml index 6077aacc0..91a743585 100644 --- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml +++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml @@ -49,7 +49,6 @@ <module>../../bundles/org.eclipse.equinox.p2.metadata.repository</module> <module>../../bundles/org.eclipse.equinox.p2.operations</module> <module>../../bundles/org.eclipse.equinox.p2.publisher</module> - <module>../../bundles/org.eclipse.equinox.p2.ql</module> <module>../../bundles/org.eclipse.equinox.p2.reconciler.dropins</module> <module>../../bundles/org.eclipse.equinox.p2.repository</module> <module>../../bundles/org.eclipse.equinox.p2.repository.tools</module> @@ -42,7 +42,6 @@ <module>bundles/org.eclipse.equinox.p2.metadata.repository</module> <module>bundles/org.eclipse.equinox.p2.operations</module> <module>bundles/org.eclipse.equinox.p2.publisher</module> - <module>bundles/org.eclipse.equinox.p2.ql</module> <module>bundles/org.eclipse.equinox.p2.reconciler.dropins</module> <module>bundles/org.eclipse.equinox.p2.repository</module> <module>bundles/org.eclipse.equinox.p2.repository.tools</module> |