From 2959440a006cac362d829eda5897ba6d3d0fc441 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Wed, 30 Nov 2016 20:54:49 +0100
Subject: [PATCH] migrated to new lsp4e project

---
 .../META-INF/MANIFEST.MF                        |  6 +++---
 .../META-INF/MANIFEST.MF                        |  6 +++---
 .../plugin.xml                                  |  2 +-
 .../CloudFoundryManifestLanguageServer.java     |  2 +-
 .../META-INF/MANIFEST.MF                        |  6 +++---
 .../plugin.xml                                  |  2 +-
 .../SpringBootPropertiesLanguageServer.java     |  2 +-
 .../category.xml                                |  2 +-
 eclipse-language-servers/pom.xml                | 17 ++++++-----------
 9 files changed, 20 insertions(+), 25 deletions(-)

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
index a72582697..bb2c70f5a 100644
--- 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
@@ -5,10 +5,10 @@ Bundle-SymbolicName: org.springframework.boot.ide.properties.editors;singleton:=
 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",
+Require-Bundle: org.eclipse.ui.genericeditor;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.jface.text;bundle-version="3.11.100",
  org.eclipse.jdt.ui;bundle-version="3.13.0",
- org.dadacoalition.yedit;bundle-version="1.0.20"
+ org.dadacoalition.yedit;bundle-version="1.0.20",
+ org.eclipse.lsp4e;bundle-version="0.1.0"
 Import-Package: org.eclipse.jface.preference
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF
index 6c4ebee7d..d442fc27e 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Server
 Bundle-SymbolicName: org.springframework.boot.ide.cloudfoundry.server;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.languageserver;bundle-version="0.1.0",
- org.eclipse.jdt.launching;bundle-version="3.9.0",
- org.eclipse.core.runtime;bundle-version="3.12.0"
+Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
+ org.eclipse.core.runtime;bundle-version="3.12.0",
+ org.eclipse.lsp4e;bundle-version="0.1.0"
 Import-Package: org.osgi.framework
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml
index 1ef77e33a..2f17eb347 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml
@@ -3,7 +3,7 @@
 <plugin>
 
    <extension
-         point="org.eclipse.languageserver.languageServer">
+         point="org.eclipse.lsp4e.languageServer">
       <server
             class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryManifestLanguageServer"
             id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
index 4cf81cf15..5a885a2bc 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.jdt.internal.launching.StandardVMType;
 import org.eclipse.jdt.launching.IVMInstall;
 import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.languageserver.ProcessStreamConnectionProvider;
+import org.eclipse.lsp4e.ProcessStreamConnectionProvider;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/META-INF/MANIFEST.MF
index e6beb5246..64aa38349 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Servers
 Bundle-SymbolicName: org.springframework.boot.ide.properties.servers;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.languageserver;bundle-version="0.1.0",
- org.eclipse.jdt.launching;bundle-version="3.9.0",
- org.eclipse.core.runtime;bundle-version="3.12.0"
+Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
+ org.eclipse.core.runtime;bundle-version="3.12.0",
+ org.eclipse.lsp4e;bundle-version="0.1.0"
 Import-Package: org.osgi.framework
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
index b09031b94..2d4a8b30b 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
@@ -3,7 +3,7 @@
 <plugin>
 
    <extension
-         point="org.eclipse.languageserver.languageServer">
+         point="org.eclipse.lsp4e.languageServer">
       <server
             class="org.springframework.boot.ide.properties.servers.SpringBootPropertiesLanguageServer"
             id="org.eclipse.languageserver.languages.springbootproperties"
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringBootPropertiesLanguageServer.java b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringBootPropertiesLanguageServer.java
index 791f09b0c..49a34b40d 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringBootPropertiesLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringBootPropertiesLanguageServer.java
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.jdt.internal.launching.StandardVMType;
 import org.eclipse.jdt.launching.IVMInstall;
 import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.languageserver.ProcessStreamConnectionProvider;
+import org.eclipse.lsp4e.ProcessStreamConnectionProvider;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml b/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml
index 298ae4fb7..df0cbd386 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml
@@ -12,7 +12,7 @@
    
    <category-def name="deps" label="Dependencies"/>
    
-   <bundle id="org.eclipse.languageserver">
+   <bundle id="org.eclipse.lsp4e">
      <category name="deps"/>
    </bundle>
 
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index cd63148d0..c0248d776 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -51,8 +51,6 @@
 
 		<tycho-version>0.26.0</tycho-version>
 		<encoding>UTF-8</encoding>
-		
-		<eclipse-lsp-support-repo>file:///${basedir}/../../../eclipse-language-service/repository/target/repository</eclipse-lsp-support-repo>
 	</properties>
 
 	<profiles>
@@ -86,7 +84,12 @@
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/</url>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20161021172207/repository/</url>
+				</repository>
+				<repository>
+					<id>lsp4e</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/lsp4e/snapshots/</url>
 				</repository>
 			</repositories>
 		</profile>
@@ -118,14 +121,6 @@
 
 	</profiles>
 
-	<repositories>
-		<repository>
-			<id>eclipse-language-server-local-repo</id>
-			<layout>p2</layout>
-			<url>${eclipse-lsp-support-repo}</url>
-		</repository>
-	</repositories>
-
 	<pluginRepositories>
 	    <pluginRepository>
 	      <id>tycho-snapshots</id>