Compare commits
20 Commits
patch/TPS-
...
maintenanc
| Author | SHA1 | Date | |
|---|---|---|---|
|
ddf1ae2a53 | ||
|
|
ddf4ce4bda | ||
|
|
f72aaad86b | ||
|
|
7b3c19266c | ||
|
|
6d48b6b2c4 | ||
|
|
c1b3f85152 | ||
|
|
e2f6e1513d | ||
|
|
1530f1d559 | ||
|
|
f57b092922 | ||
|
|
3463f21bc4 | ||
|
|
d5aff3ca44 | ||
|
|
16b6f85622 | ||
|
|
cb8b5bb472 | ||
|
|
88619ea8a0 | ||
|
|
0be9d41165 | ||
|
|
58d15d2a5e | ||
|
|
7002a02eb6 | ||
|
|
7bf7cea605 | ||
|
|
e72f158920 | ||
|
|
c9ad66f311 |
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner.rcp.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.dbmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.documentation.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.hl7.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.job.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runprocess.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.scd.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.webservice.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.xmlmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.expressionbuilder.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.ftp.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.json.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.view.di.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.engines.client.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.engines.client.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sqlbuilder.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.components.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.libraries.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.component.core</artifactId>
|
||||
|
||||
@@ -56,6 +56,7 @@ import org.talend.core.model.temp.ECodePart;
|
||||
import org.talend.core.model.utils.TalendTextUtils;
|
||||
import org.talend.core.prefs.ITalendCorePrefConstants;
|
||||
import org.talend.core.ui.services.IComponentsLocalProviderService;
|
||||
import org.talend.core.utils.TalendQuoteUtils;
|
||||
import org.talend.designer.core.DesignerPlugin;
|
||||
import org.talend.designer.core.model.components.AbstractComponent;
|
||||
import org.talend.designer.core.model.components.DummyComponent;
|
||||
@@ -1633,7 +1634,8 @@ public class Component extends AbstractComponent {
|
||||
return "\"" + value + "\"";//$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
if (property.getType() == SchemaElement.Type.SCHEMA) {
|
||||
return "\"" + value.replace("\"", "\\\"") + "\"";//$NON-NLS-1$ //$NON-NLS-2$
|
||||
// Handles embedded escaped quotes which might occur
|
||||
return "\"" + value.replace("\\\"", "\\\\\"").replace("\"", "\\\"") + "\"";//$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,18 @@ package org.talend.component.core.utils;
|
||||
import java.util.List;
|
||||
|
||||
import org.talend.component.core.constants.IGenericConstants;
|
||||
import org.talend.components.api.properties.ComponentProperties;
|
||||
import org.talend.components.api.properties.ComponentProperties.Deserialized;
|
||||
import org.talend.components.api.schema.Schema;
|
||||
import org.talend.components.api.schema.SchemaElement;
|
||||
import org.talend.components.api.schema.SchemaElement.Type;
|
||||
import org.talend.core.model.metadata.IMetadataTable;
|
||||
import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
|
||||
import org.talend.core.model.metadata.builder.connection.MetadataColumn;
|
||||
import org.talend.core.model.metadata.builder.connection.MetadataTable;
|
||||
import org.talend.core.model.metadata.types.JavaTypesManager;
|
||||
import org.talend.core.repository.model.ProxyRepositoryFactory;
|
||||
import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
|
||||
import org.talend.repository.model.IProxyRepositoryFactory;
|
||||
import orgomg.cwm.objectmodel.core.CoreFactory;
|
||||
import orgomg.cwm.objectmodel.core.TaggedValue;
|
||||
@@ -96,4 +100,24 @@ public class SchemaUtils {
|
||||
metadataColumn.setDefaultValue(schemaElement.getDefaultValue());
|
||||
}
|
||||
|
||||
public static ComponentProperties getCurrentComponentProperties(IMetadataTable table) {
|
||||
if (table != null && table instanceof MetadataTableRepositoryObject) {
|
||||
MetadataTableRepositoryObject metaTableRepObj = (MetadataTableRepositoryObject) table;
|
||||
MetadataTable metadataTable = metaTableRepObj.getTable();
|
||||
if (metadataTable != null && metadataTable.getTaggedValue() != null) {
|
||||
for (TaggedValue serializedProps : metadataTable.getTaggedValue()) {
|
||||
if (IGenericConstants.COMPONENT_PROPERTIES_TAG.equals(serializedProps.getTag())) {
|
||||
String serializedProperties = serializedProps.getValue();
|
||||
if (serializedProperties != null) {
|
||||
Deserialized fromSerializedProperties = ComponentProperties.fromSerialized(serializedProperties);
|
||||
if (fromSerializedProperties != null) {
|
||||
return fromSerializedProperties.properties;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,4 +162,13 @@
|
||||
class="org.talend.component.ui.wizard.ui.context.handler.GenericRepositoryContextHandler">
|
||||
</RepositoryContext>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.talend.core.repository.repository_node_provider">
|
||||
<repositoryNode
|
||||
class="org.talend.component.ui.wizard.model.FakeGenericExtendNode"
|
||||
label="FakeGenericNode"
|
||||
products="DI"
|
||||
type="FakeGenericNodeType">
|
||||
</repositoryNode>
|
||||
</extension>
|
||||
</plugin>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.component.ui.wizard</artifactId>
|
||||
|
||||
@@ -16,6 +16,7 @@ import java.beans.PropertyChangeEvent;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.gef.commands.Command;
|
||||
import org.eclipse.jface.dialogs.IDialogConstants;
|
||||
import org.eclipse.jface.fieldassist.DecoratedField;
|
||||
@@ -36,12 +37,10 @@ import org.eclipse.swt.widgets.Text;
|
||||
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
|
||||
import org.talend.commons.ui.runtime.image.ImageProvider;
|
||||
import org.talend.component.core.model.GenericElementParameter;
|
||||
import org.talend.component.ui.wizard.ui.DynamicComposite;
|
||||
import org.talend.components.api.properties.NameAndLabel;
|
||||
import org.talend.core.model.process.IElementParameter;
|
||||
import org.talend.core.ui.CoreUIPlugin;
|
||||
import org.talend.core.ui.properties.tab.IDynamicProperty;
|
||||
import org.talend.core.utils.TalendQuoteUtils;
|
||||
import org.talend.designer.core.i18n.Messages;
|
||||
import org.talend.designer.core.ui.editor.nodes.Node;
|
||||
import org.talend.designer.core.ui.editor.properties.controllers.AbstractElementPropertySectionController;
|
||||
@@ -56,13 +55,8 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
|
||||
|
||||
private static final String MODULE = "MODULE"; //$NON-NLS-1$
|
||||
|
||||
private boolean isWizard;
|
||||
|
||||
public NameAndLabelsReferenceController(IDynamicProperty dp) {
|
||||
super(dp);
|
||||
if (dynamicProperty instanceof DynamicComposite) {
|
||||
isWizard = ((DynamicComposite) dynamicProperty).isWizard();
|
||||
}
|
||||
}
|
||||
|
||||
public Command createCommand() {
|
||||
@@ -83,19 +77,16 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
|
||||
}
|
||||
}
|
||||
}
|
||||
NameAndLabelsDialog nameAndLabelsDialog = new NameAndLabelsDialog(composite.getShell(), nals);
|
||||
if (nameAndLabelsDialog.open() == IDialogConstants.OK_ID) {
|
||||
String propertyName = (String) button.getData(PARAMETER_NAME);
|
||||
String result = StringUtils.trimToEmpty(nameAndLabelsDialog.getResult());
|
||||
Text moduleText = (Text) hashCurControls.get(propertyName);
|
||||
moduleText.setText(result);
|
||||
curParameter.setValue(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
NameAndLabelsDialog nameAndLabelsDialog = new NameAndLabelsDialog(composite.getShell(), nals);
|
||||
if (nameAndLabelsDialog.open() == IDialogConstants.OK_ID) {
|
||||
String propertyName = (String) button.getData(PARAMETER_NAME);
|
||||
String result = nameAndLabelsDialog.getResult();
|
||||
if (!isWizard) {
|
||||
result = TalendQuoteUtils.addQuotesIfNotExist(result);
|
||||
}
|
||||
Text moduleText = (Text) hashCurControls.get(propertyName);
|
||||
moduleText.setText(result);
|
||||
curParameter.setValue(result);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -154,6 +145,7 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
|
||||
Control cLayout = dField.getLayoutControl();
|
||||
Text moduleText = (Text) dField.getControl();
|
||||
moduleText.setData(PARAMETER_NAME, param.getName());
|
||||
moduleText.setEditable(false);
|
||||
cLayout.setBackground(subComposite.getBackground());
|
||||
|
||||
addDragAndDropTarget(moduleText);
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package org.talend.component.ui.wizard.model;
|
||||
|
||||
import org.talend.commons.ui.runtime.image.IImage;
|
||||
import org.talend.commons.ui.runtime.repository.IExtendRepositoryNode;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.runtime.services.IGenericWizardService;
|
||||
|
||||
/**
|
||||
*
|
||||
* created by ycbai on 2015年12月7日 Detailled comment
|
||||
*
|
||||
*/
|
||||
public class FakeGenericExtendNode implements IExtendRepositoryNode {
|
||||
|
||||
public FakeGenericExtendNode() {
|
||||
initGenericTypes();
|
||||
}
|
||||
|
||||
private void initGenericTypes() {
|
||||
IGenericWizardService wizardService = null;
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
|
||||
wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
|
||||
}
|
||||
if (wizardService != null) {
|
||||
wizardService.createNodesFromComponentService(null); // Just use to init generic types.
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IImage getNodeImage() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getOrdinal() {
|
||||
return 1000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object[] getChildren() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -67,8 +67,10 @@ public class GenericWizardService implements IGenericWizardService {
|
||||
String folder = "metadata/" + name; //$NON-NLS-1$ //TODO: maybe need to retrieve it from component service?
|
||||
int ordinal = 100;
|
||||
ERepositoryObjectType repositoryType = internalService.createRepositoryType(name, displayName, name, folder, ordinal);
|
||||
repNodes.add(internalService.createRepositoryNode(curParentNode, wizardDefinition.getDisplayName(), repositoryType,
|
||||
ENodeType.SYSTEM_FOLDER));
|
||||
if (curParentNode != null) {
|
||||
repNodes.add(internalService.createRepositoryNode(curParentNode, wizardDefinition.getDisplayName(),
|
||||
repositoryType, ENodeType.SYSTEM_FOLDER));
|
||||
}
|
||||
}
|
||||
return repNodes;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,16 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.commons.lang.exception.ExceptionUtils;
|
||||
import org.eclipse.core.resources.IWorkspace;
|
||||
import org.eclipse.core.resources.IWorkspaceRunnable;
|
||||
import org.eclipse.core.resources.ResourcesPlugin;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.core.runtime.Path;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.core.runtime.jobs.ISchedulingRule;
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.jface.wizard.IWizardContainer;
|
||||
@@ -25,6 +34,7 @@ import org.eclipse.swt.graphics.Image;
|
||||
import org.eclipse.ui.IWorkbench;
|
||||
import org.eclipse.ui.IWorkbenchWizard;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.ui.swt.dialogs.ErrorDialogWidthDetailArea;
|
||||
import org.talend.commons.utils.VersionUtils;
|
||||
import org.talend.component.core.constants.IGenericConstants;
|
||||
@@ -214,11 +224,10 @@ public class GenericConnWizard extends CheckLastVersionRepositoryWizard {
|
||||
}
|
||||
}
|
||||
try {
|
||||
final IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
|
||||
Form form = wizPage.getForm();
|
||||
if (form.isCallAfterFormFinish()) {
|
||||
if (creation) {
|
||||
factory.create(connectionItem, new Path("")); //$NON-NLS-1$
|
||||
createConnectionItem();
|
||||
}
|
||||
compService.afterFormFinish(form.getName(), form.getComponentProperties());
|
||||
}
|
||||
@@ -239,6 +248,27 @@ public class GenericConnWizard extends CheckLastVersionRepositoryWizard {
|
||||
}
|
||||
}
|
||||
|
||||
private void createConnectionItem() throws CoreException {
|
||||
IWorkspace workspace = ResourcesPlugin.getWorkspace();
|
||||
final IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
|
||||
IWorkspaceRunnable operation = new IWorkspaceRunnable() {
|
||||
|
||||
@Override
|
||||
public void run(IProgressMonitor monitor) throws CoreException {
|
||||
try {
|
||||
factory.create(connectionItem, new Path("")); //$NON-NLS-1$;
|
||||
} catch (PersistenceException e) {
|
||||
throw new CoreException(new Status(IStatus.ERROR, "org.talend.metadata.management.ui",
|
||||
"Error when create the connection", e));
|
||||
}
|
||||
}
|
||||
};
|
||||
ISchedulingRule schedulingRule = workspace.getRoot();
|
||||
// the update the project files need to be done in the workspace runnable to avoid all
|
||||
// notification of changes before the end of the modifications.
|
||||
workspace.run(operation, schedulingRule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean performCancel() {
|
||||
if (!creation) {
|
||||
|
||||
@@ -22,10 +22,13 @@ import org.talend.component.core.constants.IComponentConstants;
|
||||
import org.talend.component.core.dnd.AbstractComponentDragAndDropHandler;
|
||||
import org.talend.component.core.model.GenericElementParameter;
|
||||
import org.talend.component.core.utils.ComponentsUtils;
|
||||
import org.talend.component.core.utils.SchemaUtils;
|
||||
import org.talend.component.ui.model.genericMetadata.GenericConnection;
|
||||
import org.talend.component.ui.model.genericMetadata.GenericConnectionItem;
|
||||
import org.talend.components.api.properties.ComponentProperties;
|
||||
import org.talend.components.api.properties.ComponentProperties.Deserialized;
|
||||
import org.talend.components.api.schema.SchemaElement;
|
||||
import org.talend.components.api.schema.SchemaElement.Type;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.model.components.EComponentType;
|
||||
import org.talend.core.model.components.IComponent;
|
||||
@@ -90,19 +93,25 @@ public class GenericDragAndDropHandler extends AbstractComponentDragAndDropHandl
|
||||
}
|
||||
}
|
||||
if (IComponentConstants.SCHEMA.equalsIgnoreCase(paramName)) {
|
||||
if (table != null) {
|
||||
tableName = table.getTableName();
|
||||
if (tableName != null) {
|
||||
// return table.getId() + " - " + tableName;//$NON-NLS-1$
|
||||
ComponentProperties componentModuleProperties = SchemaUtils.getCurrentComponentProperties(table);
|
||||
if (componentModuleProperties != null) {
|
||||
SchemaElement schemaElement = componentModuleProperties.getProperty(paramName);
|
||||
if (schemaElement != null && schemaElement instanceof ComponentProperties) {
|
||||
return ComponentsUtils.getGenericPropertyValue(componentModuleProperties, schemaElement.getName()
|
||||
+ IComponentConstants.EXP_SEPARATOR + paramName);
|
||||
}
|
||||
}
|
||||
} else if (IComponentConstants.MODULENAME.equalsIgnoreCase(paramName)) {
|
||||
if (table != null) {
|
||||
tableName = table.getLabel();
|
||||
if (tableName == null) {
|
||||
tableName = table.getLabel();
|
||||
ComponentProperties componentModuleProperties = SchemaUtils.getCurrentComponentProperties(table);
|
||||
if (componentModuleProperties != null) {
|
||||
SchemaElement moduleElement = componentModuleProperties.getProperty(paramName);
|
||||
if (moduleElement != null) {
|
||||
if (Type.STRING.equals(moduleElement.getType())) {
|
||||
return getRepositoryValueOfStringType(connection, StringUtils.trimToNull(table.getLabel()));
|
||||
} else {
|
||||
return table.getLabel();
|
||||
}
|
||||
}
|
||||
return getRepositoryValueOfStringType(connection, StringUtils.trimToNull(tableName));
|
||||
}
|
||||
} else if (IComponentConstants.QUERYMODE.equalsIgnoreCase(paramName)) {
|
||||
if (ComponentsUtils.getGenericPropertyValue(componentProperties, value) != null) {
|
||||
|
||||
@@ -17,6 +17,7 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.core.resources.IResourceDelta;
|
||||
import org.eclipse.core.runtime.IPath;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.ui.navigator.CommonNavigator;
|
||||
import org.eclipse.ui.navigator.CommonViewer;
|
||||
import org.talend.core.repository.model.ProjectRepositoryNode;
|
||||
@@ -33,38 +34,6 @@ public class MetadataGenericContentProvider extends ProjectRepoDirectChildrenNod
|
||||
|
||||
MetadataNodeTester metadataNodeTester = new MetadataNodeTester();
|
||||
|
||||
// private final class GenericNodeDirectChildrenNodeVisitor extends RunnableResourceVisitor {
|
||||
//
|
||||
// @Override
|
||||
// protected boolean visit(IResourceDelta delta, Collection<Runnable> runnables) {
|
||||
// VisitResourceHelper visitHelper = new VisitResourceHelper(delta);
|
||||
// if (visitHelper.isIgnoredResource(delta)) {
|
||||
// return false;
|
||||
// }
|
||||
// Set<RepositoryNode> topLevelNodes = getTopLevelNodes();
|
||||
// if (topLevelNodes == null) {
|
||||
// return false;
|
||||
// }
|
||||
// boolean visitChildren = true;
|
||||
// for (final RepositoryNode repoNode : topLevelNodes) {
|
||||
// if ((repoNode.getContentType() == ERepositoryObjectType.PROCESS)
|
||||
// || (repoNode.getContentType() == ERepositoryObjectType.PROCESS_MR)) {
|
||||
// visitChildren = false; // if valid, don't visit the children any more.
|
||||
// if (viewer instanceof RepoViewCommonViewer) {
|
||||
// runnables.add(new TopLevelNodeRunnable(repoNode) {
|
||||
//
|
||||
// @Override
|
||||
// public void run() {
|
||||
// refreshTopLevelNode(repoNode);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return visitChildren;
|
||||
// }
|
||||
// }
|
||||
|
||||
private final class GenericNodeDirectChildrenNodeVisitor extends RunnableResourceVisitor {
|
||||
|
||||
@Override
|
||||
@@ -110,8 +79,9 @@ public class MetadataGenericContentProvider extends ProjectRepoDirectChildrenNod
|
||||
getTopLevelNodes().addAll(projectRepositoryNode.getGenericTopNodesMap().values());
|
||||
return getTopLevelNodes().toArray();
|
||||
}
|
||||
if (getTopLevelNodes().contains(repoNode)) {
|
||||
if (getTopLevelNodes().contains(repoNode) && !repoNode.isInitialized()) {
|
||||
projectRepositoryNode.initializeChildren(repoNode);
|
||||
repoNode.setInitialized(true);
|
||||
}
|
||||
return repoNode.getChildren().toArray();
|
||||
}
|
||||
@@ -144,4 +114,21 @@ public class MetadataGenericContentProvider extends ProjectRepoDirectChildrenNod
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dispose() {
|
||||
// visitor
|
||||
if (this.viewer != null && this.genericNodeVisitor != null && this.viewer instanceof RepoViewCommonViewer) {
|
||||
final Control control = this.viewer.getControl();
|
||||
if (control != null && !control.isDisposed()) {
|
||||
CommonNavigator commonNavigator = ((RepoViewCommonViewer) this.viewer).getCommonNavigator();
|
||||
if (commonNavigator instanceof RepoViewCommonNavigator) {
|
||||
((RepoViewCommonNavigator) commonNavigator).removeVisitor(this.genericNodeVisitor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
super.dispose();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner.rcp</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram</artifactId>
|
||||
|
||||
@@ -61,7 +61,8 @@ props_<%=cid %>.setRuntimeOnly().init();
|
||||
for (Component.CodegenPropInfo propInfo : propsToProcess) { // propInfo
|
||||
List<SchemaElement> properties = propInfo.props.getProperties();
|
||||
for (SchemaElement property : properties) { // property
|
||||
if (propInfo.props.getValue(property) != null) { // if
|
||||
Object value = propInfo.props.getValue(property);
|
||||
if (value != null && (!(value instanceof String) || !((String)value).equals(""))) { // if
|
||||
%>
|
||||
props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
|
||||
<%=component.getCodegenValue(property, propInfo.props.getStringValue(property))%>);
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.libs</artifactId>
|
||||
|
||||
@@ -220,14 +220,6 @@ imports="
|
||||
// BEGIN IF03
|
||||
if(configureFromClassPath){
|
||||
%>
|
||||
// Add HADOOP_CONF_DIR to the classpath if it's present
|
||||
String hadoopConfDir_<%=cid%> = System.getenv("HADOOP_CONF_DIR");
|
||||
if(hadoopConfDir_<%=cid%> != null){
|
||||
java.net.URLClassLoader sysloader = (java.net.URLClassLoader) ClassLoader.getSystemClassLoader();
|
||||
java.lang.reflect.Method method = java.net.URLClassLoader.class.getDeclaredMethod("addURL", new Class[] { java.net.URL.class });
|
||||
method.setAccessible(true);
|
||||
method.invoke(sysloader,new Object[] { new java.io.File(hadoopConfDir_<%=cid%>).toURI().toURL() });
|
||||
}
|
||||
String url_<%=cid%> = "jdbc:<%=hiveServer%>://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%> + ";";
|
||||
String secureSSLMode = ";sasl.qop=auth-conf";
|
||||
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
for (int i = 0; i < keysReturn.size(); i++){
|
||||
Map<String,String> map = keysReturn.get(i);
|
||||
%>
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
|
||||
<%
|
||||
}
|
||||
}
|
||||
@@ -228,7 +228,7 @@
|
||||
for (int i = 0; i < keysReturn.size(); i++){
|
||||
Map<String,String> map = keysReturn.get(i);
|
||||
%>
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
|
||||
<%
|
||||
}
|
||||
}
|
||||
@@ -293,7 +293,7 @@
|
||||
for (int i = 0; i < keysReturn.size(); i++){
|
||||
Map<String,String> map = keysReturn.get(i);
|
||||
%>
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
|
||||
<%
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ if (metadatas != null && metadatas.size()>0) {
|
||||
for (int i = 0; i < keysReturn.size(); i++){
|
||||
Map<String,String> map = keysReturn.get(i);
|
||||
%>
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
|
||||
<%
|
||||
}
|
||||
}
|
||||
@@ -252,7 +252,7 @@ if (metadatas != null && metadatas.size()>0) {
|
||||
for (int i = 0; i < keysReturn.size(); i++){
|
||||
Map<String,String> map = keysReturn.get(i);
|
||||
%>
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
|
||||
<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
|
||||
<%
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
REQUIRED="true"
|
||||
SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE == 'OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
|
||||
</PARAMETER>
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
|
||||
SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT>"25.0"</DEFAULT>
|
||||
<DEFAULT>"34.0"</DEFAULT>
|
||||
</PARAMETER>
|
||||
|
||||
<PARAMETER
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
REQUIRED="true"
|
||||
SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE == 'OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
|
||||
</PARAMETER>
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
|
||||
SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT>"25.0"</DEFAULT>
|
||||
<DEFAULT>"34.0"</DEFAULT>
|
||||
</PARAMETER>
|
||||
|
||||
<PARAMETER
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
REQUIRED="true"
|
||||
SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE == 'OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
|
||||
</PARAMETER>
|
||||
<PARAMETER
|
||||
@@ -80,7 +80,7 @@
|
||||
REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
|
||||
SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT>"25.0"</DEFAULT>
|
||||
<DEFAULT>"34.0"</DEFAULT>
|
||||
</PARAMETER>
|
||||
<PARAMETER
|
||||
NAME="USER"
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
REPOSITORY_VALUE="ENDPOINT"
|
||||
SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE == 'OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
|
||||
</PARAMETER>
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND ((LOGIN_TYPE == 'OAUTH') OR (API == 'bulk'))"
|
||||
REPOSITORY_VALUE="API_VERSION"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT>"25.0"</DEFAULT>
|
||||
<DEFAULT>"34.0"</DEFAULT>
|
||||
</PARAMETER>
|
||||
|
||||
<PARAMETER
|
||||
@@ -2637,7 +2637,7 @@
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="salesforceCRM-management"
|
||||
MODULE="salesforceCRMManagement.jar" MVN="mvn:org.talend.libraries/salesforceCRMManagement/6.0.1" UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/salesforceCRMManagement.jar" REQUIRED_IF="API=='soap'"/>
|
||||
MODULE="salesforceCRMManagement.jar" MVN="mvn:org.talend.libraries/salesforceCRMManagement/6.1.0" UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/salesforceCRMManagement.jar" REQUIRED_IF="API=='soap'"/>
|
||||
<IMPORT NAME="axiom-api"
|
||||
MODULE="axiom-api-1.2.13.jar" MVN="mvn:org.talend.libraries/axiom-api-1.2.13/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/axiom-api-1.2.13.jar" REQUIRED_IF="API=='soap'" />
|
||||
<IMPORT NAME="axiom-impl" MODULE="axiom-impl-1.2.13.jar" MVN="mvn:org.talend.libraries/axiom-impl-1.2.13/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/axiom-impl-1.2.13.jar" REQUIRED_IF="API=='soap'" />
|
||||
@@ -2673,9 +2673,9 @@
|
||||
REQUIRED_IF="API=='soap'" />
|
||||
|
||||
<IMPORT NAME="salesforceBulkAPI"
|
||||
MODULE="salesforceBulkAPI.jar" MVN="mvn:org.talend.libraries/salesforceBulkAPI/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/salesforceBulkAPI.jar" REQUIRED_IF="API=='bulk'" />
|
||||
<IMPORT NAME="partner" MODULE="partnerBulk.jar" MVN="mvn:org.talend.libraries/partnerBulk/6.0.0" REQUIRED_IF="API=='bulk'"/>
|
||||
<IMPORT NAME="wsc" MODULE="wsc.jar" MVN="mvn:org.talend.libraries/wsc/6.0.0"
|
||||
MODULE="salesforceBulkAPI.jar" MVN="mvn:org.talend.libraries/salesforceBulkAPI/6.1.0" UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/salesforceBulkAPI.jar" REQUIRED_IF="API=='bulk'" />
|
||||
<IMPORT NAME="partner" MODULE="partnerBulk-34.jar" MVN="mvn:org.talend.libraries/partnerBulk-34/6.1.0" REQUIRED_IF="API=='bulk'"/>
|
||||
<IMPORT NAME="force-wsc-33.0.0.jar" MODULE="force-wsc-33.0.0.jar" MVN="mvn:org.talend.libraries/force-wsc-33.0.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/force-wsc-33.0.0.jar"
|
||||
REQUIRED_IF="API=='bulk'"/>
|
||||
<IMPORT NAME="CsvWriter" MODULE="talendcsv.jar" MVN="mvn:org.talend.libraries/talendcsv/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.csv/lib/talendcsv.jar" REQUIRED_IF="API=='bulk'"/>
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
REQUIRED="true"
|
||||
SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT IF="LOGIN_TYPE=='BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE=='BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
|
||||
<DEFAULT IF="LOGIN_TYPE=='OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
|
||||
</PARAMETER>
|
||||
<PARAMETER
|
||||
@@ -111,7 +111,7 @@
|
||||
REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"
|
||||
SHOW_IF="(USE_EXISTING_CONNECTION == 'false')"
|
||||
GROUP="LOGIN">
|
||||
<DEFAULT>"25.0"</DEFAULT>
|
||||
<DEFAULT>"34.0"</DEFAULT>
|
||||
</PARAMETER>
|
||||
<PARAMETER
|
||||
NAME="OAUTH_CLIENT_ID"
|
||||
|
||||
@@ -206,8 +206,8 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="JavaMail" MODULE="mail-1.4.jar" MVN="mvn:org.talend.libraries/mail-1.4/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/mail-1.4.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="JavaMail" MODULE="mail-1.4.jar" MVN="mvn:org.talend.libraries/mail-1.4/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/mail-1.4.jar" REQUIRED="true" BundleID="" />
|
||||
<IMPORT NAME="JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED="true" BundleID="" />
|
||||
</IMPORTS>
|
||||
</CODEGENERATION>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.localprovider</artifactId>
|
||||
@@ -55,7 +55,7 @@
|
||||
<artifactItem>
|
||||
<groupId>org.talend.mdm</groupId>
|
||||
<artifactId>org.talend.mdm.bulkload.client</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<type>zip</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${bulkload.dir}</outputDirectory>
|
||||
@@ -99,7 +99,7 @@
|
||||
<fileset dir="${bulkload.dir}" includes="org.talend.mdm.bulkload.client*.jar" id="bulkloadpath_temp" />
|
||||
<pathconvert property="bulkloadpath" refid="bulkloadpath_temp" />
|
||||
<echo>bulkloadpath=${bulkloadpath}</echo>
|
||||
<move file="${bulkloadpath}" tofile="${bulkload.dir}/bulkloadclient.jar"/>
|
||||
<move file="${bulkloadpath}" tofile="${bulkload.dir}/bulkloadclient.jar" />
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core</artifactId>
|
||||
|
||||
@@ -86,6 +86,8 @@ public enum EParameterName {
|
||||
COMP_DEFAULT_FILE_DIR("COMP_DEFAULT_FILE_DIR"), //$NON-NLS-1$ Hidden parameter so no translation needed
|
||||
PRODUCT_ROOT_DIR("PRODUCT_ROOT_DIR"), //$NON-NLS-1$ for TDQ_INSTALL_DIR
|
||||
COMP_DEFAULT_PROJECT_DIR("COMP_DEFAULT_PROJECT_DIR"), //$NON-NLS-1$ Hidden parameter so no translation needed
|
||||
// For TDQ-11338 Add this path for tDqReportRun component on git remote project
|
||||
TDQ_DEFAULT_PROJECT_DIR("TDQ_DEFAULT_PROJECT_DIR"), //$NON-NLS-1$ Hidden parameter so no translation needed
|
||||
DQ_REPORTING_BUNDLE_DIR("DQ_REPORTING_BUNDLE_DIR"), //$NON-NLS-1$ Hidden parameter so no translation needed
|
||||
LOG4J_RUN_ACTIVATE("LOG4J_RUN_ACTIVATE"), //$NON-NLS-1$ Hidden parameter so no translation needed
|
||||
LOG4J_RUN_LEVEL("LOG4J_RUN_LEVEL"), //$NON-NLS-1$ Hidden parameter so no translation needed
|
||||
|
||||
@@ -46,7 +46,6 @@ import org.talend.core.model.process.IProcess;
|
||||
import org.talend.core.model.utils.ContextParameterUtils;
|
||||
import org.talend.core.model.utils.TalendTextUtils;
|
||||
import org.talend.core.prefs.ITalendCorePrefConstants;
|
||||
import org.talend.core.repository.ui.view.RepositoryLabelProvider;
|
||||
import org.talend.core.ui.component.ComponentsFactoryProvider;
|
||||
import org.talend.core.utils.TalendQuoteUtils;
|
||||
import org.talend.designer.core.DesignerPlugin;
|
||||
@@ -279,7 +278,7 @@ public class JobSettingsManager {
|
||||
// zywang added to fix feature 5545
|
||||
param = new ElementParameter(process);
|
||||
param.setName(EParameterName.ICONSELECTION.getName());
|
||||
param.setValue(RepositoryLabelProvider.getDefaultJobletImage()); //$NON-NLS-1$
|
||||
param.setValue(""); //$NON-NLS-1$
|
||||
param.setDisplayName(EParameterName.ICONSELECTION.getDisplayName());
|
||||
param.setFieldType(EParameterFieldType.ICON_SELECTION);
|
||||
param.setCategory(EComponentCategory.EXTRA);
|
||||
|
||||
@@ -68,6 +68,7 @@ import org.talend.commons.ui.runtime.image.ImageUtils;
|
||||
import org.talend.commons.utils.VersionUtils;
|
||||
import org.talend.core.CorePlugin;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.ITDQRepositoryService;
|
||||
import org.talend.core.PluginChecker;
|
||||
import org.talend.core.language.ECodeLanguage;
|
||||
import org.talend.core.language.LanguageManager;
|
||||
@@ -170,6 +171,7 @@ import org.talend.designer.core.utils.JobSettingVersionUtil;
|
||||
import org.talend.designer.core.utils.ValidationRulesUtil;
|
||||
import org.talend.designer.runprocess.IRunProcessService;
|
||||
import org.talend.designer.runprocess.ItemCacheManager;
|
||||
import org.talend.model.bridge.ReponsitoryContextBridge;
|
||||
import org.talend.repository.ProjectManager;
|
||||
import org.talend.repository.constants.Log4jPrefsConstants;
|
||||
import org.talend.repository.model.IProxyRepositoryFactory;
|
||||
@@ -373,6 +375,20 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
|
||||
.getString(TalendDesignerPrefConstants.COMP_DEFAULT_FILE_DIR));
|
||||
param.setReadOnly(true);
|
||||
addElementParameter(param);
|
||||
// For TDQ-11338 Add this path for tDqReportRun component on git remote project
|
||||
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
|
||||
param = new ElementParameter(this);
|
||||
param.setName(EParameterName.TDQ_DEFAULT_PROJECT_DIR.getName());
|
||||
param.setCategory(EComponentCategory.TECHNICAL);
|
||||
param.setFieldType(EParameterFieldType.DIRECTORY);
|
||||
param.setDisplayName(EParameterName.TDQ_DEFAULT_PROJECT_DIR.getDisplayName());
|
||||
param.setNumRow(99);
|
||||
param.setShow(false);
|
||||
param.setValue(ReponsitoryContextBridge.getRootProject().getLocation().toPortableString());
|
||||
param.setReadOnly(true);
|
||||
addElementParameter(param);
|
||||
}
|
||||
|
||||
// for log4j activate
|
||||
param = new ElementParameter(this);
|
||||
@@ -1207,12 +1223,8 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
|
||||
continue;
|
||||
}
|
||||
comp.initParamPropertiesFromSerialized(param, pTypeValue);
|
||||
String value = null;
|
||||
Object obj = comp.genericFromSerialized(pTypeValue, param.getName());
|
||||
if (obj != null) {
|
||||
value = obj.toString();
|
||||
}
|
||||
loadElementParameters(elemParam, pType, param, param.getName(), value, false);
|
||||
Object object = comp.genericFromSerialized(pTypeValue, param.getName());
|
||||
loadElementParameters(elemParam, pType, param, param.getName(), object, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1279,13 +1291,17 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
|
||||
}
|
||||
|
||||
private void loadElementParameters(Element elemParam, ElementParameterType pType, IElementParameter param, String key,
|
||||
String value, boolean isJunitLoad) {
|
||||
Object object, boolean isJunitLoad) {
|
||||
if (param != null) {
|
||||
if (pType.isSetContextMode()) {
|
||||
param.setContextMode(pType.isContextMode());
|
||||
} else {
|
||||
param.setContextMode(false);
|
||||
}
|
||||
String value = null;
|
||||
if (object != null) {
|
||||
value = object.toString();
|
||||
}
|
||||
if (param.getFieldType().equals(EParameterFieldType.CHECK) || param.getFieldType().equals(EParameterFieldType.RADIO)) {
|
||||
if ("false".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || !pType.isContextMode()) { //$NON-NLS-1$ //$NON-NLS-2$
|
||||
Boolean boolean1 = new Boolean(value);
|
||||
@@ -1417,6 +1433,8 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
|
||||
} else {
|
||||
elemParam.setPropertyValue(key, value);
|
||||
}
|
||||
} else if (param.getFieldType().equals(EParameterFieldType.SCHEMA_TYPE)) {
|
||||
elemParam.setPropertyValue(key, object);
|
||||
}
|
||||
} else if (UpdateTheJobsActionsOnTable.isClear && "CLEAR_TABLE".equals(key) //$NON-NLS-1$
|
||||
&& "true".equals(pType.getValue()) //$NON-NLS-1$
|
||||
|
||||
@@ -53,6 +53,7 @@ import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
|
||||
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
|
||||
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
|
||||
import org.talend.commons.exception.CommonExceptionHandler;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.LoginException;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
@@ -80,6 +81,7 @@ import org.talend.core.ui.editor.JobEditorHandlerManager;
|
||||
import org.talend.core.utils.KeywordsValidator;
|
||||
import org.talend.designer.core.i18n.Messages;
|
||||
import org.talend.repository.ProjectManager;
|
||||
import org.talend.repository.RepositoryWorkUnit;
|
||||
import org.talend.repository.model.IProxyRepositoryFactory;
|
||||
import org.talend.repository.model.RepositoryConstants;
|
||||
import org.talend.repository.ui.properties.StatusHelper;
|
||||
@@ -594,66 +596,81 @@ public class MainComposite extends AbstractTabComposite {
|
||||
// Convert
|
||||
final Item newItem = ConvertJobsUtil.createOperation(originalName, originalJobType,
|
||||
originalFramework, repositoryObject);
|
||||
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
|
||||
RepositoryWorkUnit repositoryWorkUnit = new RepositoryWorkUnit("Convert job") { //$NON-NLS-1$
|
||||
|
||||
@Override
|
||||
public void run(final IProgressMonitor monitor) throws CoreException {
|
||||
try {
|
||||
boolean isOpened = false;
|
||||
if (repositoryObject instanceof IProcess2) {
|
||||
isOpened = true;
|
||||
boolean locked = proxyRepositoryFactory.getStatus(repositoryObject) == ERepositoryStatus.LOCK_BY_USER;
|
||||
if (locked) {
|
||||
proxyRepositoryFactory.unlock(repositoryObject);
|
||||
}
|
||||
}
|
||||
public void run() throws PersistenceException {
|
||||
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
|
||||
|
||||
boolean isNewItemCreated = true;
|
||||
Property repositoryProperty = repositoryObject.getProperty();
|
||||
if (repositoryProperty != null) {
|
||||
isNewItemCreated = (repositoryProperty.getItem() != newItem);
|
||||
}
|
||||
if (isNewItemCreated) {
|
||||
// new Item created
|
||||
proxyRepositoryFactory.deleteObjectPhysical(repositoryObject);
|
||||
proxyRepositoryFactory.saveProject(ProjectManager.getInstance().getCurrentProject());
|
||||
}
|
||||
if (newItem != null && newItem.getProperty() != null) {
|
||||
String newId = newItem.getProperty().getId();
|
||||
if (isNewItemCreated) {
|
||||
newRepositoryObject = proxyRepositoryFactory.getLastVersion(ProjectManager
|
||||
.getInstance().getCurrentProject(), newId);
|
||||
} else {
|
||||
newRepositoryObject = repositoryObject;
|
||||
}
|
||||
if (!isOpened) {
|
||||
repositoryObject = newRepositoryObject;
|
||||
if (!jobTypeCCombo.isDisposed() && !jobFrameworkCCombo.isDisposed()) {
|
||||
jobTypeValue = jobTypeCCombo.getText();
|
||||
frameworkValue = jobFrameworkCCombo.getText();
|
||||
@Override
|
||||
public void run(final IProgressMonitor monitor) throws CoreException {
|
||||
try {
|
||||
boolean isOpened = false;
|
||||
if (repositoryObject instanceof IProcess2) {
|
||||
isOpened = true;
|
||||
boolean locked = proxyRepositoryFactory.getStatus(repositoryObject) == ERepositoryStatus.LOCK_BY_USER;
|
||||
if (locked) {
|
||||
proxyRepositoryFactory.unlock(repositoryObject);
|
||||
}
|
||||
}
|
||||
|
||||
boolean isNewItemCreated = true;
|
||||
Property repositoryProperty = repositoryObject.getProperty();
|
||||
if (repositoryProperty != null) {
|
||||
isNewItemCreated = (repositoryProperty.getItem() != newItem);
|
||||
}
|
||||
if (isNewItemCreated) {
|
||||
// new Item created
|
||||
proxyRepositoryFactory.deleteObjectPhysical(repositoryObject);
|
||||
proxyRepositoryFactory.saveProject(ProjectManager.getInstance()
|
||||
.getCurrentProject());
|
||||
} else if (repositoryObject.getProperty() != null) {
|
||||
proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(),
|
||||
repositoryObject.getProperty().getItem(), false);
|
||||
}
|
||||
if (newItem != null && newItem.getProperty() != null) {
|
||||
String newId = newItem.getProperty().getId();
|
||||
if (isNewItemCreated) {
|
||||
newRepositoryObject = proxyRepositoryFactory.getLastVersion(
|
||||
ProjectManager.getInstance().getCurrentProject(), newId);
|
||||
} else {
|
||||
newRepositoryObject = repositoryObject;
|
||||
}
|
||||
if (!isOpened) {
|
||||
repositoryObject = newRepositoryObject;
|
||||
if (!jobTypeCCombo.isDisposed() && !jobFrameworkCCombo.isDisposed()) {
|
||||
jobTypeValue = jobTypeCCombo.getText();
|
||||
frameworkValue = jobFrameworkCCombo.getText();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} catch (PersistenceException e1) {
|
||||
e1.printStackTrace();
|
||||
} catch (LoginException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
} catch (PersistenceException e1) {
|
||||
e1.printStackTrace();
|
||||
} catch (LoginException e) {
|
||||
e.printStackTrace();
|
||||
};
|
||||
// unlockObject();
|
||||
// alreadyEditedByUser = true; // to avoid 2 calls of unlock
|
||||
|
||||
IWorkspace workspace = ResourcesPlugin.getWorkspace();
|
||||
try {
|
||||
ISchedulingRule schedulingRule = workspace.getRoot();
|
||||
// the update the project files need to be done in the workspace runnable to
|
||||
// avoid all
|
||||
// notification
|
||||
// of changes before the end of the modifications.
|
||||
workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
|
||||
} catch (CoreException e1) {
|
||||
MessageBoxExceptionHandler.process(e1.getCause());
|
||||
}
|
||||
}
|
||||
};
|
||||
// unlockObject();
|
||||
// alreadyEditedByUser = true; // to avoid 2 calls of unlock
|
||||
|
||||
IWorkspace workspace = ResourcesPlugin.getWorkspace();
|
||||
try {
|
||||
ISchedulingRule schedulingRule = workspace.getRoot();
|
||||
// the update the project files need to be done in the workspace runnable to avoid all
|
||||
// notification
|
||||
// of changes before the end of the modifications.
|
||||
workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
|
||||
} catch (CoreException e1) {
|
||||
MessageBoxExceptionHandler.process(e1.getCause());
|
||||
}
|
||||
repositoryWorkUnit.setAvoidSvnUpdate(true);
|
||||
repositoryWorkUnit.setAvoidUnloadResources(true);
|
||||
ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(repositoryWorkUnit);
|
||||
if (newItem != null && repositoryObject instanceof IProcess2) {
|
||||
if (newRepositoryObject != null && newRepositoryObject.getProperty() != null) {
|
||||
openEditorOperation(newRepositoryObject.getProperty().getItem());
|
||||
@@ -671,33 +688,44 @@ public class MainComposite extends AbstractTabComposite {
|
||||
}
|
||||
property.getAdditionalProperties().put(ConvertJobsUtil.FRAMEWORK, originalFramework);
|
||||
}
|
||||
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
|
||||
RepositoryWorkUnit repositoryWorkUnit = new RepositoryWorkUnit("Convert job") { //$NON-NLS-1$
|
||||
|
||||
@Override
|
||||
public void run(final IProgressMonitor monitor) throws CoreException {
|
||||
try {
|
||||
if (repositoryObject.getProperty() != null) {
|
||||
proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(),
|
||||
repositoryObject.getProperty().getItem(), false);
|
||||
public void run() throws PersistenceException {
|
||||
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
|
||||
|
||||
@Override
|
||||
public void run(final IProgressMonitor monitor) throws CoreException {
|
||||
try {
|
||||
if (repositoryObject.getProperty() != null) {
|
||||
proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(),
|
||||
repositoryObject.getProperty().getItem(), false);
|
||||
}
|
||||
} catch (PersistenceException e1) {
|
||||
ExceptionHandler.process(e1);
|
||||
}
|
||||
}
|
||||
} catch (PersistenceException e1) {
|
||||
e1.printStackTrace();
|
||||
};
|
||||
// unlockObject();
|
||||
// alreadyEditedByUser = true; // to avoid 2 calls of unlock
|
||||
|
||||
IWorkspace workspace = ResourcesPlugin.getWorkspace();
|
||||
try {
|
||||
ISchedulingRule schedulingRule = workspace.getRoot();
|
||||
// the update the project files need to be done in the workspace runnable to
|
||||
// avoid all
|
||||
// notification
|
||||
// of changes before the end of the modifications.
|
||||
workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
|
||||
} catch (CoreException e1) {
|
||||
MessageBoxExceptionHandler.process(e1.getCause());
|
||||
}
|
||||
}
|
||||
};
|
||||
// unlockObject();
|
||||
// alreadyEditedByUser = true; // to avoid 2 calls of unlock
|
||||
repositoryWorkUnit.setAvoidSvnUpdate(true);
|
||||
repositoryWorkUnit.setAvoidUnloadResources(true);
|
||||
ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(repositoryWorkUnit);
|
||||
|
||||
IWorkspace workspace = ResourcesPlugin.getWorkspace();
|
||||
try {
|
||||
ISchedulingRule schedulingRule = workspace.getRoot();
|
||||
// the update the project files need to be done in the workspace runnable to avoid all
|
||||
// notification
|
||||
// of changes before the end of the modifications.
|
||||
workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
|
||||
} catch (CoreException e1) {
|
||||
MessageBoxExceptionHandler.process(e1.getCause());
|
||||
}
|
||||
if (repositoryObject instanceof IProcess2) {
|
||||
openEditorOperation(property.getItem());
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.dbmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.documentation</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.filemultischemas</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.fileoutputxml</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.gefabstractmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.hl7</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper.advanced</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.job</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.publish.core</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.rowgenerator</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runprocess</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runtime.visualization.tools</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runtime.visualization</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.scd</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.spss</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.webservice</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.xmlmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.expressionbuilder</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.asm</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.bonita</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.crm</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.css</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.custom</artifactId>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user