Compare commits

...

1 Commits

Author SHA1 Message Date
SunChaoqun
b89164ba5c TESB-25922:Docker pubish: No progress bar in publish route dialog 2019-05-29 11:24:00 +08:00
2 changed files with 21 additions and 9 deletions

View File

@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.ProcessItem;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.runtime.process.IBuildJobHandler;
import org.talend.core.runtime.process.TalendProcessArgumentConstant;
import org.talend.core.runtime.repository.build.AbstractBuildProvider;
@@ -83,6 +84,7 @@ public class BuildJobFactory {
String buildType = null;
if (jobExportType != null) {
final String newType = oldBuildTypeMap.get(jobExportType);
if (newType == null) {// not valid type
return null;
}
@@ -107,12 +109,18 @@ public class BuildJobFactory {
boolean esb = false;
if (processItem instanceof ProcessItem) {
for (Object o : ((ProcessItem) processItem).getProcess().getNode()) {
if (o instanceof NodeType) {
NodeType currentNode = (NodeType) o;
if(esbComponents.contains(currentNode.getComponentName())) {
esb = true;
break;
ERepositoryObjectType repositoryObjectType = ERepositoryObjectType.getItemType(processItem);
if (repositoryObjectType == ERepositoryObjectType.PROCESS_ROUTE && "ROUTE_MICROSERVICE".equals(type)) {
esb = true;
} else {
for (Object o : ((ProcessItem) processItem).getProcess().getNode()) {
if (o instanceof NodeType) {
NodeType currentNode = (NodeType) o;
if (esbComponents.contains(currentNode.getComponentName())) {
esb = true;
break;
}
}
}
}

View File

@@ -211,6 +211,7 @@ public class BuildJobManager {
buildJob(destinationPath, itemToExport, version, context, exportChoiceMap, jobExportType, false, monitor);
}
IBuildJobHandler buildJobHandler = null;
public void buildJob(String destinationPath, ProcessItem itemToExport, String version, String context,
Map<ExportChoice, Object> exportChoiceMap, JobExportType jobExportType, boolean checkCompilationError,
IProgressMonitor monitor) throws Exception {
@@ -238,8 +239,10 @@ public class BuildJobManager {
final String label = processItem.getProperty().getLabel();
ITalendProcessJavaProject talendJavaProject = getRunProcessService()
.getTalendJobJavaProject(processItem.getProperty());
final IBuildJobHandler buildJobHandler = BuildJobFactory.createBuildJobHandler(processItem, context, version,
exportChoiceMap, jobExportType);
buildJobHandler = BuildJobFactory.createBuildJobHandler(processItem, context, version, exportChoiceMap,
jobExportType);
boolean isSignJob = false;
if (buildJobHandler instanceof AbstractBuildJobHandler) {
AbstractBuildJobHandler absBuildJobHandler = (AbstractBuildJobHandler)buildJobHandler;
@@ -264,7 +267,8 @@ public class BuildJobManager {
throw new OperationCanceledException(Messages.getString("BuildJobManager.operationCanceled")); //$NON-NLS-1$
}
if (jobExportType == JobExportType.IMAGE) {
if (jobExportType == JobExportType.IMAGE || jobExportType == JobExportType.MSESB
|| jobExportType == JobExportType.MSESB_IMAGE) {
IFile logFile = talendJavaProject.getProject().getFile("lastGenerated.log");
if (logFile.exists()) {
logFile.delete(true, false, subMonitor);