diff --git a/assembly/assembly-wsagent-war/pom.xml b/assembly/assembly-wsagent-war/pom.xml
index 515d8174afc..bc8aed21404 100644
--- a/assembly/assembly-wsagent-war/pom.xml
+++ b/assembly/assembly-wsagent-war/pom.xml
@@ -94,11 +94,6 @@
org.eclipse.che.lib
che-swagger-module
-
- org.eclipse.che.plugin
- che-jdt-ext-machine
- jar
-
org.eclipse.che.plugin
che-plugin-cpp-lang-server
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/pom.xml
deleted file mode 100644
index 026a540fccb..00000000000
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/pom.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-
-
-
- 4.0.0
-
- che-plugin-java-ext-jdt-parent
- org.eclipse.che.plugin
- 4.3.0-RC1-SNAPSHOT
-
- che-jdt-ext-machine
- jar
- Che Plugin :: Java :: Extension Machine JDT
-
-
- com.google.code.gson
- gson
-
-
- com.google.guava
- guava
-
-
- com.google.inject
- guice
-
-
- javax.inject
- javax.inject
-
-
- javax.validation
- validation-api
-
-
- javax.ws.rs
- javax.ws.rs-api
-
-
- org.eclipse.birt.runtime
- org.eclipse.equinox.common
-
-
- org.eclipse.che.core
- che-core-api-core
-
-
- org.eclipse.che.core
- che-core-api-dto
-
-
- org.eclipse.che.core
- che-core-api-model
-
-
- org.eclipse.che.core
- che-core-api-project
-
-
- org.eclipse.che.core
- che-core-commons-inject
-
-
- org.eclipse.che.core
- che-core-commons-lang
-
-
- org.eclipse.che.core
- che-core-commons-schedule
-
-
- org.eclipse.che.plugin
- che-plugin-java-ext-lang-shared
-
-
- org.eclipse.che.plugin
- che-plugin-java-jdt-core-repack
-
-
- org.eclipse.jdt.core
- org.eclipse.tycho
-
-
-
-
- org.eclipse.che.plugin
- org.eclipse.core.filebuffers
-
-
- org.eclipse.che.plugin
- org.eclipse.core.resources
-
-
- org.eclipse.che.plugin
- org.eclipse.jdt.ui
-
-
- org.eclipse.che.plugin
- org.eclipse.jface
-
-
- org.eclipse.che.plugin
- org.eclipse.jface.text
-
-
- org.eclipse.che.plugin
- org.eclipse.ltk.core.refactoring
-
-
- org.eclipse.che.plugin
- org.eclipse.search
-
-
- org.eclipse.equinox
- preferences
-
-
- org.eclipse.search
- org.eclipse.search
-
-
- org.eclipse.text
- org.eclipse.text
-
-
- org.eclipse.equinox.common
- org.eclipse.equinox
-
-
-
-
- org.slf4j
- slf4j-api
-
-
- ch.qos.logback
- logback-classic
- test
-
-
- junit
- junit
- test
-
-
- org.easytesting
- fest-assert
- test
-
-
- org.eclipse.che.core
- che-core-api-workspace
- test
-
-
- org.eclipse.che.core
- che-core-commons-env
- test
-
-
- org.eclipse.che.plugin
- org.eclipse.ui.ide
- test
-
-
- org.everrest
- everrest-integration-guice
- test
-
-
- org.mockito
- mockito-core
- test
-
-
-
- src/main/java
- src/test/java
- target/classes
-
-
- src/main/resources
-
-
-
-
- src/test/resources
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- copy-tomcat-libs
- process-resources
-
- copy
-
-
-
-
- com.google.gwt
- gwt-user
- ${com.google.gwt.version}
- ${project.build.testOutputDirectory}/temp/ws/test
- gwt-user.jar
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- org.apache.maven.surefire
- surefire-junit47
- ${version.surefire.plugin}
-
-
-
- random
-
- **/jdt/**/*.java
-
-
-
-
- com.mycila
- license-maven-plugin
-
-
- **/*.svg
- **/*.png
- **/*.gif
- **/*.rscjson
- **/*.zip
- **/*.txt
- **/*.jpg
- **/*.rsc
- **/*.json
- **/readableNames
- **/RenameMethodInInterface/**
- **/RenameNonPrivateField/**
- **/RenamePackage/**
- **/RenameParameters/**
- **/RenamePrivateField/**
- **/RenamePrivateMethod/**
- **/RenameStaticMethod/**
- **/RenameTests18/**
- **/RenameType/**
- **/RenameTypeParameter/**
- **/RenameVirtualMethodInClass/**
- **/projects/**
- **/org/eclipse/che/jdt/javadoc/**
- **/org/eclipse/che/jface/**
- **/org/eclipse/che/jdt/internal/codeassist/**
- **/org/eclipse/core/**
- **/org/eclipse/search/**
- **/org/eclipse/ltk/**
- **/org/eclipse/che/jdt/core/**
- **/org/eclipse/che/jdt/dom/**
- **/org/eclipse/che/jdt/corext/util/**
- **/org/eclipse/che/jdt/util/**
- **/org/eclipse/che/core/**
- **/org/eclipse/che/ltk/**
- **/org/eclipse/che/jdt/**
- **/org/eclipse/che/jdt/internal/core/**
- **/org/eclipse/che/jdt/core/launching/IVMInstallType.java
- **/org/eclipse/che/jdt/core/launching/JREContainer.java
- **/org/eclipse/che/jdt/core/launching/LibraryInfo.java
- **/org/eclipse/che/jdt/core/launching/LibraryLocation.java
- **/org/eclipse/che/jdt/core/launching/StandardVMType.java
- **/org/eclipse/che/jdt/core/search/**
- **/org/eclipse/che/jdt/format/**
- **/org/eclipse/che/jdt/internal/core/builder/**
- **/org/eclipse/che/jdt/internal/core/search/indexing/**
- **/org/eclipse/che/jdt/internal/core/search/matching/**
- **/org/eclipse/che/jdt/internal/core/search/processing/JobManager.java
- **/org/eclipse/che/jdt/internal/core/search/AbstractJavaSearchScope.java
- **/org/eclipse/che/jdt/internal/core/search/AbstractSearchScope.java
- **/org/eclipse/che/jdt/internal/core/search/BasicSearchEngine.java
- **/org/eclipse/che/jdt/internal/core/search/HierarchyScope.java
- **/org/eclipse/che/jdt/internal/core/search/IndexQueryRequestor.java
- **/org/eclipse/che/jdt/internal/core/search/IndexSelector.java
- **/org/eclipse/che/jdt/internal/core/search/IRestrictedAccessConstructorRequestor.java
- **/org/eclipse/che/jdt/internal/core/search/IRestrictedAccessTypeRequestor.java
- **/org/eclipse/che/jdt/internal/core/search/JavaSearchDocument.java
- **/org/eclipse/che/jdt/internal/core/search/JavaSearchParticipant.java
- **/org/eclipse/che/jdt/internal/core/search/JavaSearchScope.java
- **/org/eclipse/che/jdt/internal/core/search/JavaSearchTypeNameMatch.java
- **/org/eclipse/che/jdt/internal/core/search/JavaWorkspaceScope.java
- **/org/eclipse/che/jdt/internal/core/search/PathCollector.java
- **/org/eclipse/che/jdt/internal/core/search/PatternSearchJob.java
- **/org/eclipse/che/jdt/internal/core/search/StringOperation.java
- **/org/eclipse/che/jdt/internal/core/search/SubTypeSearchJob.java
- **/org/eclipse/che/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java
- **/org/eclipse/che/jdt/internal/core/search/TypeNameRequestorWrapper.java
- **/org/eclipse/che/jdt/internal/core/util/**
- **/org/eclipse/che/jdt/internal/core/ClasspathEntry.java
- **/org/eclipse/che/text/test/Accessor.java
- **/org/eclipse/che/jdt/internal/corext/CorextMessages.properties
-
-
-
-
-
-
-
- jdt-tests
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- org.apache.maven.surefire
- surefire-junit47
- ${version.surefire.plugin}
-
-
-
-
- none
-
-
- **/jdt/**/*.java
-
-
-
-
-
-
-
-
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/junit381-noUI-src.zip b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/junit381-noUI-src.zip
deleted file mode 100644
index 125b3c90992..00000000000
Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/junit381-noUI-src.zip and /dev/null differ
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs15.jar b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs15.jar
deleted file mode 100644
index 32f3eee37b3..00000000000
Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs15.jar and /dev/null differ
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs16.jar b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs16.jar
deleted file mode 100644
index 28269fb57ec..00000000000
Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs16.jar and /dev/null differ
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs17.jar b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs17.jar
deleted file mode 100644
index 9c5c3acbda2..00000000000
Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs17.jar and /dev/null differ
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs18.jar b/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs18.jar
deleted file mode 100644
index 225d910051d..00000000000
Binary files a/plugins/plugin-java/che-plugin-java-ext-jdt/che-jdt-ext-machine/src/test/resources/testresources/rtstubs18.jar and /dev/null differ
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml
index ee3c4ce25bf..57eccf4b378 100644
--- a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml
+++ b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml
@@ -32,6 +32,5 @@
che-plugin-java-jdt-core-repack
org-eclipse-jdt-ui
org-eclipse-ltk-core-refactoring
- che-jdt-ext-machine
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java
index 71a90f2eed2..5b802c3e5ed 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java
@@ -45,7 +45,7 @@ public class JavaClasspathServiceClientImpl implements JavaClasspathServiceClien
protected JavaClasspathServiceClientImpl(AppContext appContext,
WsAgentStateController wsAgentStateController) {
this.wsAgentStateController = wsAgentStateController;
- this.baseHttpUrl = "/jdt/";
+ this.baseHttpUrl = "/java/";
}
/** {@inheritDoc} */
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java
index 22c1741d437..99e0bfea660 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java
@@ -56,7 +56,7 @@ public void showDocumentation() {
TextEditorPresenter editor = ((TextEditorPresenter)activeEditor);
int offset = editor.getCursorOffset();
final PositionConverter.PixelCoordinates coordinates = editor.getPositionConverter().offsetToPixel(offset);
- view.show(appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/javadoc/find?fqn=" +
+ view.show(appContext.getDevMachine().getWsAgentBaseUrl() + "/java/javadoc/find?fqn=" +
JavaSourceFolderUtil.getFQNForFile(editor.getEditorInput().getFile()) + "&projectpath=" +
appContext.getCurrentProject().getProjectConfig().getPath() + "&offset=" + offset, coordinates.getX(),
coordinates.getY());
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java
index fcdb5c14768..053aa8e11e0 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java
@@ -62,14 +62,14 @@ public JavaCodeAssistClient(DtoUnmarshallerFactory unmarshallerFactory,
}
public void computeProposals(String projectPath, String fqn, int offset, String contents, AsyncRequestCallback callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/completion" + "/?projectpath=" +
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/completion" + "/?projectpath=" +
projectPath + "&fqn=" + fqn + "&offset=" + offset;
asyncRequestFactory.createPostRequest(url, null).data(contents).send(callback);
}
public void computeAssistProposals(String projectPath, String fqn, int offset, List problems,
AsyncRequestCallback callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/assist" + "/?projectpath=" +
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/assist" + "/?projectpath=" +
projectPath + "&fqn=" + fqn + "&offset=" + offset;
List prob = new ArrayList<>();
prob.addAll(problems);
@@ -78,7 +78,7 @@ public void computeAssistProposals(String projectPath, String fqn, int offset, L
public void applyProposal(String sessionId, int index, boolean insert, final AsyncCallback callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/apply/completion/?sessionid=" +
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/apply/completion/?sessionid=" +
sessionId + "&index=" + index + "&insert=" + insert;
Unmarshallable unmarshaller =
unmarshallerFactory.newUnmarshaller(ProposalApplyResult.class);
@@ -96,7 +96,7 @@ protected void onFailure(Throwable throwable) {
}
public String getProposalDocUrl(int id, String sessionId) {
- return appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/info?sessionid=" + sessionId +
+ return appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/info?sessionid=" + sessionId +
"&index=" + id;
}
@@ -146,7 +146,7 @@ public List apply(List arg) throws FunctionException {
*/
public Promise> organizeImports(String projectPath, String fqn) {
String url = appContext.getDevMachine().getWsAgentBaseUrl() +
- "/jdt/code-assist/organize-imports?projectpath=" + projectPath +
+ "/java/code-assist/organize-imports?projectpath=" + projectPath +
"&fqn=" + fqn;
return asyncRequestFactory.createPostRequest(url, null)
@@ -164,7 +164,7 @@ public Promise> organizeImports(String projectPath, Stri
*/
public Promise applyChosenImports(String projectPath, String fqn, ConflictImportDTO chosen) {
String url = appContext.getDevMachine().getWsAgentBaseUrl() +
- "/jdt/code-assist/apply-imports?projectpath=" + projectPath +
+ "/java/code-assist/apply-imports?projectpath=" + projectPath +
"&fqn=" + fqn;
return asyncRequestFactory.createPostRequest(url, chosen)
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java
index 8e9ab26181c..2c1ebd3d450 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java
@@ -40,7 +40,7 @@ public JavaReconcileClient(DtoUnmarshallerFactory dtoUnmarshallerFactory,
}
public void reconcile(String projectPath, String fqn, final ReconcileCallback callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/reconcile/?projectpath=" + projectPath + "&fqn=" + fqn;
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/reconcile/?projectpath=" + projectPath + "&fqn=" + fqn;
asyncRequestFactory.createGetRequest(url)
.send(new AsyncRequestCallback(dtoUnmarshallerFactory.newUnmarshaller(ReconcileResult.class)) {
@Override
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java
index a374ce88e3b..d6efb576c41 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java
@@ -62,34 +62,34 @@ public JavaNavigationServiceImpl(AppContext appContext,
@Override
public void findDeclaration(String projectPath, String fqn, int offset, AsyncRequestCallback callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/find-declaration" +
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/find-declaration" +
"?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset;
requestFactory.createGetRequest(url).send(callback);
}
public void getExternalLibraries(String projectPath, AsyncRequestCallback> callback) {
String url =
- appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/libraries?projectpath=" + projectPath;
+ appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/libraries?projectpath=" + projectPath;
requestFactory.createGetRequest(url).send(callback);
}
@Override
public void getLibraryChildren(String projectPath, int libId, AsyncRequestCallback> callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/lib/children" +
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/lib/children" +
"?projectpath=" + projectPath + "&root=" + libId;
requestFactory.createGetRequest(url).send(callback);
}
@Override
public void getChildren(String projectPath, int libId, String path, AsyncRequestCallback> callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/children" +
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/children" +
"?projectpath=" + projectPath + "&root=" + libId + "&path=" + path;
requestFactory.createGetRequest(url).send(callback);
}
@Override
public void getEntry(String projectPath, int libId, String path, AsyncRequestCallback callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/entry" +
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/entry" +
"?projectpath=" + projectPath + "&root=" + libId + "&path=" + path;
requestFactory.createGetRequest(url).send(callback);
}
@@ -103,14 +103,14 @@ public void getContent(String projectPath, int libId, String path, AsyncRequestC
@Override
public void getContent(String projectPath, String fqn, AsyncRequestCallback callback) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/contentbyfqn?projectpath=" + projectPath + "&fqn=" + fqn;
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/contentbyfqn?projectpath=" + projectPath + "&fqn=" + fqn;
requestFactory.createGetRequest(url).send(callback);
}
/** {@inheritDoc} */
@Override
public Promise getCompilationUnit(String projectPath, String fqn, boolean showInherited) {
- final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/compilation-unit" +
+ final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/compilation-unit" +
"?projectpath=" + projectPath + "&fqn=" + fqn + "&showinherited=" + showInherited;
return newPromise(new AsyncPromiseHelper.RequestCall() {
@@ -125,7 +125,7 @@ public void makeCall(AsyncCallback callback) {
@Override
public Promise getImplementations(String projectPath, String fqn, int offset) {
- final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/implementations" +
+ final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/implementations" +
"?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset;
return requestFactory.createGetRequest(url)
@@ -136,7 +136,7 @@ public Promise getImplementations(String projectPa
@Override
public Promise> getProjectsAndPackages(boolean includePackage) {
- final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/get/projects/and/packages"
+ final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/get/projects/and/packages"
+ "?includepackages=" + includePackage;
return newPromise(new AsyncPromiseHelper.RequestCall>() {
@@ -153,13 +153,13 @@ public void makeCall(AsyncCallback> callback) {
@Override
public String getContentUrl(String projectPath, int libId, String path) {
- return appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/content" +
+ return appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/content" +
"?projectpath=" + projectPath + "&root=" + libId + "&path=" + path;
}
@Override
public Promise> getMethodParametersHints(String projectPath, String fqn, int offset, int lineStartOffset) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/parameters" +
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/parameters" +
"?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset + "&lineStart=" + lineStartOffset;
return requestFactory.createGetRequest(url)
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java
index f44a240f60e..ae36fb202cf 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java
@@ -47,7 +47,7 @@ public ClasspathServiceClientImpl(AsyncRequestFactory asyncRequestFactory,
this.appContext = appContext;
this.loader = loaderFactory.newLoader();
- this.pathToService = "/jdt/classpath";
+ this.pathToService = "/java/classpath";
}
@Override
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java
index 9dd34d2da73..61889a8e08a 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java
@@ -68,7 +68,7 @@ public RefactoringServiceClientImpl(AsyncRequestFactory asyncRequestFactory,
this.unmarshallerFactory = unmarshallerFactory;
this.appContext = appContext;
this.loader = loaderFactory.newLoader();
- this.pathToService = "/jdt/refactoring/";
+ this.pathToService = "/java/refactoring/";
}
/** {@inheritDoc} */
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java
index 09cc54c78ce..411d6d760b1 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java
@@ -52,7 +52,7 @@ public JavaSearchServiceRest(AsyncRequestFactory asyncRequestFactory,
this.unmarshallerFactory = unmarshallerFactory;
this.appContext = appContext;
this.loader = loaderFactory.newLoader();
- this.pathToService = "/jdt/search/find/usages";
+ this.pathToService = "/java/search/find/usages";
}
@Override
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java
index be3615f8543..37640f77dc2 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java
@@ -59,7 +59,7 @@ public JavaSearchServiceWS(MessageBusProvider provider,
this.dtoFactory = dtoFactory;
this.loader = loaderFactory.newLoader();
this.unmarshallerFactory = unmarshallerFactory;
- this.pathToService = "/jdt/search/";
+ this.pathToService = "/java/search/";
}
@Override
diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java
index a56fe4e5a96..83aee01cd3e 100644
--- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java
+++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java
@@ -44,7 +44,7 @@ public SettingsServiceClientImpl(AppContext appContext,
/** {@inheritDoc} */
@Override
public Promise applyCompileParameters(@NotNull final Map parameters) {
- String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/compiler-settings/set";
+ String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/compiler-settings/set";
JsonSerializable data = new JsonSerializable() {
@Override
@@ -62,7 +62,7 @@ public String toJson() {
/** {@inheritDoc} */
@Override
public Promise
-
- org.eclipse.che.plugin
- che-jdt-ext-machine
- ${project.version}
-
org.eclipse.che.plugin
che-plugin-cpp-lang-ide