From 86ced5fa96eb5855837dfd1738679a4319ebbf0d Mon Sep 17 00:00:00 2001 From: GGu Date: Thu, 29 Jan 2015 15:25:42 +0800 Subject: [PATCH] TUP-2580: change the sqltemplates to resources folder. --- .../org/talend/commons/utils/generation/JavaUtils.java | 2 +- .../talend/designer/codegen/ICodeGeneratorService.java | 2 ++ .../maven/utils/TalendJavaSourceProjectUtil.java | 10 +++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/utils/generation/JavaUtils.java b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/utils/generation/JavaUtils.java index 4e3dbdbe94..9acc91a5de 100644 --- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/utils/generation/JavaUtils.java +++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/utils/generation/JavaUtils.java @@ -78,7 +78,7 @@ public final class JavaUtils { public static final String JAVA_SQLPATTERNS_DIRECTORY = "sqltemplates"; //$NON-NLS-1$ /** Java Routines Directory. */ - public static final String JAVA_SYSTEM_ROUTINES_DIRECTORY = "system"; //$NON-NLS-1$ + public static final String JAVA_SYSTEM_DIRECTORY = "system"; //$NON-NLS-1$ /** Java Routines api Directory. */ public static final String JAVA_SYSTEM_ROUTINES_API_DIRECTORY = "api"; //$NON-NLS-1$ diff --git a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/ICodeGeneratorService.java b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/ICodeGeneratorService.java index b6ff6c877a..68840cb852 100644 --- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/ICodeGeneratorService.java +++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/ICodeGeneratorService.java @@ -63,7 +63,9 @@ public interface ICodeGeneratorService extends IService { * yzhang Comment method "creatPerlRoutineSynchronizer". * * @return + * @deprecated no perl yet. */ + @Deprecated public ITalendSynchronizer createPerlRoutineSynchronizer(); /** diff --git a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/TalendJavaSourceProjectUtil.java b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/TalendJavaSourceProjectUtil.java index 46d9a92fef..1fd5878009 100644 --- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/TalendJavaSourceProjectUtil.java +++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/TalendJavaSourceProjectUtil.java @@ -80,9 +80,13 @@ public final class TalendJavaSourceProjectUtil { protected Model getModel() { Model model = super.getModel(); Properties p = new Properties(); - // TODO, need change the default compiler version(1.5)? or try maven-compiler-plugin? - p.put("maven.compiler.source", "1.6"); - p.put("maven.compiler.target", "1.6"); + /** + * TODO, need change the default compiler version(1.5)? or try maven-compiler-plugin? + * + * same version as jet compile, @see TalendJetEmitter.getBatchCompilerCmd + */ + p.put("maven.compiler.source", JavaCore.VERSION_1_6); + p.put("maven.compiler.target", JavaCore.VERSION_1_6); model.setProperties(p); return model;