Skip to content

Commit 0543daf

Browse files
jlollingjlolling
committed
Compatible to Talend 7.2.1 and error message for check of already
running instances improved
1 parent 535323e commit 0543daf

File tree

8 files changed

+30
-23
lines changed

8 files changed

+30
-23
lines changed

‎pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,12 @@
6464
<plugin>
6565
<groupId>de.cimt.talendcomp</groupId>
6666
<artifactId>cimt-talendcomp-maven-plugin</artifactId>
67-
<version>1.8</version>
67+
<version>2.1</version>
68+
<configuration>
69+
<copyFromSourceBaseDir>${project.basedir}/talend_component</copyFromSourceBaseDir>
70+
<componentBaseDir>${project.basedir}/talend_component</componentBaseDir>
71+
<studioUserComponentFolder>/Data/Talend/Studio/talend_user_components</studioUserComponentFolder>
72+
</configuration>
6873
<executions>
6974
<execution>
7075
<id>tJobInstanceStart</id>
@@ -108,5 +113,5 @@
108113
</plugin>
109114
</plugins>
110115
</build>
111-
<version>7.7</version>
116+
<version>7.8</version>
112117
</project>

‎talend_component/tJobDataRangeScanner/tJobDataRangeScanner_java.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<COMPONENT>
4-
<HEADER AUTHOR="cimt AG" COMPATIBILITY="ALL" DATA_AUTO_PROPAGATE="true" PLATEFORM="ALL" RELEASE_DATE="20190917" SERIAL="" STARTABLE="false" STATUS="PROD" VERSION="7.7">
4+
<HEADER AUTHOR="cimt AG" COMPATIBILITY="ALL" DATA_AUTO_PROPAGATE="true" PLATEFORM="ALL" RELEASE_DATE="20191108" SERIAL="" STARTABLE="false" STATUS="PROD" VERSION="7.8">
55
<SIGNATURE/>
66
</HEADER>
77
<FAMILIES>
@@ -32,8 +32,8 @@
3232
</PARAMETER>
3333
</PARAMETERS>
3434
<ADVANCED_PARAMETERS>
35-
<PARAMETER NAME="RELEASE_LABEL_20190917" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
36-
<DEFAULT>Release: 7.7 build at: 20190917</DEFAULT>
35+
<PARAMETER NAME="RELEASE_LABEL_20191108" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
36+
<DEFAULT>Release: 7.8 build at: 20191108</DEFAULT>
3737
</PARAMETER>
3838
</ADVANCED_PARAMETERS>
3939
<CODEGENERATION>

‎talend_component/tJobInstanceEnd/tJobInstanceEnd_java.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<COMPONENT>
4-
<HEADER AUTHOR="cimt AG" COMPATIBILITY="ALL" DATA_AUTO_PROPAGATE="false" PLATEFORM="ALL" RELEASE_DATE="20190917" SERIAL="" STARTABLE="true" STATUS="PROD" VERSION="7.7">
4+
<HEADER AUTHOR="cimt AG" COMPATIBILITY="ALL" DATA_AUTO_PROPAGATE="false" PLATEFORM="ALL" RELEASE_DATE="20191108" SERIAL="" STARTABLE="true" STATUS="PROD" VERSION="7.8">
55
<SIGNATURE/>
66
</HEADER>
77
<FAMILIES>
@@ -88,8 +88,8 @@
8888
</PARAMETER>
8989
</PARAMETERS>
9090
<ADVANCED_PARAMETERS>
91-
<PARAMETER NAME="RELEASE_LABEL_20190917" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
92-
<DEFAULT>Release: 7.7 build at: 20190917</DEFAULT>
91+
<PARAMETER NAME="RELEASE_LABEL_20191108" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
92+
<DEFAULT>Release: 7.8 build at: 20191108</DEFAULT>
9393
</PARAMETER>
9494
</ADVANCED_PARAMETERS>
9595
<CODEGENERATION>

talend_component/tJobInstanceLiveCheck/cimt-talendcomp-jobinstance-7.7.jar renamed to talend_component/tJobInstanceLiveCheck/cimt-talendcomp-jobinstance-7.8.jar

88.9 KB
Binary file not shown.

‎talend_component/tJobInstanceLiveCheck/tJobInstanceLiveCheck_java.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<COMPONENT>
4-
<HEADER AUTHOR="cimt AG" COMPATIBILITY="ALL" DATA_AUTO_PROPAGATE="true" PLATEFORM="ALL" RELEASE_DATE="20190917" SERIAL="" STARTABLE="true" STATUS="PROD" VERSION="7.7">
4+
<HEADER AUTHOR="cimt AG" COMPATIBILITY="ALL" DATA_AUTO_PROPAGATE="true" PLATEFORM="ALL" RELEASE_DATE="20191108" SERIAL="" STARTABLE="true" STATUS="PROD" VERSION="7.8">
55
<SIGNATURE/>
66
</HEADER>
77
<FAMILIES>
@@ -56,17 +56,17 @@
5656
<PARAMETER FIELD="TEXT" NAME="TABLE_NAME" NUM_ROW="20" SHOW_IF="USE_PROJECT_SPECIFIC_NAMES == 'false'">
5757
<DEFAULT/>
5858
</PARAMETER>
59-
<PARAMETER NAME="RELEASE_LABEL_20190917" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
60-
<DEFAULT>Release: 7.7 build at: 20190917</DEFAULT>
59+
<PARAMETER NAME="RELEASE_LABEL_20191108" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
60+
<DEFAULT>Release: 7.8 build at: 20191108</DEFAULT>
6161
</PARAMETER>
6262
</ADVANCED_PARAMETERS>
6363
<CODEGENERATION>
6464
<IMPORTS>
6565
<!-- the name part "user" must match to the value in parameter PROJECT_SPECIFIC_NAME_MAP_RESOURCE <IMPORT NAME="custom_mapping_test" MODULE="mapping_user.properties.jar" REQUIRED="true" /> -->
66-
<IMPORT NAME="cimt-talendcomp-jobinstance" MODULE="cimt-talendcomp-jobinstance-7.7.jar" REQUIRED="true"/>
67-
<IMPORT NAME="gelfj" MODULE="gelfj-1.1.16.jar" REQUIRED="true"/>
68-
<IMPORT NAME="json-simple" MODULE="json-simple-1.1.jar" REQUIRED="true"/>
69-
<IMPORT NAME="jmxlocal" MODULE="jmxlocal-1.0.jar" REQUIRED="true"/>
66+
<IMPORT NAME="cimt-talendcomp-jobinstance" MODULE="cimt-talendcomp-jobinstance-7.8.jar" MVN="mvn:org.talend.libraries/cimt-talendcomp-jobinstance-7.8/6.0.0-SNAPSHOT" REQUIRED="true"/>
67+
<IMPORT NAME="gelfj" MODULE="gelfj-1.1.16.jar" MVN="mvn:org.talend.libraries/gelfj-1.1.16/6.0.0-SNAPSHOT" REQUIRED="true"/>
68+
<IMPORT NAME="json-simple" MODULE="json-simple-1.1.jar" MVN="mvn:org.talend.libraries/json-simple-1.1/6.0.0-SNAPSHOT" REQUIRED="true"/>
69+
<IMPORT NAME="jmxlocal" MODULE="jmxlocal-1.0.jar" MVN="mvn:org.talend.libraries/jmxlocal-1.0/6.0.0-SNAPSHOT" REQUIRED="true"/>
7070
</IMPORTS>
7171
</CODEGENERATION>
7272
<RETURNS>

talend_component/tJobInstanceStart/cimt-talendcomp-jobinstance-7.7.jar renamed to talend_component/tJobInstanceStart/cimt-talendcomp-jobinstance-7.8.jar

88.9 KB
Binary file not shown.

‎talend_component/tJobInstanceStart/tJobInstanceStart_begin.javajet‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,9 @@
244244
// check if a job instance is still running
245245
de.cimt.talendcomp.jobinstance.manage.JobInfo alreadyRunningJob = <%=cid%>.getJobInstanceAlreadyRunning(<%=checkJobSingletonByWorkItem%>);
246246
if (alreadyRunningJob != null) {
247-
System.err.println("Job: " + jobName + ": Already running instance detected!");
247+
String s = "Job: " + jobName + ": Already running instance detected with job_instance_id: " + alreadyRunningJob.getJobInstanceId() + ", started-at: " + TalendDate.formatDate("yyyy-MM-dd HH:mm:ss", alreadyRunningJob.getStartDate()) + ", host: " + alreadyRunningJob.getHostName() + ", os-pid: " + alreadyRunningJob.getHostPid();
248+
System.err.println(s);
249+
globalMap.put("<%=cid%>_ERROR_MESSAGE", s);
248250
globalMap.put("<%=cid%>_JOB_RUNS_ALONE", false);
249251
globalMap.put("<%=cid%>_ALREADY_RUNNING_JOB_START_DATE", alreadyRunningJob.getStartDate());
250252
globalMap.put("<%=cid%>_ALREADY_RUNNING_JOB_JOB_INSTANCE_ID", alreadyRunningJob.getJobInstanceId());

‎talend_component/tJobInstanceStart/tJobInstanceStart_java.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<COMPONENT>
4-
<HEADER AUTHOR="cimt AG" COMPATIBILITY="ALL" DATA_AUTO_PROPAGATE="false" PLATEFORM="ALL" RELEASE_DATE="20190917" SERIAL="" STARTABLE="true" STATUS="PROD" VERSION="7.7">
4+
<HEADER AUTHOR="cimt AG" COMPATIBILITY="ALL" DATA_AUTO_PROPAGATE="false" PLATEFORM="ALL" RELEASE_DATE="20191108" SERIAL="" STARTABLE="true" STATUS="PROD" VERSION="7.8">
55
<SIGNATURE/>
66
</HEADER>
77
<FAMILIES>
@@ -198,16 +198,16 @@
198198
<PARAMETER FIELD="CHECK" NAME="ACTIVATE_JMX" NUM_ROW="80">
199199
<DEFAULT>false</DEFAULT>
200200
</PARAMETER>
201-
<PARAMETER NAME="RELEASE_LABEL_20190917" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
202-
<DEFAULT>Release: 7.7 build at: 20190917</DEFAULT>
201+
<PARAMETER NAME="RELEASE_LABEL_20191108" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
202+
<DEFAULT>Release: 7.8 build at: 20191108</DEFAULT>
203203
</PARAMETER>
204204
</ADVANCED_PARAMETERS>
205205
<CODEGENERATION>
206206
<IMPORTS>
207-
<IMPORT NAME="cimt-talendcomp-jobinstance" MODULE="cimt-talendcomp-jobinstance-7.7.jar" REQUIRED="true"/>
208-
<IMPORT NAME="gelfj" MODULE="gelfj-1.1.16.jar" REQUIRED="true"/>
209-
<IMPORT NAME="json-simple" MODULE="json-simple-1.1.jar" REQUIRED="true"/>
210-
<IMPORT NAME="jmxlocal" MODULE="jmxlocal-1.0.jar" REQUIRED="true"/>
207+
<IMPORT NAME="cimt-talendcomp-jobinstance" MODULE="cimt-talendcomp-jobinstance-7.8.jar" MVN="mvn:org.talend.libraries/cimt-talendcomp-jobinstance-7.8/6.0.0-SNAPSHOT" REQUIRED="true"/>
208+
<IMPORT NAME="gelfj" MODULE="gelfj-1.1.16.jar" MVN="mvn:org.talend.libraries/gelfj-1.1.16/6.0.0-SNAPSHOT" REQUIRED="true"/>
209+
<IMPORT NAME="json-simple" MODULE="json-simple-1.1.jar" MVN="mvn:org.talend.libraries/json-simple-1.1/6.0.0-SNAPSHOT" REQUIRED="true"/>
210+
<IMPORT NAME="jmxlocal" MODULE="jmxlocal-1.0.jar" MVN="mvn:org.talend.libraries/jmxlocal-1.0/6.0.0-SNAPSHOT" REQUIRED="true"/>
211211
</IMPORTS>
212212
</CODEGENERATION>
213213
<RETURNS>

0 commit comments

Comments
 (0)