Skip to content

Commit

Permalink
fixup! Initial cleanup of che6 legacy code
Browse files Browse the repository at this point in the history 
Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
  • Loading branch information
@skabashnyuk
skabashnyuk committed Jul 8, 2019
1 parent 7bb672b commit eef66c0
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 140 deletions.
212 changes: 79 additions & 133 deletions assembly/assembly-wsmaster-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-persist</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
Expand All @@ -68,90 +72,32 @@
<artifactId>jaeger-tracerresolver</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>bootstrapper</artifactId>
<type>tar.gz</type>
<classifier>linux_amd64</classifier>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>che-exec-agent-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>exec-agent</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>git-credentials-agent</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>ls-camel-agent</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>ls-clang-agent</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>ls-csharp-agent</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>ls-golang-agent</artifactId>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>ls-java-agent</artifactId>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</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>ls-vue-agent</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>ls-yaml-agent</artifactId>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>ssh-agent</artifactId>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>terminal-agent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-account</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>unison-agent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-auth</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-auth</artifactId>
<artifactId>che-core-api-auth-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
Expand All @@ -169,6 +115,10 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-installer</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-installer-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-logger</artifactId>
Expand Down Expand Up @@ -209,14 +159,30 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-workspace-activity</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-auth</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-inject</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-logback</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-mail</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-schedule</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-db</artifactId>
Expand Down Expand Up @@ -257,34 +223,26 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-tracing-web</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>wsagent</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>wsmaster-local</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure</groupId>
<artifactId>infrastructure-openshift</artifactId>
<artifactId>infrastructure-kubernetes</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure.docker</groupId>
<artifactId>docker-auth</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure.docker</groupId>
<artifactId>docker-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure.docker</groupId>
<artifactId>infrastructure-docker</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
<artifactId>infrastructure-openshift</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.lib</groupId>
<artifactId>che-swagger-module</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.multiuser</groupId>
<artifactId>che-multiuser-api-authorization</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.multiuser</groupId>
<artifactId>che-multiuser-api-authorization-impl</artifactId>
Expand All @@ -297,6 +255,10 @@
<groupId>org.eclipse.che.multiuser</groupId>
<artifactId>che-multiuser-api-organization</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.multiuser</groupId>
<artifactId>che-multiuser-api-permission</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.multiuser</groupId>
<artifactId>che-multiuser-api-resource</artifactId>
Expand Down Expand Up @@ -365,14 +327,6 @@
<groupId>org.eclipse.che.multiuser</groupId>
<artifactId>che-multiuser-sql-schema</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-github-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-machine-ext-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
Expand Down Expand Up @@ -421,6 +375,10 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -459,56 +417,44 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-dynamodule-maven-plugin</artifactId>
<executions>
<execution>
<id>generate</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>analyze</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>copy-bootstrapper</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.che</groupId>
<artifactId>bootstrapper</artifactId>
<classifier>linux_amd64</classifier>
<type>tar.gz</type>
<destFileName>bootstrapper.tar.gz</destFileName>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<ignoredUnusedDeclaredDependencies>
<!-- dependency is required for log aggregation -->
<dep>org.slf4j:jcl-over-slf4j</dep>
<dep>org.slf4j:jul-to-slf4j</dep>
<dep>org.slf4j:log4j-over-slf4j</dep>
<dep>ch.qos.logback:logback-classic</dep>
<dep>net.logstash.logback:logstash-logback-encoder</dep>
<dep>com.h2database:h2</dep>
<dep>org.eclipse.che.core:che-core-db-vendor-mysql</dep>
<dep>org.eclipse.che.core:che-core-ide-stacks</dep>
<dep>org.eclipse.che.core:che-core-sql-schema</dep>
<dep>org.eclipse.che.core:che-core-api-ssh-shared</dep>
<dep>org.eclipse.che.core:che-core-api-project-templates-shared</dep>
<dep>org.eclipse.che.multiuser:che-multiuser-sql-schema</dep>
<dep>org.jgroups:jgroups</dep>
<dep>io.jaegertracing:jaeger-core</dep>
<dep>io.jaegertracing:jaeger-client</dep>
<dep>io.jaegertracing:jaeger-tracerresolver</dep>
<dep>org.eclipse.che.multiuser:che-multiuser-personal-account</dep>
<dep>org.eclipse.che.multiuser:che-multiuser-keycloak-token-provider</dep>
<dep>org.eclipse.persistence:org.eclipse.persistence.extension</dep>
<dep>org.eclipse.persistence:org.eclipse.persistence.jpa</dep>
<dep>org.jgroups.kubernetes:kubernetes</dep>
<dep>org.postgresql:postgresql</dep>
<dep>com.google.guava:guava</dep>
<dep>org.everrest:everrest-core</dep>
</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<packagingExcludes>WEB-INF/lib/**gwt**, WEB-INF/lib/jsr305*.jar</packagingExcludes>
</configuration>
</plugin>
<!-- Source Generator invocation -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
7 changes: 0 additions & 7 deletions assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.Map;
import java.util.Set;
import javax.sql.DataSource;
import org.eclipse.che.agent.exec.client.ExecAgentClientFactory;
import org.eclipse.che.api.core.notification.RemoteSubscriptionStorage;
import org.eclipse.che.api.core.rest.CheJsonProvider;
import org.eclipse.che.api.core.rest.MessageBodyAdapter;
Expand Down Expand Up @@ -99,8 +98,6 @@
import org.eclipse.che.security.PasswordEncryptor;
import org.eclipse.che.security.oauth.EmbeddedOAuthAPI;
import org.eclipse.che.security.oauth.OAuthAPI;
import org.eclipse.che.workspace.infrastructure.docker.DockerInfraModule;
import org.eclipse.che.workspace.infrastructure.docker.local.LocalDockerModule;
import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesInfraModule;
import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesInfrastructure;
import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment;
Expand Down Expand Up @@ -172,7 +169,6 @@ protected void configure() {
bind(org.eclipse.che.api.workspace.server.TemporaryWorkspaceRemover.class);
bind(org.eclipse.che.api.workspace.server.WorkspaceService.class);
install(new FactoryModuleBuilder().build(ServersCheckerFactory.class));
install(new FactoryModuleBuilder().build(ExecAgentClientFactory.class));

Multibinder<InternalEnvironmentProvisioner> internalEnvironmentProvisioners =
Multibinder.newSetBinder(binder(), InternalEnvironmentProvisioner.class);
Expand Down Expand Up @@ -289,9 +285,6 @@ protected void configure() {
install(new OpenShiftInfraModule());
} else if (KubernetesInfrastructure.NAME.equals(infrastructure)) {
install(new KubernetesInfraModule());
} else {
install(new LocalDockerModule());
install(new DockerInfraModule());
}
install(new CheJsonRpcWebSocketConfigurationModule());

Expand Down

0 comments on commit eef66c0

Please sign in to comment.