-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Inject MAVEN_OPTS environment variable along with JAVA_OPTS to container
- Loading branch information
Yevhenii Voevodin
committed
Feb 14, 2017
1 parent
e4099b8
commit 9370327
Showing
11 changed files
with
145 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (c) 2012-2017 Codenvy, S.A. | ||
| All rights reserved. This program and the accompanying materials | ||
| are made available under the terms of the Eclipse Public License v1.0 | ||
| which accompanies this distribution, and is available at | ||
| http://www.eclipse.org/legal/epl-v10.html | ||
| Contributors: | ||
| Codenvy, S.A. - initial API and implementation | ||
| --> | ||
| <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> | ||
| <artifactId>che-plugin-maven-parent</artifactId> | ||
| <groupId>org.eclipse.che.plugin</groupId> | ||
| <version>5.3.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>che-plugin-maven-wsmaster</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>Che Plugin :: Maven :: Workspace Master</name> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.google.inject</groupId> | ||
| <artifactId>guice</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.inject.extensions</groupId> | ||
| <artifactId>guice-multibindings</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax.inject</groupId> | ||
| <artifactId>javax.inject</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.che.core</groupId> | ||
| <artifactId>che-core-commons-annotations</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.che.core</groupId> | ||
| <artifactId>che-core-commons-inject</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
40 changes: 40 additions & 0 deletions
40
...ven-wsmaster/src/main/java/org/eclipse/che/plugin/maven/MavenOptsEnvVariableProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2012-2017 Codenvy, S.A. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Codenvy, S.A. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.che.plugin.maven; | ||
|
|
||
| import org.eclipse.che.commons.annotation.Nullable; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.inject.Named; | ||
| import javax.inject.Provider; | ||
|
|
||
| /** | ||
| * Provides MAVEN_OPTS environment variable with a value set to either maven options | ||
| * from configuration or java options if maven options are not set. | ||
| * | ||
| * @author Yevhenii Voevodin | ||
| */ | ||
| public class MavenOptsEnvVariableProvider implements Provider<String> { | ||
|
|
||
| @Inject | ||
| @Named("che.workspace.java.options") | ||
| private String javaOpts; | ||
|
|
||
| @Inject | ||
| @Named("che.workspace.maven.options") | ||
| @Nullable | ||
| private String mavenOpts; | ||
|
|
||
| @Override | ||
| public String get() { | ||
| return "MAVEN_OPTS=" + (mavenOpts == null ? javaOpts : mavenOpts); | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
.../che-plugin-maven-wsmaster/src/main/java/org/eclipse/che/plugin/maven/WsMasterModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2012-2017 Codenvy, S.A. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Codenvy, S.A. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.che.plugin.maven; | ||
|
|
||
| import com.google.inject.AbstractModule; | ||
| import com.google.inject.multibindings.Multibinder; | ||
| import com.google.inject.name.Names; | ||
|
|
||
| import org.eclipse.che.inject.DynaModule; | ||
|
|
||
| /** | ||
| * Binds maven-plugin related properties. | ||
| * | ||
| * @author Yevhenii Voevodin | ||
| */ | ||
| @DynaModule | ||
| public class WsMasterModule extends AbstractModule { | ||
| @Override | ||
| protected void configure() { | ||
| Multibinder.newSetBinder(binder(), String.class, Names.named("machine.docker.dev_machine.machine_env")) | ||
| .addBinding() | ||
| .toProvider(MavenOptsEnvVariableProvider.class); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters