seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CHE-9937 Fix Composer project type (#10606)

6.19.x
Igor Vinokur 2018-08-07 13:55:23 +03:00 committed by GitHub
parent b03be67f04
commit ba4f3397fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/plugin-composer/che-plugin-composer-server/src/main/java/org/eclipse/che/plugin/composer/server/projecttype/ComposerProjectGenerator.java
View File

@ -14,8 +14,6 @@ import java.nio.file.Path;
import java.util.Map;
import java.util.concurrent.TimeoutException;
import javax.inject.Inject;
import org.eclipse.che.api.core.ConflictException;
import org.eclipse.che.api.core.ForbiddenException;
import org.eclipse.che.api.core.ServerException;
import org.eclipse.che.api.fs.server.PathTransformer;
import org.eclipse.che.api.project.server.handlers.CreateProjectHandler;
@ -39,7 +37,7 @@ public class ComposerProjectGenerator implements CreateProjectHandler {
@Override
public void onCreateProject(
String projectWsPath, Map<String, AttributeValue> attributes, Map<String, String> options)
throws ForbiddenException, ConflictException, ServerException {
throws ServerException {
AttributeValue packageName = attributes.get(Constants.PACKAGE);
if (packageName == null) {
throw new ServerException("Missed some required options (package)");
@ -48,7 +46,7 @@ public class ComposerProjectGenerator implements CreateProjectHandler {
Path path = pathTransformer.transform(projectWsPath);
String projectAbsolutePath = path.toString();
String[] commandLine = {
"composer", "create-project", packageName.getString(), projectAbsolutePath, "--no-install"
"composer", "create-project", packageName.getString(), projectAbsolutePath
};
try {
commandExecutor.execute(commandLine, null);

2
plugins/plugin-composer/che-plugin-composer-server/src/main/java/org/eclipse/che/plugin/composer/server/projecttype/ComposerValueProviderFactory.java
View File

@ -57,7 +57,7 @@ public class ComposerValueProviderFactory implements ValueProviderFactory {
if (!composerDotJsonFsPath.toFile().exists()) {
return Collections.emptyList();
}
JsonObject model = readModel(projectFsPath);
JsonObject model = readModel(composerDotJsonFsPath);
String value = "";
if (attributeName.equals(PACKAGE) && model.has("name")) {