Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

separating language server into separate feature and separate p2 repo

Browse Source
This commit is contained in:
Martin Lippert
2017-06-12 12:34:54 +02:00
parent 437c6b5c26
commit 3d3c8dc42e
28 changed files with 292 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/build.properties → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/build.properties
View File

7
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/feature.xml
View File

@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.springframework.boot.ide.cloudfoundry.server.feature"
label="Spring Boot IDE Cloud Foundry Manifest Language Server Feature"
id="org.springframework.boot.ide.cloudfoundry.manifest.integration.feature"
label="Spring Boot IDE Cloud Foundry Manifest Language Server Integration"
version="4.0.0.qualifier"
provider-name="Pivotal, Inc.">
<requires>
<import plugin="org.eclipse.ui.genericeditor"/>
<import plugin="org.eclipse.lsp4e"/>
<import plugin="org.springframework.tooling.cloudfoundry.manifest.ls"/>
</requires>
<plugin
id="org.springframework.boot.ide.cloudfoundry.server"
id="org.springframework.boot.ide.cloudfoundry.manifest.integration"
download-size="0"
install-size="0"
version="0.0.0"

2
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/pom.xml → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/pom.xml
View File

@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.boot.ide.cloudfoundry.server.feature</artifactId>
<artifactId>org.springframework.boot.ide.cloudfoundry.manifest.integration.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

0
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/.classpath → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration/.classpath
View File

28
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration/.project Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.springframework.boot.ide.cloudfoundry.manifest.integration</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

0
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/.settings/org.eclipse.jdt.core.prefs → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration/.settings/org.eclipse.jdt.core.prefs
View File

5
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration/META-INF/MANIFEST.MF
View File

@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Server
Bundle-SymbolicName: org.springframework.boot.ide.cloudfoundry.server;singleton:=true
Bundle-SymbolicName: org.springframework.boot.ide.cloudfoundry.manifest.integration;singleton:=true
Bundle-Version: 4.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
org.eclipse.jface.text;bundle-version="3.11.100",
org.eclipse.jdt.ui;bundle-version="3.13.0",
org.eclipse.tm4e.core;bundle-version="0.1.0",
org.eclipse.tm4e.ui;bundle-version="0.1.0"
org.eclipse.tm4e.ui;bundle-version="0.1.0",
org.springframework.tooling.cloudfoundry.manifest.ls;bundle-version="0.0.9"
Import-Package: org.eclipse.jface.preference,
org.eclipse.lsp4j.jsonrpc.messages;version="0.1.0.v20170117-0759",
org.eclipse.lsp4j.services;version="0.1.0.v20170117-0759",

1
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/build.properties → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration/build.properties
View File

@@ -3,5 +3,4 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
servers/,\
syntaxes/

13
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration/plugin.xml
View File

@@ -45,17 +45,4 @@
</scopeNameContentTypeBinding>
</extension>
<extension
point="org.eclipse.lsp4e.languageServer">
<server
class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryManifestLanguageServer"
id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
label="Cloud Foundry Manifest Language Server">
</server>
<contentTypeMapping
contentType="org.springframework.boot.ide.manifest.yml"
id="org.eclipse.languageserver.languages.cloudfoundrymanifest">
</contentTypeMapping>
</extension>
</plugin>

17
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration/pom.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.boot.ide.cloudfoundry.manifest.integration</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

0
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/syntaxes/YAML.tmLanguage → eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration/syntaxes/YAML.tmLanguage
View File

6
eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml → eclipse-language-servers/org.springframework.boot.ide.ls.integration.repository/category.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<category-def name="Spring Boot IDE Language Servers for Eclipse" label="Spring Boot IDE Language Servers for Eclipse"/>
<category-def name="Spring Boot IDE Language Server Integrations for Eclipse" label="Spring Boot IDE Language Server Integrations for Eclipse"/>
<feature id="org.springframework.boot.ide.properties.servers.feature">
<category name="Spring Boot IDE Language Servers for Eclipse"/>
</feature>
<feature id="org.springframework.boot.ide.cloudfoundry.server.feature">
<feature id="org.springframework.boot.ide.java.servers.feature">
<category name="Spring Boot IDE Language Servers for Eclipse"/>
</feature>
<feature id="org.springframework.boot.ide.java.servers.feature">
<feature id="org.springframework.boot.ide.cloudfoundry.manifest.integration.feature">
<category name="Spring Boot IDE Language Servers for Eclipse"/>
</feature>

91
eclipse-language-servers/org.springframework.boot.ide.ls.integration.repository/pom.xml Normal file
View File

@@ -0,0 +1,91 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>org.springframework.boot.ide.ls.integration.repository</artifactId>
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>eclipse-repository</packaging>
<properties>
<dist.accessKey>${accessKey}</dist.accessKey>
<dist.secretKey>${secretKey}</dist.secretKey>
<dist.bucket>dist.springsource.com</dist.bucket>
<dist.type>snapshot</dist.type>
<dist.key>TOOLS</dist.key>
<dist.project>sts4-language-server-integrations</dist.project>
<dist.pathpostfix>nightly</dist.pathpostfix>
<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>upload-repo</id>
<phase>deploy</phase>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<property name="site.target.dir" value="${project.build.directory}" />
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
<delete bucketName="${dist.bucket}">
<fileset dir="${dist.path}">
<include name="site.xml" />
<include name="content.jar" />
<include name="artifacts.jar" />
<include name="plugins/**" />
<include name="features/**" />
</fileset>
</delete>
<upload bucketName="${dist.bucket}" toDir="${dist.path}" publicRead="true">
<fileset dir="${site.target.dir}/repository">
<include name="**/*" />
<include name="**" />
</fileset>
</upload>
</s3>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.springframework.build</groupId>
<artifactId>org.springframework.build.aws.ant</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.1</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>20020829</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>

1
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/build.properties Normal file
View File

@@ -0,0 +1 @@
bin.includes = feature.xml

20
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.springframework.tooling.cloudfoundry.manifest.ls.feature"
label="Cloud Foundry Manifest Language Server Feature"
version="0.0.9.qualifier"
provider-name="Pivotal, Inc.">
<requires>
<import plugin="org.eclipse.lsp4e"/>
</requires>
<plugin
id="org.springframework.tooling.cloudfoundry.manifest.ls"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false">
</plugin>
</feature>

16
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.cloudfoundry.manifest.ls.feature</artifactId>
<version>0.0.9-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>

7
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.classpath Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/.project → eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.project
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.springframework.boot.ide.cloudfoundry.server</name>
<name>org.springframework.tooling.cloudfoundry.manifest.ls</name>
<comment></comment>
<projects>
</projects>

7
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.settings/org.eclipse.jdt.core.prefs Normal file
View File

@@ -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

13
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF Normal file
View File

@@ -0,0 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Server
Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls;singleton:=true
Bundle-Version: 0.0.9.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.lsp4e;bundle-version="0.2.0"
Import-Package: org.eclipse.jface.preference,
org.eclipse.lsp4j.jsonrpc.messages;version="0.1.0.v20170117-0759",
org.eclipse.lsp4j.services;version="0.1.0.v20170117-0759",
org.osgi.framework

6
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/build.properties Normal file
View File

@@ -0,0 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
servers/

31
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension
point="org.eclipse.lsp4e.languageServer">
<server
class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryManifestLanguageServer"
id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
label="Cloud Foundry Manifest Language Server">
</server>
<contentTypeMapping
contentType="org.springframework.boot.ide.manifest.yml"
id="org.eclipse.languageserver.languages.cloudfoundrymanifest">
</contentTypeMapping>
</extension>
<extension
point="org.eclipse.lsp4e.languageServer">
<server
class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryManifestLanguageServer"
id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
label="Cloud Foundry Manifest Language Server">
</server>
<contentTypeMapping
contentType="org.springframework.ide.eclipse.manifest.yml"
id="org.eclipse.languageserver.languages.cloudfoundrymanifest">
</contentTypeMapping>
</extension>
</plugin>

5
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/pom.xml → eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
View File

@@ -11,14 +11,15 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.boot.ide.cloudfoundry.server</artifactId>
<artifactId>org.springframework.tooling.cloudfoundry.manifest.ls</artifactId>
<version>0.0.9-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>manifest-yaml-language-server</artifactId>
<version>0.0.8-SNAPSHOT</version>
<version>0.0.9-SNAPSHOT</version>
</dependency>
</dependencies>

0
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java → eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
View File

4
eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/Constants.java → eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/boot/ide/cloudfoundry/server/Constants.java
View File

@@ -15,7 +15,7 @@ package org.springframework.boot.ide.cloudfoundry.server;
*/
public class Constants {
public static final String PLUGIN_ID = "org.springframework.boot.ide.cloudfoundry.server";
public static final String LANGUAGE_SERVER_VERSION = "0.0.8";
public static final String PLUGIN_ID = "org.springframework.tooling.cloudfoundry.manifest.ls";
public static final String LANGUAGE_SERVER_VERSION = "0.0.9";
}

31
eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<category-def name="Spring Tooling Language Servers for Eclipse" label="Spring Tooling Language Servers for Eclipse"/>
<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature">
<category name="Spring Boot IDE Language Servers for Eclipse"/>
</feature>
<category-def name="deps" label="Dependencies"/>
<bundle id="org.eclipse.lsp4e">
<category name="deps"/>
</bundle>
<bundle id="org.eclipse.lsp4j">
<category name="deps"/>
</bundle>
<bundle id="org.eclipse.lsp4j.jsonrpc">
<category name="deps"/>
</bundle>
<bundle id="org.eclipse.xtext.xbase.lib">
<category name="deps"/>
</bundle>
<bundle id="com.google.gson">
<category name="deps"/>
</bundle>
</site>

2
eclipse-language-servers/org.springframework.boot.ide.servers.repository/pom.xml → eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
View File

@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>repository</artifactId>
<artifactId>org.springframework.tooling.ls.repository</artifactId>
<parent>
<groupId>org.springframework.boot.ide</groupId>

11
eclipse-language-servers/pom.xml
View File

@@ -29,14 +29,15 @@
<modules>
<module>org.springframework.boot.ide.properties.servers</module>
<module>org.springframework.boot.ide.properties.servers.feature</module>
<module>org.springframework.boot.ide.java.servers</module>
<module>org.springframework.boot.ide.java.servers.feature</module>
<module>org.springframework.boot.ide.cloudfoundry.manifest.integration</module>
<module>org.springframework.boot.ide.cloudfoundry.manifest.integration.feature</module>
<module>org.springframework.boot.ide.ls.integration.repository</module>
<module>org.springframework.boot.ide.cloudfoundry.server</module>
<module>org.springframework.boot.ide.cloudfoundry.server.feature</module>
<module>org.springframework.boot.ide.servers.repository</module>
<module>org.springframework.tooling.cloudfoundry.manifest.ls</module>
<module>org.springframework.tooling.cloudfoundry.manifest.ls.feature</module>
<module>org.springframework.tooling.ls.repository</module>
</modules>
<properties>