From 0f23e70c0d63223b3d1cdf53b343bbcaa130633c Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 4 Nov 2016 14:33:25 +0100 Subject: [PATCH] initial steps towards lsp-based editor for eclipse, based on Eclipse 4.7 --- .../category.xml | 0 .../org.springframework.boot.ide.product | 2 + .../pom.xml | 0 eclipse-distribution/pom.xml | 27 ++++++++------ .../.project | 28 ++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 ++++ .../META-INF/MANIFEST.MF | 10 +++++ .../build.properties | 5 +++ .../plugin.xml | 28 ++++++++++++++ .../pom.xml | 37 +++++++++++++++++++ .../.project | 17 +++++++++ .../build.properties | 1 + .../feature.xml | 20 ++++++++++ .../pom.xml | 35 ++++++++++++++++++ 14 files changed, 205 insertions(+), 12 deletions(-) rename eclipse-distribution/{org.springframework.boot.ide.product.e46 => org.springframework.boot.ide.product.e47}/category.xml (100%) rename eclipse-distribution/{org.springframework.boot.ide.product.e46 => org.springframework.boot.ide.product.e47}/org.springframework.boot.ide.product (98%) rename eclipse-distribution/{org.springframework.boot.ide.product.e46 => org.springframework.boot.ide.product.e47}/pom.xml (100%) create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.editors/.project create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.editors/.settings/org.eclipse.jdt.core.prefs create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.editors/META-INF/MANIFEST.MF create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.editors/plugin.xml create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.editors/pom.xml create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.feature/.project create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.feature/build.properties create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml create mode 100644 eclipse-extensions/org.springframework.boot.ide.properties.feature/pom.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e46/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/category.xml similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e46/category.xml rename to eclipse-distribution/org.springframework.boot.ide.product.e47/category.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e46/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product similarity index 98% rename from eclipse-distribution/org.springframework.boot.ide.product.e46/org.springframework.boot.ide.product rename to eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product index 12fe406b7..92ed4df34 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e46/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product @@ -85,6 +85,8 @@ openFile + + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e46/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml similarity index 100% rename from eclipse-distribution/org.springframework.boot.ide.product.e46/pom.xml rename to eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 024c61c43..be12fee8a 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -28,6 +28,9 @@ org.springframework.boot.ide.branding + + ../eclipse-extensions/org.springframework.boot.ide.properties.editors + ../eclipse-extensions/org.springframework.boot.ide.properties.feature @@ -56,26 +59,26 @@ - e46 + e47 - e4.6 - e4.6 - Neon - Neon (4.6) - neon - 4.6 - e46 + e4.7 + e4.7 + Oxygen + Oxygen (4.7) + oxygen + 4.7 + e47 - neon + oxygen p2 - http://download.eclipse.org/releases/neon/ + http://download.eclipse.org/releases/oxygen/ staging p2 - http://download.eclipse.org/staging/neon/ + http://download.eclipse.org/staging/oxygen/ orbit @@ -114,7 +117,7 @@ - org.springframework.boot.ide.product.e46 + org.springframework.boot.ide.product.e47 diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project new file mode 100644 index 000000000..6a21dced7 --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project @@ -0,0 +1,28 @@ + + + org.springframework.boot.ide.properties.editors + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.settings/org.eclipse.jdt.core.prefs b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.boot.ide.properties.editors/META-INF/MANIFEST.MF new file mode 100644 index 000000000..bc52abefd --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Spring Boot IDE LSP-based Property Editors +Bundle-SymbolicName: org.springframework.boot.ide.properties.editors;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Vendor: Pivotal, Inc. +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.eclipse.languageserver;bundle-version="0.1.0", + org.eclipse.ui.genericeditor;bundle-version="1.0.0", + org.eclipse.core.runtime;bundle-version="3.12.0" diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties b/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties new file mode 100644 index 000000000..e9863e281 --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/plugin.xml b/eclipse-extensions/org.springframework.boot.ide.properties.editors/plugin.xml new file mode 100644 index 000000000..0d5b5632d --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/plugin.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/pom.xml b/eclipse-extensions/org.springframework.boot.ide.properties.editors/pom.xml new file mode 100644 index 000000000..301934140 --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + + org.springframework.boot.ide + org.springframework.boot.ide + 4.0.0-SNAPSHOT + ../pom.xml + + + org.springframework.boot.ide.properties.editors + eclipse-plugin + + org.springframework.boot.ide.properties.editors + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + second-generate-p2-metadata + + p2-metadata + + verify + + + + + + diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/.project b/eclipse-extensions/org.springframework.boot.ide.properties.feature/.project new file mode 100644 index 000000000..252bbbba7 --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/.project @@ -0,0 +1,17 @@ + + + org.springframework.boot.ide.properties.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/build.properties b/eclipse-extensions/org.springframework.boot.ide.properties.feature/build.properties new file mode 100644 index 000000000..64f93a9f0 --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml new file mode 100644 index 000000000..9fe509c23 --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/pom.xml b/eclipse-extensions/org.springframework.boot.ide.properties.feature/pom.xml new file mode 100644 index 000000000..6782b3dc9 --- /dev/null +++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + org.springframework.boot.ide + org.springframework.boot.ide + 4.0.0-SNAPSHOT + ../pom.xml + + + org.springframework.boot.ide.properties.feature + eclipse-feature + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + second-generate-p2-metadata + + p2-metadata + + verify + + + + + + + +