Merge pull request #53 from codenvy/CHE-3720

CHE-3720: Decouple different agents on different maven modules
codenvy · Jan 25, 2017 · 1b845b8 · 1b845b8
2 parents 31f1a40 + 9dc2c00
commit 1b845b8
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 6 deletions.
diff --git a/assembly/openshift-plugin-assembly-wsmaster-war/pom.xml b/assembly/openshift-plugin-assembly-wsmaster-war/pom.xml
@@ -54,6 +54,38 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>exec-agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>ls-csharp-agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>ls-json-agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>ls-php-agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>ls-python-agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>ls-typescript-agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>ssh-agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>unison-agent</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-auth</artifactId>
@@ -102,6 +134,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-db-vendor-h2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>wsagent</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>wsmaster-local</artifactId>

diff --git a/...plugin-assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java b/...plugin-assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
@@ -15,6 +15,7 @@
 import com.google.inject.name.Names;
 
 import org.eclipse.che.api.agent.server.launcher.AgentLauncher;
+import org.eclipse.che.api.agent.shared.model.Agent;
 import org.eclipse.che.api.core.rest.CheJsonProvider;
 import org.eclipse.che.api.core.rest.MessageBodyAdapter;
 import org.eclipse.che.api.core.rest.MessageBodyAdapterInterceptor;
@@ -106,12 +107,27 @@ protected void configure() {
 
         bind(org.eclipse.che.api.workspace.server.event.MachineStateListener.class).asEagerSingleton();
 
-        bind(org.eclipse.che.api.agent.server.AgentRegistry.class).to(org.eclipse.che.api.agent.server.impl.LocalAgentRegistryImpl.class);
+        // agents
+        bind(org.eclipse.che.api.agent.server.AgentRegistryService.class);
 
-        Multibinder<AgentLauncher> agentLaunchers = Multibinder.newSetBinder(binder(), AgentLauncher.class);
-        agentLaunchers.addBinding().to(org.eclipse.che.api.workspace.server.launcher.WsAgentLauncherImpl.class);
-        agentLaunchers.addBinding().to(org.eclipse.che.api.workspace.server.launcher.TerminalAgentLauncherImpl.class);
-        agentLaunchers.addBinding().to(org.eclipse.che.api.workspace.server.launcher.SshAgentLauncherImpl.class);
+        bind(org.eclipse.che.api.agent.server.AgentRegistry.class).to(org.eclipse.che.api.agent.server.impl.AgentRegistryImpl.class);
+
+        Multibinder<Agent> agents = Multibinder.newSetBinder(binder(), Agent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.SshAgent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.UnisonAgent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.ExecAgent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.WsAgent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.LSPhpAgent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.LSPythonAgent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.LSJsonAgent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.LSCSharpAgent.class);
+        agents.addBinding().to(org.eclipse.che.api.agent.LSTypeScriptAgent.class);
+
+        Multibinder<AgentLauncher> launchers = Multibinder.newSetBinder(binder(), AgentLauncher.class);
+        launchers.addBinding().to(org.eclipse.che.api.agent.WsAgentLauncher.class);
+        launchers.addBinding().to(org.eclipse.che.api.agent.ExecAgentLauncher.class);
+        launchers.addBinding().to(org.eclipse.che.api.agent.SshMachineExecAgentLauncher.class);
+        launchers.addBinding().to(org.eclipse.che.api.agent.SshAgentLauncher.class);
 
         bind(org.eclipse.che.api.deploy.WsMasterAnalyticsAddresser.class);
 
@@ -126,7 +142,6 @@ protected void configure() {
         install(new org.eclipse.che.api.core.util.FileCleaner.FileCleanerModule());
         install(new org.eclipse.che.plugin.docker.machine.local.LocalDockerModule());
         install(new org.eclipse.che.api.machine.server.MachineModule());
-        install(new org.eclipse.che.api.agent.server.AgentModule());
         install(new org.eclipse.che.plugin.docker.machine.ext.DockerExtServerModule());
         install(new org.eclipse.che.swagger.deploy.DocsModule());
         install(new org.eclipse.che.plugin.machine.ssh.SshMachineModule());