Compare commits

...

9 Commits

Author SHA1 Message Date
build-talend
0fb3bc30e9 DEVOPS-1729 Nexus migration: Update URLs 2017-03-02 01:16:29 +01:00
Carsten Biermann
2d84ef06e4 [DEVOPS-1556] New NOTICE file 2016-12-16 09:25:04 +01:00
ycbai
956882cddf TUP-16607: Generation issue on ELTMap component using Alias 2016-12-14 19:39:34 +08:00
qiongli
c40653dd6c TDQ-13026 consider the sub-job and joblet dependecies wherether include (#871)
tRuleSurvivorship node when export job.
2016-12-14 17:14:41 +08:00
guol
ff62f42cc5 Revert "TDI-36791 fix add Junit: ELT Map queries : compilation error with quotes https://jira.talendforge.org/browse/TDI-36791"
This reverts commit c3a34fa06b.
2016-12-12 17:52:21 +08:00
guol
48b4dd6e25 Revert "TDI-36791 fix: ELT Map queries : compilation error with quotes https://jira.talendforge.org/browse/TDI-36791"
This reverts commit a204e266e8.
2016-12-12 17:52:12 +08:00
Vladimir Bogatyrov
9595f27eca [TESB-18057] Fix 2016-12-12 08:28:59 +02:00
qiongli
6c642e7389 TDQ-12474 add a profiler "include-survivorship-rules" to export (#861)
survivorship rules. it only execute when the "include-items" not be
added.
2016-12-12 10:54:53 +08:00
Carsten Biermann
de0d82ca0f Set versions for 6.3.1 2016-12-07 14:07:38 +00:00
144 changed files with 2279 additions and 2308 deletions

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner.rcp.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.abstractmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.diagram.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.exchange.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.core.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.dbmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.documentation.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.hl7.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.mapper.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.job.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runprocess.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.scd.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.webservice.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.xmlmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.expressionbuilder.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.ftp.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.json.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.view.di.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sbi.engines.client.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.spagic.engines.client.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sqlbuilder.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sbi.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.spagic.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.components.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.libraries.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner.rcp</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.abstractmap</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.alfrescooutput</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.diagram</artifactId>

View File

@@ -711,6 +711,7 @@ this.globalResumeTicket = false;//to run others jobs
//5. all others sub-job (MultiThread mode)
if(isRunInMultiThread){
%>final Thread launchingThread = Thread.currentThread();<%
for (INode rootNode : rootNodes) {
String componentName = rootNode.getComponent().getName();
String uniqueName = rootNode.getUniqueName();
@@ -748,6 +749,10 @@ this.globalResumeTicket = false;//to run others jobs
status = localStatus;
}
if ("true".equals(((java.util.Map) threadLocal.get()).get("JobInterrupted"))) {
launchingThread.interrupt();
}
runningThreadCount.add(-1);
}
}
@@ -757,13 +762,22 @@ this.globalResumeTicket = false;//to run others jobs
}
}
%>
boolean interrupted = false;
while (runningThreadCount.getCount() > 0) {
try {
Thread.sleep(10);
} catch (java.lang.InterruptedException e) {
interrupted = true;
} catch (java.lang.Exception e) {
e.printStackTrace();
}
}
if (interrupted) {
Thread.currentThread().interrupt();
}
<%
} else { // isRunInMultiThread //5. all others sub-job (SingleThread mode)
for (INode rootNode : rootNodes) {

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.exchange</artifactId>

View File

@@ -11,7 +11,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.1.1</cxf.version>
<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
</properties>
<distributionManagement>

View File

@@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
</properties>
<distributionManagement>

View File

@@ -15,7 +15,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.1.1</cxf.version>
<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
</properties>
<distributionManagement>

View File

@@ -11,7 +11,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.1.1</cxf.version>
<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
</properties>
<distributionManagement>

View File

@@ -15,7 +15,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.1.1</cxf.version>
<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
</properties>
<distributionManagement>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.libs</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.localprovider</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.core.generic</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.core</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.dbmap</artifactId>

View File

@@ -643,7 +643,7 @@ public abstract class DbGenerationManager {
if (table.getAlias() == null) {
tableName = getHandledTableName(component, table.getName());
} else {
tableName = getHandledField(table.getName());
tableName = getHandledField(table.getAlias());
}
String locationInputEntry = language.getLocation(tableName, getHandledField(entryName));
sbWhere.append(DbMapSqlConstants.SPACE);
@@ -877,7 +877,6 @@ public abstract class DbGenerationManager {
String columnValue = entry.getKey();
String tableValue = entry.getValue();
String tempTable = tableValue;
// find original table name if tableValue is alias
String originaltableName = tableValue;
ExternalDbMapData externalData = (ExternalDbMapData) component.getExternalData();
@@ -885,7 +884,6 @@ public abstract class DbGenerationManager {
for (ExternalDbMapTable inputTable : inputTables) {
if (inputTable.getAlias() != null && inputTable.getAlias().equals(tableValue)) {
originaltableName = inputTable.getTableName();
tempTable = originaltableName;
}
}
@@ -943,10 +941,6 @@ public abstract class DbGenerationManager {
if (iconn.getLineStyle() == EConnectionType.TABLE_REF) {
continue;
}
if (oriName.trim().startsWith("\\\"") && oriName.trim().endsWith("\\\"")) {
expression = language.getLocation(tempTable, getHandledField(oriName));
continue;
}
oriName = oriName.replaceAll("\\$", "\\\\\\$"); //$NON-NLS-1$ //$NON-NLS-2$
expression = expression.replaceFirst("\\." + co.getLabel(), //$NON-NLS-1$
"\\." + oriName); //$NON-NLS-1$

View File

@@ -440,9 +440,6 @@ public class OracleGenerationManager extends DbGenerationManager {
int begin = expression.indexOf(specialColumn);
int length = specialColumn.length();
int allLength = expression.length();
if (specialColumn.trim().startsWith("\\\"") && specialColumn.trim().endsWith("\\\"")) {
return expression;
}
expression = expression.substring(0, begin) + "\\\"" + expression.substring(begin, begin + length) + "\\\""
+ expression.substring(begin + length, allLength);
return expression;

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.documentation</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.filemultischemas</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.fileoutputxml</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.gefabstractmap</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.hl7</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.mapper.advanced</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.mapper</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.job</artifactId>

View File

@@ -179,6 +179,12 @@
<include>config/**</include>
</includes>
</fileSet>
<fileSet><!-- survivorship rules -->
<directory>${survivorship.rules.dir}</directory>
<outputDirectory>${talend.job.name}/items/${talend.project.name.lowercase}/metadata/survivorship/</outputDirectory>
<includes>
</includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>

View File

@@ -323,5 +323,15 @@
<microservice.running.configs.dir>${current.resources.dir}/</microservice.running.configs.dir>
</properties>
</profile>
<profile>
<id>include-survivorship-rules</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<survivorship.rules.dir>${current.resources.dir}/metadata/survivorship/</survivorship.rules.dir>
</properties>
</profile>
</profiles>
</project>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.publish.core</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.rowgenerator</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runprocess</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runtime.visualization.tools</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runtime.visualization</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.scd</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.spss</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.webservice</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.xmlmap</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.expressionbuilder</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.asm</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.bonita</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.crm</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.css</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.custom</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.edifact</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.ehcache</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.excel</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.ftp</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.groovy</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.guava</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.hl7.jars</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.hl7</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jax</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jboss.jars</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jboss</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jersey</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jetty</artifactId>

Some files were not shown because too many files have changed in this diff Show More