Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2014-01-19 14:48:12 +0000
committerIgor Fedorenko2014-01-19 14:48:12 +0000
commit859608fa23b59206fbf4a8f975a4eb0112e487a3 (patch)
treeef9de52453b8faf6074c4625cfcbc4e0790d0472 /org.eclipse.m2e.jdt.ui
parent6773f67493ed3317ff365ae5f2edfa7e6023f949 (diff)
downloadm2e-core-859608fa23b59206fbf4a8f975a4eb0112e487a3.tar.gz
m2e-core-859608fa23b59206fbf4a8f975a4eb0112e487a3.tar.xz
m2e-core-859608fa23b59206fbf4a8f975a4eb0112e487a3.zip
424096 restored on-demand sources download
Turned o.e.m2e.jdt.ui bundle into a fragment of o.e.m2e.jdt. This forces activation of DownloadSourcesActionDelegate editor action delegate whenever o.e.m2e.jdt bundle is active. Change-Id: Ie1c7d8d399d5cbb34a13985604ec0222b50a64ee Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.jdt.ui')
-rw-r--r--org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF4
-rw-r--r--org.eclipse.m2e.jdt.ui/build.properties2
-rw-r--r--org.eclipse.m2e.jdt.ui/fragment.xml (renamed from org.eclipse.m2e.jdt.ui/plugin.xml)12
3 files changed, 13 insertions, 5 deletions
diff --git a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF
index 738d4015..98c44f9f 100644
--- a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Localization: plugin
Export-Package: org.eclipse.m2e.jdt.ui.internal;x-internal:=true,
org.eclipse.m2e.jdt.ui.internal.actions;x-internal:=true,
org.eclipse.m2e.jdt.ui.internal.filter;x-internal:=true
+Fragment-Host: org.eclipse.m2e.jdt;bundle-version="[1.5.0,1.6.0)"
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface,
org.eclipse.debug.core,
@@ -18,8 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.m2e.maven.runtime;bundle-version="[1.5.0,1.6.0)",
org.eclipse.m2e.core;bundle-version="[1.5.0,1.6.0)",
org.slf4j.api;bundle-version="1.6.2",
- org.eclipse.m2e.core.ui;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.m2e.jdt;bundle-version="[1.5.0,1.6.0)"
+ org.eclipse.m2e.core.ui;bundle-version="[1.5.0,1.6.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
JavaSE-1.7
Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.m2e.jdt.ui/build.properties b/org.eclipse.m2e.jdt.ui/build.properties
index 436d4490..a061175e 100644
--- a/org.eclipse.m2e.jdt.ui/build.properties
+++ b/org.eclipse.m2e.jdt.ui/build.properties
@@ -10,7 +10,7 @@
#
bin.includes = META-INF/,\
- plugin.xml,\
+ fragment.xml,\
plugin.properties,\
.,\
about.html,\
diff --git a/org.eclipse.m2e.jdt.ui/plugin.xml b/org.eclipse.m2e.jdt.ui/fragment.xml
index 8b6e40ba..fe5fbf72 100644
--- a/org.eclipse.m2e.jdt.ui/plugin.xml
+++ b/org.eclipse.m2e.jdt.ui/fragment.xml
@@ -7,7 +7,15 @@
http://www.eclipse.org/legal/epl-v10.html
-->
<?eclipse version="3.2"?>
-<plugin>
+
+<!--
+ 424096 broke on-demand sources download. Fragment effectively forces activation
+ DownloadSourcesActionDelegate whenever o.e.m2e.jdt is active.
+
+ https://bugs.eclipse.org/bugs/show_bug.cgi?id=424096#c19
+-->
+
+<fragment>
<extension point="org.eclipse.jdt.ui.classpathContainerPage"
id="maven2ClasspathContainerPage"
@@ -304,4 +312,4 @@
enablesFor="1"/>
</objectContribution>
</extension>
-</plugin>
+</fragment>

Back to the top