jprdonnelly/tcommon-studio-se
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TUP-2580: change the sqltemplates to resources folder.

Browse Source
This commit is contained in:
GGu
2015-01-29 15:25:42 +08:00
parent 09df81e7a5
commit 86ced5fa96
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/utils/generation/JavaUtils.java
View File

@@ -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$

2
main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/ICodeGeneratorService.java
View File

@@ -63,7 +63,9 @@ public interface ICodeGeneratorService extends IService {
* yzhang Comment method "creatPerlRoutineSynchronizer".
*
* @return
* @deprecated no perl yet.
*/
@Deprecated
public ITalendSynchronizer createPerlRoutineSynchronizer();
/**

10
main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/TalendJavaSourceProjectUtil.java
View File

@@ -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;