TESB-23362 : deactivating running microservice code.

main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/DefaultRunProcessService.java

@@ -208,7 +208,8 @@ public class DefaultRunProcessService implements IRunProcessService {
         boolean isTestContainer = false;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
             ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
-                    .getDefault().getService(ITestContainerProviderService.class);
+                    .getDefault()
+                    .getService(ITestContainerProviderService.class);
             if (testContainerService != null && property != null && property.getItem() != null) {
                 isTestContainer = testContainerService.isTestContainerItem(property.getItem());
             }
@@ -218,7 +219,8 @@ public class DefaultRunProcessService implements IRunProcessService {
         }
         // check for ESB Runtime
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBRunContainerService.class)) {
-            IESBRunContainerService runContainerService = (IESBRunContainerService) GlobalServiceRegister.getDefault()
+            IESBRunContainerService runContainerService = (IESBRunContainerService) GlobalServiceRegister
+                    .getDefault()
                     .getService(IESBRunContainerService.class);
             if (runContainerService != null) {
                 IProcessor processor = runContainerService.createJavaProcessor(process, property, filenameFromLabel);
@@ -237,23 +239,26 @@ public class DefaultRunProcessService implements IRunProcessService {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBMicroService.class)) {
             microService = (IESBMicroService) GlobalServiceRegister.getDefault().getService(IESBMicroService.class);
 
-            if (ProcessorUtilities.isExportJobAsMicroService()) {
+            if (ProcessorUtilities.isExportESBAsMicroService()) {
                 if (microService != null) {
-                    IProcessor processor = microService.createJavaProcessor(process, property, filenameFromLabel, false);
+                    IProcessor processor =
+                            microService.createJavaProcessor(process, property, filenameFromLabel, false);
                     if (processor != null) {
                         return processor;
                     }
                 }
             }
-            if (property != null && property.getAdditionalProperties() != null
-                    && "REST_MS".equals(property.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE))) {
+
+            if (property != null && property.getAdditionalProperties() != null && "REST_MS"
+                    .equals(property.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE))) {
                 if (microService != null) {
-                    IProcessor processor = microService.createJavaProcessor(process, property, filenameFromLabel, false);
-                    if (processor != null) {
-                        return processor;
+                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
+                        soapService = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+                        return soapService.createOSGIJavaProcessor(process, property, filenameFromLabel);
                     }
                 }
             }
+
         }
 
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBRouteService.class)) {
@@ -263,7 +268,8 @@ public class DefaultRunProcessService implements IRunProcessService {
         // Create maven processer for SOAP service, @see org.talend.designer.runprocess.java.TalendJavaProjectManager
         if (process == null && GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
             soapService = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
-            if (property.getItem() != null && soapService.isServiceItem(property.getItem().eClass().getClassifierID())) {
+            if (property.getItem() != null
+                    && soapService.isServiceItem(property.getItem().eClass().getClassifierID())) {
                 return (IProcessor) soapService.createJavaProcessor(process, property, filenameFromLabel);
             }
         }
@@ -297,8 +303,10 @@ public class DefaultRunProcessService implements IRunProcessService {
 
             if (property != null) {
                 boolean servicePart = false;
-                List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(property.getId(),
-                        property.getVersion(), RelationshipItemBuilder.JOB_RELATION);
+                List<Relation> relations = RelationshipItemBuilder
+                        .getInstance()
+                        .getItemsRelatedTo(property.getId(), property.getVersion(),
+                                RelationshipItemBuilder.JOB_RELATION);
 
                 for (Relation relation : relations) {
                     if (RelationshipItemBuilder.SERVICES_RELATION.equals(relation.getType())) {
@@ -393,9 +401,10 @@ public class DefaultRunProcessService implements IRunProcessService {
      * org.talend.core.model.process.IProcess, java.util.Set)
      */
     @Override
-    public void updateLibraries(Set<ModuleNeeded> jobModuleList, IProcess process, Set<ModuleNeeded> alreadyRetrievedModules)
-            throws ProcessorException {
-        JavaProcessorUtilities.computeLibrariesPath(new HashSet<ModuleNeeded>(jobModuleList), process, alreadyRetrievedModules);
+    public void updateLibraries(Set<ModuleNeeded> jobModuleList, IProcess process,
+            Set<ModuleNeeded> alreadyRetrievedModules) throws ProcessorException {
+        JavaProcessorUtilities
+                .computeLibrariesPath(new HashSet<ModuleNeeded>(jobModuleList), process, alreadyRetrievedModules);
     }
 
     @Override
@@ -551,12 +560,18 @@ public class DefaultRunProcessService implements IRunProcessService {
     public void updateLogFiles(ITalendProcessJavaProject talendJavaProject, boolean isLogForJob) {
         // create the .prefs file and save log4j.xml and common-logging.properties's content into it
         if (!Log4jPrefsSettingManager.getInstance().isLog4jPrefsExist()) {
-            Log4jPrefsSettingManager.getInstance().createTalendLog4jPrefs(Log4jPrefsConstants.LOG4J_ENABLE_NODE,
-                    Log4jUtil.isEnable() ? Boolean.TRUE.toString() : Boolean.FALSE.toString());
-            Log4jPrefsSettingManager.getInstance().createTalendLog4jPrefs(Log4jPrefsConstants.LOG4J_CONTENT_NODE,
-                    getLogTemplate(RESOURCE_LOG_FILE_PATH));
-            Log4jPrefsSettingManager.getInstance().createTalendLog4jPrefs(Log4jPrefsConstants.COMMON_LOGGING_NODE,
-                    getLogTemplate(RESOURCE_COMMONLOG_FILE_PATH));
+            Log4jPrefsSettingManager
+                    .getInstance()
+                    .createTalendLog4jPrefs(Log4jPrefsConstants.LOG4J_ENABLE_NODE,
+                            Log4jUtil.isEnable() ? Boolean.TRUE.toString() : Boolean.FALSE.toString());
+            Log4jPrefsSettingManager
+                    .getInstance()
+                    .createTalendLog4jPrefs(Log4jPrefsConstants.LOG4J_CONTENT_NODE,
+                            getLogTemplate(RESOURCE_LOG_FILE_PATH));
+            Log4jPrefsSettingManager
+                    .getInstance()
+                    .createTalendLog4jPrefs(Log4jPrefsConstants.COMMON_LOGGING_NODE,
+                            getLogTemplate(RESOURCE_COMMONLOG_FILE_PATH));
         }
         // if directly init or modify log4j,need handle with the log4j under .setting/,if not,means execute or export
         // job,need to copy the latest log4j from .setting/ to /java/src
@@ -624,7 +639,8 @@ public class DefaultRunProcessService implements IRunProcessService {
 
     @Override
     public boolean isJobRunning() {
-        final RunProcessContext activeContext = RunProcessPlugin.getDefault().getRunProcessContextManager().getActiveContext();
+        final RunProcessContext activeContext =
+                RunProcessPlugin.getDefault().getRunProcessContextManager().getActiveContext();
 
         if (activeContext == null) {
             return false;
@@ -778,7 +794,8 @@ public class DefaultRunProcessService implements IRunProcessService {
             AggregatorPomsHelper helper = new AggregatorPomsHelper();
             helper.installRootPom(false);
             AggregatorPomsHelper.updateAllCodesProjectNeededModules(monitor);
-            List<ProjectReference> references = ProjectManager.getInstance().getCurrentProject().getProjectReferenceList(true);
+            List<ProjectReference> references =
+                    ProjectManager.getInstance().getCurrentProject().getProjectReferenceList(true);
             for (ProjectReference ref : references) {
                 initRefPoms(new Project(ref.getReferencedProject()));
             }
@@ -811,13 +828,14 @@ public class DefaultRunProcessService implements IRunProcessService {
         }
     }
 
-    private void installRefCodeProject(ERepositoryObjectType codeType, AggregatorPomsHelper refHelper, IProgressMonitor monitor)
-            throws Exception, CoreException {
+    private void installRefCodeProject(ERepositoryObjectType codeType, AggregatorPomsHelper refHelper,
+            IProgressMonitor monitor) throws Exception, CoreException {
         if (!refHelper.getProjectRootPom().exists()) {
             return;
         }
         String projectTechName = refHelper.getProjectTechName();
-        ITalendProcessJavaProject codeProject = TalendJavaProjectManager.getExistingTalendCodeProject(codeType, projectTechName);
+        ITalendProcessJavaProject codeProject =
+                TalendJavaProjectManager.getExistingTalendCodeProject(codeType, projectTechName);
         if (codeProject != null) {
             codeProject.buildWholeCodeProject();
             Map<String, Object> argumentsMap = new HashMap<>();
@@ -850,7 +868,8 @@ public class DefaultRunProcessService implements IRunProcessService {
         Set<String> childJobDependencies = new HashSet<String>();
         List<IFile> childPoms = new ArrayList<IFile>();
         for (JobInfo info : listJobs) {
-            IRepositoryViewObject specificVersion = factory.getSpecificVersion(info.getJobId(), info.getJobVersion(), true);
+            IRepositoryViewObject specificVersion =
+                    factory.getSpecificVersion(info.getJobId(), info.getJobVersion(), true);
             Property property = specificVersion.getProperty();
             String groupId = PomIdsHelper.getJobGroupId(property);
             String artifactId = PomIdsHelper.getJobArtifactId(property);
@@ -869,8 +888,9 @@ public class DefaultRunProcessService implements IRunProcessService {
             if (!targetFolder.exists()) {
                 targetFolder.create(true, false, progressMonitor);
             }
-            FilesUtils.copyDirectory(new File(codeFile.getLocation().toPortableString()),
-                    new File(targetFolder.getLocation().toPortableString()));
+            FilesUtils
+                    .copyDirectory(new File(codeFile.getLocation().toPortableString()),
+                            new File(targetFolder.getLocation().toPortableString()));
         }
 
         PomUtil.updateMainJobDependencies(mainJobInfo.getPomFile(), childPoms, childJobDependencies, progressMonitor);

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

@@ -141,29 +141,31 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
     protected boolean needXmlMappings() {
         // based on the generate codes(ProcessorUtilities.generateCode)
         if (this.version == null) {
-            return LastGenerationInfo.getInstance().isUseDynamic(processItem.getProperty().getId(),
-                    processItem.getProperty().getVersion());
+            return LastGenerationInfo
+                    .getInstance()
+                    .isUseDynamic(processItem.getProperty().getId(), processItem.getProperty().getVersion());
         }
         return LastGenerationInfo.getInstance().isUseDynamic(processItem.getProperty().getId(), this.version);
     }
 
     protected boolean needRules() {
         if (this.version == null) {
-            return LastGenerationInfo.getInstance().isUseRules(processItem.getProperty().getId(),
-                    processItem.getProperty().getVersion());
+            return LastGenerationInfo
+                    .getInstance()
+                    .isUseRules(processItem.getProperty().getId(), processItem.getProperty().getVersion());
         }
         return LastGenerationInfo.getInstance().isUseRules(processItem.getProperty().getId(), this.version);
     }
 
     protected boolean needPigUDFs() {
         if (this.version == null) {
-            return LastGenerationInfo.getInstance().isUsePigUDFs(processItem.getProperty().getId(),
-                    processItem.getProperty().getVersion());
+            return LastGenerationInfo
+                    .getInstance()
+                    .isUsePigUDFs(processItem.getProperty().getId(), processItem.getProperty().getVersion());
         }
         return LastGenerationInfo.getInstance().isUsePigUDFs(processItem.getProperty().getId(), this.version);
     }
 
-
     protected String getProgramArgs() {
         StringBuffer programArgs = new StringBuffer();
         StringBuffer profileArgs = getProfileArgs();
@@ -193,7 +195,8 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
         // should add the default settings always.
         addArg(profileBuffer, true, true, TalendMavenConstants.PROFILE_DEFAULT_SETTING);
 
-        addArg(profileBuffer, isOptionChoosed(ExportChoice.needSourceCode), TalendMavenConstants.PROFILE_INCLUDE_JAVA_SOURCES);
+        addArg(profileBuffer, isOptionChoosed(ExportChoice.needSourceCode),
+                TalendMavenConstants.PROFILE_INCLUDE_JAVA_SOURCES);
         // if not binaries, need add maven resources
         boolean isBinaries = isOptionChoosed(ExportChoice.binaries);
         addArg(profileBuffer, !isBinaries, TalendMavenConstants.PROFILE_INCLUDE_MAVEN_RESOURCES);
@@ -214,16 +217,20 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
                 TalendMavenConstants.PROFILE_INCLUDE_CONTEXTS);
 
         // for test
-        addArg(profileBuffer, isOptionChoosed(ExportChoice.includeTestSource), TalendMavenConstants.PROFILE_INCLUDE_TEST_SOURCES);
-        addArg(profileBuffer, isOptionChoosed(ExportChoice.executeTests), TalendMavenConstants.PROFILE_INCLUDE_TEST_REPORTS);
+        addArg(profileBuffer, isOptionChoosed(ExportChoice.includeTestSource),
+                TalendMavenConstants.PROFILE_INCLUDE_TEST_SOURCES);
+        addArg(profileBuffer, isOptionChoosed(ExportChoice.executeTests),
+                TalendMavenConstants.PROFILE_INCLUDE_TEST_REPORTS);
 
         // xmlMappings folders
         addArg(profileBuffer, needXmlMappings(), TalendMavenConstants.PROFILE_INCLUDE_XMLMAPPINGS);
-        addArg(profileBuffer, needXmlMappings() && isBinaries, TalendMavenConstants.PROFILE_INCLUDE_RUNNING_XMLMAPPINGS);
+        addArg(profileBuffer, needXmlMappings() && isBinaries,
+                TalendMavenConstants.PROFILE_INCLUDE_RUNNING_XMLMAPPINGS);
 
         // If the map doesn't contain the assembly key, then take the default value activation from the POM.
-        boolean isAssemblyNeeded = (exportChoice.get(ExportChoice.needAssembly) == null
-                || isOptionChoosed(ExportChoice.needAssembly)) && !isOptionChoosed(ExportChoice.buildImage);
+        boolean isAssemblyNeeded =
+                (exportChoice.get(ExportChoice.needAssembly) == null || isOptionChoosed(ExportChoice.needAssembly))
+                        && !isOptionChoosed(ExportChoice.buildImage);
         addArg(profileBuffer, isAssemblyNeeded, TalendMavenConstants.PROFILE_PACKAGING_AND_ASSEMBLY);
 
         // rules
@@ -289,7 +296,8 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
             otherArgsBuffer.append(TalendMavenConstants.ARG_TEST_FAILURE_IGNORE);
         }
         if (canSignJob()) {
-            otherArgsBuffer.append(" " + TalendMavenConstants.ARG_LICENSE_PATH + "=" + getLicenseFile().getAbsolutePath());
+            otherArgsBuffer
+                    .append(" " + TalendMavenConstants.ARG_LICENSE_PATH + "=" + getLicenseFile().getAbsolutePath());
             otherArgsBuffer.append(" " + TalendMavenConstants.ARG_SESSION_ID + "=" + getSessionId());
         }
         otherArgsBuffer.append(" -Dmaven.main.skip=true"); //$NON-NLS-1$
@@ -314,7 +322,7 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
     protected void addArg(StringBuffer commandBuffer, boolean include, String arg) {
         addArg(commandBuffer, false, include, arg);
     }
-    
+
     public boolean canSignJob() {
         if (PluginChecker.isTIS() && getLicenseFile() != null && !isOptionChoosed(ExportChoice.buildImage)) {
             return true;
@@ -324,8 +332,8 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
 
     protected File getLicenseFile() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisService.class)) {
-            ICoreTisService coreTisService = (ICoreTisService) GlobalServiceRegister.getDefault()
-                    .getService(ICoreTisService.class);
+            ICoreTisService coreTisService =
+                    (ICoreTisService) GlobalServiceRegister.getDefault().getService(ICoreTisService.class);
             File licenseFile = coreTisService.getLicenseFile();
             if (licenseFile.exists() && !coreTisService.isLicenseExpired()) {
                 return licenseFile;
@@ -336,8 +344,8 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
 
     private String getSessionId() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisService.class)) {
-            ICoreTisService coreTisService = (ICoreTisService) GlobalServiceRegister.getDefault()
-                    .getService(ICoreTisService.class);
+            ICoreTisService coreTisService =
+                    (ICoreTisService) GlobalServiceRegister.getDefault().getService(ICoreTisService.class);
             return coreTisService.generateSignerSessionId();
         }
         return null;
@@ -361,7 +369,7 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
             for (IResource resource : targetFolder.members()) {
                 if (resource instanceof IFile) {
                     IFile file = (IFile) resource;
-                    if (ProcessorUtilities.isExportJobAsMicroService()) {
+                    if (ProcessorUtilities.isExportESBAsMicroService()) {
                         if ("jar".equals(file.getFileExtension())) {
                             jobFile = file;
                             break;
@@ -391,8 +399,8 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler, IBuil
 
         //
         List<Item> dependenciesItems = new ArrayList<Item>();
-        Collection<IRepositoryViewObject> allProcessDependencies = ProcessUtils
-                .getAllProcessDependencies(Arrays.asList(processItem));
+        Collection<IRepositoryViewObject> allProcessDependencies =
+                ProcessUtils.getAllProcessDependencies(Arrays.asList(processItem));
         if (!allProcessDependencies.isEmpty()) {
             for (IRepositoryViewObject repositoryObject : allProcessDependencies) {
                 dependenciesItems.add(repositoryObject.getProperty().getItem());

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

@@ -37,23 +37,28 @@ public class JobScriptsManagerFactory {
             if (jobType != null && jobType instanceof ERepositoryObjectType) {
                 ERepositoryObjectType type = (ERepositoryObjectType) jobType;
                 if (type.equals(ERepositoryObjectType.PROCESS_MR)) {
-                    return new MapReduceJobJavaScriptsManager(exportChoiceMap, contextName, launcher, statisticPort, tracePort);
+                    return new MapReduceJobJavaScriptsManager(exportChoiceMap, contextName, launcher, statisticPort,
+                            tracePort);
                 } else if (type.equals(ERepositoryObjectType.valueOf("PROCESS_STORM"))) { //$NON-NLS-1$
-                    return new StormJobJavaScriptsManager(exportChoiceMap, contextName, launcher, statisticPort, tracePort);
+                    return new StormJobJavaScriptsManager(exportChoiceMap, contextName, launcher, statisticPort,
+                            tracePort);
                 }
             }
             return new JobJavaScriptsManager(exportChoiceMap, contextName, launcher, statisticPort, tracePort);
         case OSGI:
+            ProcessorUtilities.setExportESBAsMicroService(false);
             if (exportChoiceMap.containsKey(ExportChoice.needMavenScript)
                     && exportChoiceMap.get(ExportChoice.needMavenScript) == Boolean.TRUE) {
-                return new OSGIJavaScriptForESBWithMavenManager(exportChoiceMap, contextName, launcher, statisticPort, tracePort);
+                return new OSGIJavaScriptForESBWithMavenManager(exportChoiceMap, contextName, launcher, statisticPort,
+                        tracePort);
             } else {
                 // TESB-16721 [Export Job] On export job context always "Default"
                 return new JobJavaScriptOSGIForESBManager(exportChoiceMap, null, launcher, statisticPort, tracePort);
             }
         case MSESB:
-            ProcessorUtilities.setExportJobAsMicroSerivce(true);
-            return new JobJavaScriptMicroServiceForESBManager(exportChoiceMap, contextName, launcher, statisticPort, tracePort);
+            ProcessorUtilities.setExportESBAsMicroService(true);
+            return new JobJavaScriptMicroServiceForESBManager(exportChoiceMap, contextName, launcher, statisticPort,
+                    tracePort);
         default:
             //
         }