Update to 7.3.1

Author: batje

META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BuildJob Plug-in
 Bundle-SymbolicName: au.org.emii.talend.codegen;singleton:=true
-Bundle-Version: 7.1.1
+Bundle-Version: 7.3.1
 Bundle-Activator: au.org.emii.talend.codegen.Activator
 Require-Bundle: org.eclipse.platform,
   org.eclipse.core.runtime,

README.md

@@ -1,13 +1,15 @@
 talend-codegen
 ==============
 
-Command line code generation (job export) plugin for talend open studio 7.1.1
+Command line code generation (job export) plugin for Talend open studio 7.3.1
 
 Building/Installation
 ---------------------
 
  * mvn clean package
  * Copy generated .jar in target directory to plugins directory of Talend
+ * Open the file config.info in the folder configuration/ of your Talend Studio 7.3.1
+ * At the end of the very long line for osgi.bundles= add ,au.org.emii.talend.codegen (so something like osgi.bundles=blalbblabla,au.org.emii.talend.codegen )
 
 Usage
 -----
@@ -45,8 +47,7 @@ This example is taken from our Jenkins build process - $WORKSPACE is the locatio
 
 TOS_DI-linux-gtk-x86_64 -nosplash --launcher.suppressErrors -data $WORKSPACE/../.talend-workspace --clean_component_cache -application au.org.emii.talend.codegen.Generator -jobName ThreddsExample -projectDir $WORKSPACE -targetDir $WORKSPACE/.talend-build -componentDir /par2/git-repos/talend_components
 
-
 Credits
 -------
 
-This project was originally developed for the [Australian Ocean Data Network](https://portal.aodn.org.au/). 
+This project was originally developed for the [Australian Ocean Data Network](https://portal.aodn.org.au/). The project came with docker support, which you can still find in the [original branch](../original). 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>au.org.emii.talend</groupId>
     <artifactId>au.org.emii.talend.codegen</artifactId>
-    <version>7.1.1</version>
+    <version>7.3.1</version>
     <packaging>eclipse-plugin</packaging>
 
     <properties>
@@ -17,9 +17,19 @@
     <repositories>
         <repository>
             <id>talend_eclipse_repository</id>
+            <url>https://artifacts-oss.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceRelease/org/talend/studio/talend-tos-p2-repo/7.3.1/talend-tos-p2-repo-7.3.1.zip-unzip/</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>talend_eclipse_rep_one_one</id>
             <url>https://artifacts-oss.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceRelease/org/talend/studio/talend-tos-p2-repo/7.1.1/talend-tos-p2-repo-7.1.1.zip-unzip/</url>
             <layout>p2</layout>
         </repository>
+        <repository>
+            <id>eclipse</id>
+            <url>https://download.eclipse.org/releases/photon/</url>
+            <layout>p2</layout>
+        </repository>
     </repositories>
 
     <build>

src/au/org/emii/talend/codegen/Generator.java

@@ -67,6 +67,9 @@ public Object start(IApplicationContext context) throws Exception {
         // user components directory
         String componentDir = Params.getStringOption("-componentDir", "");
 
+        // Context Name
+        String contextName = Params.getStringOption("-contextName", "Default");
+
         // job build options
 
         Map<ExportChoice, Object> exportChoiceMap = getExportOptions();
@@ -95,7 +98,7 @@ public Object start(IApplicationContext context) throws Exception {
 
         // Initialise connection to the local repository (the workspace)
         repository = connectToRepository();
-        
+
         // Import project into workspace
         project = ProjectUtils.importProject(projectDir);
 
@@ -140,7 +143,7 @@ public Object start(IApplicationContext context) throws Exception {
         }
 
         // Export the job
-        exportJob(project, jobName, targetDir, version, exportChoiceMap);
+        exportJob(project, jobName, targetDir, version, contextName, exportChoiceMap);
 
         // Log off the project
         log.info("Logging off " + project.getLabel() + "...");
@@ -156,7 +159,7 @@ public void stop() {
     }
 
     // Build export file
-    private void exportJob(Project project, String jobName, String targetDir, String version,
+    private void exportJob(Project project, String jobName, String targetDir, String version, String contextName,
                            Map<ExportChoice, Object> exportChoiceMap) throws Exception {
 
         log.info("Building " + jobName + "...");
@@ -166,7 +169,7 @@ private void exportJob(Project project, String jobName, String targetDir, String
 
         String destinationPath = targetDir + "/" + job.getProperty().getLabel() + "_" + version + ".zip";
 
-        BuildJobManager.getInstance().buildJob(destinationPath, job, version, "Default", exportChoiceMap, JobExportType.POJO, true, new NullProgressMonitor());
+        BuildJobManager.getInstance().buildJob(destinationPath, job, version, contextName, exportChoiceMap, JobExportType.POJO, true, new NullProgressMonitor());
     }
 
     // Find specified version of job
@@ -199,7 +202,7 @@ private ProxyRepositoryFactory connectToRepository()
 
         Context ctx = CorePlugin.getContext();
         ctx.putProperty(Context.REPOSITORY_CONTEXT_KEY, repositoryContext);
-        
+
         return repositoryFactory;
     }
 
@@ -219,15 +222,15 @@ private Map<ExportChoice, Object> getExportOptions() {
         exportChoiceMap.put(ExportChoice.includeTestSource, Params.getBooleanOption("-includeTestSource", Boolean.FALSE));
         exportChoiceMap.put(ExportChoice.executeTests, Params.getBooleanOption("-executeTests", Boolean.FALSE));
         exportChoiceMap.put(ExportChoice.binaries, Params.getBooleanOption("-binaries", Boolean.TRUE));
-        exportChoiceMap.put(ExportChoice.needContext, Params.getBooleanOption("-needContext", Boolean.FALSE));
-        exportChoiceMap.put(ExportChoice.contextName, Params.getStringOption("-contextName", null));
+        exportChoiceMap.put(ExportChoice.needContext, Params.getBooleanOption("-needContext", Boolean.TRUE));
+        exportChoiceMap.put(ExportChoice.contextName, Params.getStringOption("-contextName", "Default"));
         exportChoiceMap.put(ExportChoice.applyToChildren, Params.getBooleanOption("-applyToChildren", Boolean.FALSE));
         exportChoiceMap.put(ExportChoice.needLog4jLevel, Params.getBooleanOption("-needLog4jLevel", Boolean.FALSE));
         exportChoiceMap.put(ExportChoice.log4jLevel, Params.getStringOption("-log4jLevel", null));
         exportChoiceMap.put(ExportChoice.addStatistics, Params.getBooleanOption("-addStatistics", Boolean.TRUE));
         exportChoiceMap.put(ExportChoice.needDependencies, Params.getBooleanOption("-needDependencies", Boolean.TRUE));
         exportChoiceMap.put(ExportChoice.needParameterValues, Params.getBooleanOption("-needParameterValues", Boolean.FALSE));
-        
+
         return exportChoiceMap;
     }
 
@@ -237,5 +240,5 @@ private User createUser() {
         user.setLogin("[email protected]"); //$NON-NLS-1$
         return user;
     }
-   
+
 }