reorganized commons-ls bundle inclusions to avoid feature inclusion

This commit is contained in:
Martin Lippert
2017-10-05 10:15:13 +02:00
parent 4eddb50e63
commit 1975104519
7 changed files with 44 additions and 61 deletions

View File

@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Language Server Commons
Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.commons;singleton:=true
Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.springframework.tooling.ls.eclipse.commons.LsEclipseCommonsActivator
Bundle-Vendor: Pivotal, Inc.
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,

View File

@@ -1,50 +0,0 @@
package org.springframework.tooling.ls.eclipse.commons;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
public class LsEclipseCommonsActivator extends AbstractUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.springframework.tooling.ls.eclipse.commons"; //$NON-NLS-1$
// The shared instance
private static LsEclipseCommonsActivator plugin;
/**
* The constructor
*/
public LsEclipseCommonsActivator() {
}
/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
/**
* Returns the shared instance
*
* @return the shared instance
*/
public static LsEclipseCommonsActivator getDefault() {
return plugin;
}
}

View File

@@ -10,10 +10,7 @@
*******************************************************************************/
package org.springframework.tooling.ls.eclipse.commons;
import java.util.concurrent.CompletableFuture;
import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
import org.eclipse.lsp4j.services.LanguageClient;
/**