Compare commits

...

13 Commits

Author SHA1 Message Date
build-talend
ba08a0c176 DEVOPS-1729 Nexus migration: Update URLs 2017-03-02 00:22:38 +01:00
hcyi
deb12779f5 TBD-2859:MapReduce job turns to Spark when opening 2015-12-10 23:07:56 +08:00
hwang
6e462d2b65 TDI-34885:git+svn: when convert a spark job with testcase to a mr job,
it can not be changed.
2015-12-10 23:07:35 +08:00
Sizhao Liu
c0f4ed20b6 TDQ-11358 fix tDqReportRun job error in local project 2015-12-09 12:57:05 +01:00
nrousseau
78f7f8c978 TDI-34864: fix problem of perspective, will reinitialize after any
successfull update
2015-12-09 19:24:54 +08:00
wchen-talend
e0c602e00d TDI-34897:Fail to run job if build path contain blank space 2015-12-09 19:16:00 +08:00
wchen-talend
3626efb85a TDI-34717:TAC Commandline has error when publish SVN job then publish a
GIT job
2015-12-08 20:38:46 +08:00
GGu
506a9730d1 TUP-3877: fix the NPE for e4 2015-12-08 20:38:25 +08:00
GGu
0168775718 TUP-3877: try to find the current perspective from e4 model 2015-12-08 20:36:50 +08:00
Sizhao Liu
647133cbc2 TDQ-11101 fix typo for Pattern Frequency Statistics 2015-12-07 17:15:10 +01:00
newbuild.talend.com
b17d8dfc3a Fix syntax error 2015-12-04 11:28:44 -08:00
iwangtalend
c9e476a536 Deploy org.talend.utils to Nexus 2015-12-04 20:23:09 +01:00
Irene Wang
04482fe7c1 Set versions for 6.1.1 2015-12-04 15:15:31 +01:00
162 changed files with 329 additions and 193 deletions

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui.nl</artifactId>

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime.nl</artifactId>

View File

@@ -559,7 +559,7 @@ repository.systemIndicators.businessRules=Business Rules
repository.systemIndicators.correlation=Correlation
repository.systemIndicators.functionalDependency=Functional Dependency
repository.systemIndicators.overview=Overview
repository.systemIndicators.patternFinder=Pattern Frequncey Statistics
repository.systemIndicators.patternFinder=Pattern Frequency Statistics
repository.systemIndicators.patternMatching=Pattern Matching
repository.systemIndicators.rowComparison=Row Comparison
repository.systemIndicators.simpleStatistics=Simple Statistics

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.ui.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.edit.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.ui.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.helpers.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.ui.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.ui.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.migrationTool.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.edit.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.migration.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.nl</artifactId>

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.registration.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.resources.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.fragment.jars.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.jdt.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.m2e.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.migration.feature</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.update.p2.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.updates.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.utils.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository</artifactId>

View File

@@ -63,6 +63,8 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
private List<IRepositoryWorkUnitListener> listeners = new ArrayList<IRepositoryWorkUnitListener>();
private String storage;
@Override
public List<DynamicButtonBean> getButtons() {
return buttons;
@@ -314,4 +316,14 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
public void updateLockStatus() throws PersistenceException {
// nothing to do, by default
}
@Override
public String getStorage() {
return this.storage;
}
@Override
public void setStorage(String storage) {
this.storage = storage;
}
}

View File

@@ -410,4 +410,8 @@ public interface IRepositoryFactory {
public boolean isModified(Object property);
public void afterLogon();
public void setStorage(String storage);
public String getStorage();
}

View File

@@ -270,6 +270,7 @@ public class DuplicateAction extends AContextualAction {
String sourceJobType = ConvertJobsUtil.getJobTypeFromFramework(newCreatedItem);
boolean isNeedConvert = ConvertJobsUtil.isNeedConvert(sourceJobType, sourceFramework, jobTypeValue,
frameworkNewValue);
boolean isNewItemCreated = false;
if (jobTypeValue != null && isNeedConvert) {
isAllowDuplicateTest = false;
try {
@@ -278,12 +279,15 @@ public class DuplicateAction extends AContextualAction {
.getProxyRepositoryFactory()
.getLastVersion(ProjectManager.getInstance().getCurrentProject(),
newCreatedItem.getProperty().getId());
ConvertJobsUtil.convert(jobNewName, jobTypeValue, frameworkNewValue, repositoryViewObject);
isNewItemCreated = ConvertJobsUtil.convert(jobNewName, jobTypeValue, frameworkNewValue,
repositoryViewObject);
} catch (Exception e) {
CommonExceptionHandler.process(e);
}
} else {
ConvertJobsUtil.updateFramework(newCreatedItem, frameworkNewValue);
}
if (!isNewItemCreated) {
// save the modifications
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
@@ -312,7 +316,6 @@ public class DuplicateAction extends AContextualAction {
MessageBoxExceptionHandler.process(e.getCause());
}
}
}
} else {
InputDialog jobNewNameDialog = new InputDialog(null, Messages.getString("DuplicateAction.input.title.v2"), //$NON-NLS-1$

View File

@@ -26,7 +26,6 @@ import org.talend.commons.exception.BusinessException;
import org.talend.commons.exception.CommonExceptionHandler;
import org.talend.commons.exception.LoginException;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.PluginChecker;
import org.talend.core.hadoop.HadoopConstants;
@@ -351,7 +350,7 @@ public class ConvertJobsUtil {
}
public static boolean convert(String newJobName, String jobTypeValue, String frameworkValue,
final IRepositoryViewObject sourceObject) {
final IRepositoryViewObject sourceObject) throws CoreException {
final Item newItem = ConvertJobsUtil.createOperation(newJobName, jobTypeValue, frameworkValue, sourceObject);
if (newItem == null) {
return false;
@@ -362,14 +361,14 @@ public class ConvertJobsUtil {
if (repositoryProperty != null) {
isNewItemCreated = (repositoryProperty.getItem() != newItem);
}
final IProxyRepositoryFactory proxyRepositoryFactory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
if (isNewItemCreated) {
// delete the old item
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
@Override
public void run(final IProgressMonitor monitor) throws CoreException {
IProxyRepositoryFactory proxyRepositoryFactory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
try {
proxyRepositoryFactory.unlock(sourceObject);
proxyRepositoryFactory.deleteObjectPhysical(sourceObject);
@@ -383,20 +382,31 @@ public class ConvertJobsUtil {
};
// unlockObject();
// alreadyEditedByUser = true; // to avoid 2 calls of unlock
IWorkspace workspace = ResourcesPlugin.getWorkspace();
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);
} else if (sourceObject.getProperty() != null) {
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
@Override
public void run(final IProgressMonitor monitor) throws CoreException {
try {
proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(), sourceObject.getProperty()
.getItem(), false);
} catch (PersistenceException e1) {
CommonExceptionHandler.process(e1);
}
}
};
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);
return true;
} catch (CoreException e) {
MessageBoxExceptionHandler.process(e.getCause());
return false;
}
ISchedulingRule schedulingRule = workspace.getRoot();
workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
}
return true;
return isNewItemCreated;
}
/**

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime</artifactId>

View File

@@ -302,8 +302,8 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
public final static ERepositoryObjectType SYSTEM_INDICATORS_OVERVIEW = new ERepositoryObjectType(
"repository.systemIndicators.overview", "TDQ_Libraries/Indicators/System Indicators/Overview", "SYSTEM_INDICATORS_OVERVIEW", 90, true, "repository.systemIndicators.overview.alias", new String[] { PROD_DQ }, new String[] {}, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
public final static ERepositoryObjectType SYSTEM_INDICATORS_PATTERN_FREQUNCEY_STATISTICS = new ERepositoryObjectType(
"repository.systemIndicators.patternFinder", "TDQ_Libraries/Indicators/System Indicators/Pattern Frequncey Statistics", "SYSTEM_INDICATORS_PATTERN_FINDER", 91, true, "repository.systemIndicators.patternFinder.alias", new String[] { PROD_DQ }, new String[] {}, false); //$NON-NLS-1$ //$NON-NLS-2$
public final static ERepositoryObjectType SYSTEM_INDICATORS_PATTERN_FREQUENCY_STATISTICS = new ERepositoryObjectType(
"repository.systemIndicators.patternFinder", "TDQ_Libraries/Indicators/System Indicators/Pattern Frequency Statistics", "SYSTEM_INDICATORS_PATTERN_FINDER", 91, true, "repository.systemIndicators.patternFinder.alias", new String[] { PROD_DQ }, new String[] {}, false); //$NON-NLS-1$ //$NON-NLS-2$
public final static ERepositoryObjectType SYSTEM_INDICATORS_PATTERN_MATCHING = new ERepositoryObjectType(
"repository.systemIndicators.patternMatching", "TDQ_Libraries/Indicators/System Indicators/Pattern Matching", "SYSTEM_INDICATORS_PATTERN_MATCHING", 92, true, "repository.systemIndicators.patternMatching.alias", new String[] { PROD_DQ }, new String[] {}, false); //$NON-NLS-1$ //$NON-NLS-2$

View File

@@ -18,11 +18,8 @@ import java.util.Map;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.talend.core.context.Context;
import org.talend.core.context.RepositoryContext;
import org.talend.core.database.EDatabaseTypeName;
import org.talend.core.database.conn.DatabaseConnStrUtil;
import org.talend.core.language.ECodeLanguage;
import org.talend.core.model.metadata.IMetadataTable;
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
import org.talend.core.model.metadata.builder.connection.Query;
@@ -31,7 +28,6 @@ import org.talend.core.model.process.IElement;
import org.talend.core.model.properties.DatabaseConnectionItem;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.model.utils.ContextParameterUtils;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.runtime.i18n.Messages;
import org.talend.core.utils.TalendQuoteUtils;
import org.talend.repository.model.RepositoryNode;
@@ -589,10 +585,7 @@ public class ConnectionParameters {
}
public static boolean isJavaProject() {
RepositoryContext repositoryContext = (RepositoryContext) CoreRuntimePlugin.getInstance().getContext()
.getProperty(Context.REPOSITORY_CONTEXT_KEY);
ECodeLanguage codeLanguage = repositoryContext.getProject().getLanguage();
return (codeLanguage == ECodeLanguage.JAVA);
return true;
}
public IMetadataTable getMetadataTable() {

View File

@@ -140,7 +140,7 @@ public class RepositoryImageProvider {
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_CORRELATION
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_FUNCTIONAL_DEPENDENCY
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_OVERVIEW
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_PATTERN_FREQUNCEY_STATISTICS
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_PATTERN_FREQUENCY_STATISTICS
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_PATTERN_MATCHING
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_ROW_COMPARISON
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_SIMPLE_STATISTICS

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.ui</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.edit</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.editor</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.datatools.xml</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.ui</artifactId>

View File

@@ -68,7 +68,8 @@ public class MavenUIService implements IMavenUIService {
// apply the user settings to MavenResolver
Dictionary<String, String> props = new Hashtable<String, String>();
if (studioUserSettingsFile != null && !"".equals(studioUserSettingsFile)) {
props.put("org.ops4j.pax.url.mvn.settings", studioUserSettingsFile);
// props.put("org.ops4j.pax.url.mvn.settings", studioUserSettingsFile);
props.put("org.ops4j.pax.url.mvn.localRepository", MavenPlugin.getMaven().getLocalRepositoryPath());
}
TalendLibsServerManager.getInstance().updateMavenResolver(props, setupRemoteRepository);
}

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.developpement</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.helpers</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.axis2</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.batik</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.cassandra</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.chemistry</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.common</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.cxf</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.google</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.http</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.lucene</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.lucene4</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.xml</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.csv</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.dom4j-jaxen</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jackson</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.javacsv.jars</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.javacsv</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.access</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.as400</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.derby</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.exasol</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.h2</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.hsql</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.ingres</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.jtds.jars</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.jtds</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.mysql</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.paraccel</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.postgresql</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.sqlite3</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1-SNAPSHOT</version>
<version>6.1.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.teradata</artifactId>

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