From fc1b7fa0a4cacf182fb238bf706fa20117cbc3fb Mon Sep 17 00:00:00 2001 From: cli Date: Thu, 11 Oct 2012 09:32:39 +0000 Subject: [PATCH] TDI-23211: add the preference page for maven scripts. git-svn-id: http://talendforge.org/svn/tos/trunk@91971 f6f1c999-d317-4740-80b0-e6d1abc6f99e --- .../core/model/repository/IRepositoryPrefConstants.java | 6 ++++-- .../resources/buildScripts/maven/karaf/pom-feature.xml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/IRepositoryPrefConstants.java b/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/IRepositoryPrefConstants.java index f3b00189d7..63ceafb570 100644 --- a/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/IRepositoryPrefConstants.java +++ b/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/IRepositoryPrefConstants.java @@ -49,8 +49,10 @@ public interface IRepositoryPrefConstants { public static final String ANT_SCRIPT_TEMPLATE = "ant_script_template"; //$NON-NLS-1$ - public static final String MAVEN_SCRIPT_TEMPLATE = "maven_script_template"; //$NON-NLS-1$ + public static final String MAVEN_SCRIPT_AUTONOMOUSJOB_TEMPLATE = "autonomousjob_maven_script_template"; //$NON-NLS-1$ - public static final String MAVEN_OSGI_SCRIPT_TEMPLATE = "maven_osgi_script_template"; //$NON-NLS-1$ + public static final String MAVEN_SCRIPT_AUTONOMOUSJOB_ASSEMBLY_TEMPLATE = "autonomousjob_assembly_maven_script_template"; //$NON-NLS-1$ + + public static final String MAVEN_OSGI_SCRIPT_TEMPLATE = "osgi_maven_script_template"; //$NON-NLS-1$ } diff --git a/org.talend.resources/resources/buildScripts/maven/karaf/pom-feature.xml b/org.talend.resources/resources/buildScripts/maven/karaf/pom-feature.xml index 0c856febb3..fc022fd004 100644 --- a/org.talend.resources/resources/buildScripts/maven/karaf/pom-feature.xml +++ b/org.talend.resources/resources/buildScripts/maven/karaf/pom-feature.xml @@ -26,7 +26,8 @@ ${item.name}_${project.version} - ${project.build.directory}/bin + + ${project.build.directory}/bin ${resources.path}/feature/feature.xml