TESB-24597:Docker Support for Microservice - CI Part

main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/maven/MavenJavaProcessor.java

@@ -14,10 +14,12 @@ package org.talend.designer.runprocess.maven;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
@@ -26,15 +28,20 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Platform;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.CommonUIPlugin;
 import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.commons.utils.resource.FileExtensions;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IESBService;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.process.JobInfo;
 import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.JavaResourcesHelper;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.repository.utils.ItemResourceUtil;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.process.LastGenerationInfo;
@@ -58,6 +65,7 @@ import org.talend.designer.runprocess.ProcessorException;
 import org.talend.designer.runprocess.ProcessorUtilities;
 import org.talend.designer.runprocess.java.JavaProcessor;
 import org.talend.repository.i18n.Messages;
+import org.talend.repository.model.IProxyRepositoryFactory;
 
 /**
  * created by ggu on 2 Feb 2015 Detailled comment
@@ -303,6 +311,35 @@ public class MavenJavaProcessor extends JavaProcessor {
 
         buildTypeName = exportType != null ? exportType.toString() : null;
 
+        if (StringUtils.isBlank(buildTypeName)) {
+
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
+
+                List<IRepositoryViewObject> serviceRepoList = null;
+
+                IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+
+                try {
+                    IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+                    serviceRepoList = factory.getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "SERVICES"));
+
+                    for (IRepositoryViewObject serviceItem : serviceRepoList) {
+                        if (service != null) {
+                            List<String> jobIds = service.getSerivceRelatedJobIds(serviceItem.getProperty().getItem());
+                            if (jobIds.contains(itemProperty.getId())) {
+                                buildTypeName = "OSGI";
+                                break;
+                            }
+                        }
+                    }
+
+                } catch (PersistenceException e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+
+        }
+
         Map<String, Object> parameters = new HashMap<String, Object>();
         parameters.put(IBuildParametes.ITEM, itemProperty.getItem());
         parameters.put(IBuildPomCreatorParameters.PROCESSOR, this);

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/wizards/exportjob/handler/BuildOSGiBundleHandler.java

@@ -24,7 +24,6 @@ package org.talend.repository.ui.wizards.exportjob.handler;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +35,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.model.properties.ProcessItem;
-import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.designer.maven.launch.MavenPomCommandLauncher;
 import org.talend.designer.maven.model.MavenSystemFolders;
 import org.talend.designer.maven.model.TalendMavenConstants;
@@ -161,7 +159,7 @@ public class BuildOSGiBundleHandler extends BuildJobHandler {
                         fileExtension = esbExportType;
                     }
 
-                    if (fileExtension.equals(file.getFileExtension()) && file.getName().contains("bundle")) {
+                    if (fileExtension.equals(file.getFileExtension())) {
                         bundleFile = file;
                         break;
                     }

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/wizards/exportjob/scriptsmanager/BuildJobFactory.java

@@ -26,7 +26,6 @@ import org.talend.core.runtime.repository.build.BuildExportManager;
 import org.talend.core.runtime.repository.build.IBuildExportHandler;
 import org.talend.core.runtime.repository.build.IBuildJobParameters;
 import org.talend.core.runtime.repository.build.IBuildParametes;
-import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
 import org.talend.repository.constants.BuildJobConstants;
 import org.talend.repository.ui.wizards.exportjob.JavaJobScriptsExportWSWizardPage.JobExportType;
 import org.talend.repository.ui.wizards.exportjob.handler.BuildJobHandler;
@@ -97,16 +96,6 @@ public class BuildJobFactory {
                 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 (BuildJobConstants.esbComponents.contains(currentNode.getComponentName())) {
-                                esb = true;
-                                break;
-                            }
-                        }
-                    }
                 }
             }