From 8bb96887fd40db14f90fa951c855d364c1769312 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 3 Oct 2017 10:12:41 -0700 Subject: [PATCH] Make ls.eclipse.gotosymbol plugin part of boot.java.ls.feature --- eclipse-distribution/pom.xml | 1 - eclipse-language-servers/local-build.sh | 8 ++++++++ .../feature.xml | 8 ++++++++ .../.classpath | 0 .../.project | 6 ++++++ .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 4 ++++ .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../icons/sample.png | Bin .../icons/sample@2x.png | Bin .../plugin.xml | 0 .../pom.xml | 4 ++-- .../ls/eclipse/gotosymbol/GotoSymbolPlugin.java | 0 .../gotosymbol/dialogs/GotoSymbolDialog.java | 0 .../gotosymbol/dialogs/GotoSymbolDialogModel.java | 0 .../gotosymbol/dialogs/InFileSymbolsProvider.java | 0 .../dialogs/InWorkspaceSymbolsProvider.java | 0 .../eclipse/gotosymbol/dialogs/SymbolsProvider.java | 0 .../gotosymbol/handlers/GotoSymbolHandler.java | 0 .../ls/eclipse/gotosymbol/util/SwtConnect.java | 0 eclipse-language-servers/pom.xml | 8 +++++++- 22 files changed, 35 insertions(+), 4 deletions(-) create mode 100755 eclipse-language-servers/local-build.sh rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/.project (80%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs (100%) create mode 100644 eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.m2e.core.prefs rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml (81%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java (100%) rename {eclipse-extensions => eclipse-language-servers}/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java (100%) diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 2fab3e3ce..50313c4a3 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -28,7 +28,6 @@ ../eclipse-extensions/org.springframework.boot.ide.main.feature - ../eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol org.springframework.boot.ide.branding org.springframework.boot.ide.branding.feature diff --git a/eclipse-language-servers/local-build.sh b/eclipse-language-servers/local-build.sh new file mode 100755 index 000000000..1409bacf3 --- /dev/null +++ b/eclipse-language-servers/local-build.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e +workdir=`pwd` +cd ../headless-services +mvn clean install -Dmaven.test.skip=true + +cd $workdir +mvn -Pe47 clean install \ No newline at end of file diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml index 2b386fb4c..f928a6a9b 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml @@ -18,4 +18,12 @@ unpack="false"> + + + diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.project b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.project similarity index 80% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.project rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.project index 1f5f63896..4540738d4 100644 --- a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.project +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.project @@ -20,8 +20,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.m2e.core.prefs b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml similarity index 81% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml index 9d3c3ba05..fcb61be93 100644 --- a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.boot.ide - org.springframework.boot.ide + org.springframework.boot.ide.servers 4.0.0-SNAPSHOT - ../../eclipse-distribution/pom.xml + ../pom.xml org.springframework.tooling.ls.eclipse.gotosymbol diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java similarity index 100% rename from eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml index 824fb07c1..a888127e1 100644 --- a/eclipse-language-servers/pom.xml +++ b/eclipse-language-servers/pom.xml @@ -36,7 +36,8 @@ org.springframework.tooling.properties.ls org.springframework.tooling.properties.ls.feature - + + org.springframework.tooling.ls.eclipse.gotosymbol org.springframework.tooling.boot.java.ls org.springframework.tooling.boot.java.ls.feature @@ -100,6 +101,11 @@ p2 http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/p2-repository/ + + e-i-commons + p2 + http://dist.springframework.org/snapshot/IDE/nightly + lsp4e p2