aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Oberhuber2013-04-05 04:54:48 (EDT)
committerJohn Arthorne2013-04-05 14:43:53 (EDT)
commitf6428cd8a58644c74218bec666cde39488ac8fa5 (patch)
treed056fc2d0eb03b805702e921b642fa94a9afd565
parentf7384dbdfaca23b79978109ac9681abf5400db30 (diff)
downloadeclipse.platform.runtime-f6428cd8a58644c74218bec666cde39488ac8fa5.zip
eclipse.platform.runtime-f6428cd8a58644c74218bec666cde39488ac8fa5.tar.gz
eclipse.platform.runtime-f6428cd8a58644c74218bec666cde39488ac8fa5.tar.bz2
coretools: [404954] fix MANIFEST.MF warnings, and feature branding
Adding a J2SE-1.5 BREE, and registerig it. Fixing older syntax from MANIFEST.MF. Adding about.properties/ini/mappings to build.properties. Adding plugin.properties for localization:plugin.
-rw-r--r--bundles/org.eclipse.core.tools/.classpath4
-rw-r--r--bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.core.prefs14
-rw-r--r--bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF14
-rw-r--r--bundles/org.eclipse.core.tools/about.properties4
-rw-r--r--bundles/org.eclipse.core.tools/build.properties13
-rw-r--r--bundles/org.eclipse.core.tools/eclipse32.gifbin0 -> 1716 bytes
-rw-r--r--bundles/org.eclipse.core.tools/plugin.properties12
7 files changed, 48 insertions, 13 deletions
diff --git a/bundles/org.eclipse.core.tools/.classpath b/bundles/org.eclipse.core.tools/.classpath
index 751c8f2..64c5e31 100644
--- a/bundles/org.eclipse.core.tools/.classpath
+++ b/bundles/org.eclipse.core.tools/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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.core.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.core.prefs
index da038ca..e5b589e 100644
--- a/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,16 @@
-#Fri Feb 23 16:59:40 EST 2007
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
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.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -50,6 +54,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
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
@@ -123,7 +128,12 @@ 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_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
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
diff --git a/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF
index 99710ad..017cc0e 100644
--- a/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.tools/META-INF/MANIFEST.MF
@@ -1,14 +1,15 @@
Manifest-Version: 1.0
-Bundle-Name: Core Tools
-Bundle-SymbolicName: org.eclipse.core.tools; singleton=true
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.core.tools; singleton:=true
Bundle-Version: 1.5.100.qualifier
Bundle-Activator: org.eclipse.core.tools.CoreToolsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Provide-Package: org.eclipse.core.tools,
+Export-Package: org.eclipse.core.tools,
org.eclipse.core.tools.runtime,
org.eclipse.core.tools.metadata
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.1.0,4.0.0)";optional=true,
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.1.0,4.0.0)";resolution:=optional,
org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
org.eclipse.jface.text,
org.eclipse.ui,
@@ -20,4 +21,5 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.1.0,4.0.0)";option
org.eclipse.core.filebuffers,
org.eclipse.ui.ide,
org.eclipse.search
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.core.tools/about.properties b/bundles/org.eclipse.core.tools/about.properties
index 20f4023..8caca54 100644
--- a/bundles/org.eclipse.core.tools/about.properties
+++ b/bundles/org.eclipse.core.tools/about.properties
@@ -16,9 +16,9 @@
blurb=Eclipse Core Tools\n\
\n\
-Version: 1.0.0\n\
+Version: 1.5.100\n\
Build id: {0}\n\
\n\
-(c) Copyright IBM Corp. and others 2000, 2006. All rights reserved.\n\
+(c) Copyright IBM Corp. and others 2000, 2013. All rights reserved.\n\
Visit http://eclipse.org/eclipse/development/performance
diff --git a/bundles/org.eclipse.core.tools/build.properties b/bundles/org.eclipse.core.tools/build.properties
index 5963247..64571f7 100644
--- a/bundles/org.eclipse.core.tools/build.properties
+++ b/bundles/org.eclipse.core.tools/build.properties
@@ -10,5 +10,16 @@
###############################################################################
source.. = src/
src.includes=*.html
-bin.includes=plugin.xml,icons/,doc/,*.html,.options, META-INF/,.
+bin.includes = plugin.xml,\
+ icons/,\
+ doc/,\
+ *.html,\
+ .options,\
+ META-INF/,\
+ .,\
+ plugin.properties,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ eclipse32.gif
qualifier=context
diff --git a/bundles/org.eclipse.core.tools/eclipse32.gif b/bundles/org.eclipse.core.tools/eclipse32.gif
new file mode 100644
index 0000000..29edaa0
--- /dev/null
+++ b/bundles/org.eclipse.core.tools/eclipse32.gif
Binary files differ
diff --git a/bundles/org.eclipse.core.tools/plugin.properties b/bundles/org.eclipse.core.tools/plugin.properties
new file mode 100644
index 0000000..55d6b9b
--- /dev/null
+++ b/bundles/org.eclipse.core.tools/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2000, 2013 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+pluginName=Core Tools
+providerName=Eclipse.org