Basic merge to M5 using jdt.core v20120125-1544
diff --git a/org.eclipse.jdt.core/plugin.xml b/org.eclipse.jdt.core/plugin.xml
index 3784256..5d69788 100644
--- a/org.eclipse.jdt.core/plugin.xml
+++ b/org.eclipse.jdt.core/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<!--
- Copyright (c) 2004, 2010 IBM Corporation and others.
+ Copyright (c) 2004, 2011 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
@@ -158,6 +158,11 @@
class="org.eclipse.jdt.core.CheckDebugAttributes"
library="jdtCompilerAdapter.jar">
</antTask>
+ <antTask
+ name="eclipse.buildJarIndex"
+ class="org.eclipse.jdt.core.BuildJarIndex"
+ library="jdtCompilerAdapter.jar">
+ </antTask>
</extension>
<!-- =================================================================================== -->
@@ -196,6 +201,17 @@
</extension>
<!-- =================================================================================== -->
+<!-- Extension: Java Generate Indexer -->
+<!-- =================================================================================== -->
+<extension
+ id="JavaIndexer"
+ point="org.eclipse.core.runtime.applications">
+ <application>
+ <run class="org.eclipse.jdt.core.index.JavaIndexerApplication" />
+ </application>
+</extension>
+
+<!-- =================================================================================== -->
<!-- Extension: Java Content Types -->
<!-- =================================================================================== -->
<extension point="org.eclipse.core.contenttype.contentTypes">