diff options
36 files changed, 362 insertions, 42 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.core.resources.prefs index 95f1a410ee..b2266ee80d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ eclipse.preferences.version=1 encoding/.project=UTF-8 - +encoding//examples/org.eclipse.emf.cdo.examples.clone/.project=UTF-8 +encoding//examples/org.eclipse.emf.cdo.examples.master/.project=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/copyExampleLib.ant b/plugins/org.eclipse.emf.cdo.examples.installer/copyExampleLib.ant index bf0c8e6b24..9e797e2bf0 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/copyExampleLib.ant +++ b/plugins/org.eclipse.emf.cdo.examples.installer/copyExampleLib.ant @@ -37,7 +37,7 @@ <replaceregexp file="${examples.path}/@{project}/.project" byline="false" - flags="s" + flags="sg" match="\s*<buildCommand>\s+<name>org.eclipse.ui.externaltools.ExternalToolBuilder.*?</buildCommand>" replace="" /> diff --git a/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs index a2fe9e21b4..2cbc93806e 100644 --- a/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 encoding/.project=UTF-8 - +encoding//exampleBuilderTemplates/template.project=UTF-8 encoding/buckminster.cspex=UTF-8 encoding/build.cquery=UTF-8 encoding/build.mspec=UTF-8 diff --git a/plugins/org.eclipse.net4j.examples.installer/generateExampleBuilders.ant b/plugins/org.eclipse.emf.cdo.releng/exampleBuilderTemplates/copyExample.ant index faeb14bed8..e5786198ad 100644 --- a/plugins/org.eclipse.net4j.examples.installer/generateExampleBuilders.ant +++ b/plugins/org.eclipse.emf.cdo.releng/exampleBuilderTemplates/copyExample.ant @@ -9,15 +9,14 @@ Contributors: Eike Stepper - initial API and implementation --> -<project name="copyExampleLib" basedir=".." default="main"> +<project name="copyExample" default="main" basedir="../.."> - <property name="examples.path" value="org.eclipse.net4j.examples.installer/examples" /> + <property name="installer" value="#INSTALLER_PROJECT#" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> <basename file="${build.project}" property="project" /> <target name="main"> - <java classpath="org.eclipse.emf.cdo.releng/bin" - classname="org.eclipse.emf.cdo.releng.GenerateExampleBuilders" - args="${project}/plugin.xml" /> + <copyExample project="${project}" /> </target> </project> diff --git a/plugins/org.eclipse.emf.cdo.releng/exampleBuilderTemplates/template.launch b/plugins/org.eclipse.emf.cdo.releng/exampleBuilderTemplates/template.launch new file mode 100644 index 0000000000..13c7073cba --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng/exampleBuilderTemplates/template.launch @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> +<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> +<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/> +<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> #REFRESH_RESOURCES#</resources>}"/> +<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/> +<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/> +<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> #RELEVANT_RESOURCES#</resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.releng/exampleBuilderTemplates/template.project b/plugins/org.eclipse.emf.cdo.releng/exampleBuilderTemplates/template.project new file mode 100644 index 0000000000..97d0290f79 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng/exampleBuilderTemplates/template.project @@ -0,0 +1,14 @@ + <buildCommand> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> + <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/#EXAMPLE_PROJECT#.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> diff --git a/plugins/org.eclipse.emf.cdo.releng/src/.dummy b/plugins/org.eclipse.emf.cdo.releng/src/.dummy deleted file mode 100644 index e69de29bb2..0000000000 --- a/plugins/org.eclipse.emf.cdo.releng/src/.dummy +++ /dev/null diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Dummy.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Dummy.java deleted file mode 100644 index 745b35d6d1..0000000000 --- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Dummy.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.releng; - -/** - * @author Eike Stepper - */ -public class Dummy -{ -} diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java new file mode 100644 index 0000000000..188a1bb89b --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java @@ -0,0 +1,256 @@ +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + */ +package org.eclipse.emf.cdo.releng; + +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @author Eike Stepper + */ +public class GenerateExampleBuilders +{ + private static final String TOKEN_EXAMPLE_PROJECT = "#EXAMPLE_PROJECT#"; + + private static final String TOKEN_INSTALLER_PROJECT = "#INSTALLER_PROJECT#"; + + private static final String TOKEN_RELEVANT_RESOURCES = "#RELEVANT_RESOURCES#"; + + private static final String TOKEN_REFRESH_RESOURCES = "#REFRESH_RESOURCES#"; + + private static final String NL = System.getProperty("line.separator"); + + public static void main(String[] args) throws Exception + { + File installerPoject = new File(args[0]).getCanonicalFile(); + File pluginXML = new File(installerPoject, "plugin.xml"); + System.out.println("Analyzing " + pluginXML); + + SAXParser parser = SAXParserFactory.newInstance().newSAXParser(); + XMLHandler handler = new XMLHandler(installerPoject); + InputStream in = new FileInputStream(pluginXML); + + try + { + parser.parse(in, handler); + } + finally + { + in.close(); + } + } + + private static void processProjectDescriptor(File exampleProject, File installerPoject, String targetFolder) + throws Exception + { + String exampleProjectName = exampleProject.getName(); + String targetPath = installerPoject.getName() + "/" + targetFolder; + + StringBuilder relevantResources = new StringBuilder(); + relevantResources.append(getItemPath(targetPath, 2)); + + for (File file : exampleProject.listFiles()) + { + String name = file.getName(); + int type = file.isDirectory() ? 2 : 1; + + if (!"bin".equals(name)) + { + String path = exampleProjectName + "/" + name; + relevantResources.append(getItemPath(path, type)); + } + } + + Map<String, String> substitutes = new HashMap<String, String>(); + addSubtitute(substitutes, TOKEN_EXAMPLE_PROJECT, exampleProject.getName()); + addSubtitute(substitutes, TOKEN_INSTALLER_PROJECT, installerPoject.getName()); + addSubtitute(substitutes, TOKEN_RELEVANT_RESOURCES, relevantResources.toString()); + addSubtitute(substitutes, TOKEN_REFRESH_RESOURCES, getItemPath(new File(targetPath).getParent(), 2)); + + copy(exampleProject, substitutes, "copyExample.ant", ".externalToolBuilders/copyExample.ant"); + copy(exampleProject, substitutes, "template.launch", ".externalToolBuilders/" + exampleProjectName + ".launch"); + + updateProjectDescription(exampleProject, substitutes); + } + + private static void copy(File targetProject, Map<String, String> substitutes, String template, String targetPath) + throws IOException + { + File source = getTemplate(targetProject.getParentFile(), template); + String content = substitute(readFile(source), substitutes); + + File target = new File(targetProject, targetPath); + System.out.println(" Generating " + target.getCanonicalPath()); + writeFile(target, content); + } + + private static void updateProjectDescription(File targetProject, Map<String, String> substitutes) throws IOException + { + File snippetTemplate = getTemplate(targetProject.getParentFile(), "template.project"); + String snippet = substitute(readFile(snippetTemplate), substitutes); + + File descriptionFile = new File(targetProject, ".project"); + String description = readFile(descriptionFile); + System.out.println(" Updating " + descriptionFile.getCanonicalPath()); + + if (description.indexOf(snippet) != -1) + { + // Nothing to update + return; + } + + String newDescription = description; + + Pattern pattern = Pattern.compile( + "(\\s*<buildCommand>.*?</buildCommand>)*(\\s*<buildCommand>.*?<value><project>/\\.externalToolBuilders/" + + targetProject.getName().replace(".", "\\.") + "\\.launch</value>.*?</buildCommand>)", Pattern.DOTALL); + Matcher matcher = pattern.matcher(description); + if (matcher.find()) + { + String remove = matcher.group(2); + newDescription = newDescription.replace(remove, ""); + } + + newDescription = newDescription.replaceFirst("[ \\t]*</buildSpec>", snippet + "\t</buildSpec>"); + if (!newDescription.equals(description)) + { + writeFile(descriptionFile, newDescription); + } + } + + private static String readFile(File file) throws IOException + { + StringBuilder result = new StringBuilder(); + FileReader in = null; + + try + { + in = new FileReader(file); + BufferedReader reader = new BufferedReader(in); + + String line; + while ((line = reader.readLine()) != null) + { + result.append(line); + result.append(NL); + } + + return result.toString(); + } + finally + { + if (in != null) + { + in.close(); + } + } + } + + private static void writeFile(File file, String content) throws IOException + { + FileWriter out = null; + + try + { + out = new FileWriter(file); + BufferedWriter writer = new BufferedWriter(out); + + writer.write(content); + writer.flush(); + } + finally + { + if (out != null) + { + out.close(); + } + } + } + + private static String getItemPath(String resource, int type) + { + return "<item path="/" + resource.replace('\\', '/') + "" type="" + type + + ""/> "; + } + + private static File getTemplate(File root, String template) + { + return new File(root, "org.eclipse.emf.cdo.releng/exampleBuilderTemplates/" + template); + } + + private static void addSubtitute(Map<String, String> substitutes, String token, String substitute) + { + System.out.println(" " + token + " = " + substitute); + substitutes.put(token, substitute); + } + + private static String substitute(String content, Map<String, String> substitutes) + { + for (Entry<String, String> entry : substitutes.entrySet()) + { + content = content.replace(entry.getKey(), entry.getValue()); + } + + return content; + } + + /** + * @author Eike Stepper + */ + private static class XMLHandler extends DefaultHandler + { + private File installerPoject; + + public XMLHandler(File installerPoject) + { + this.installerPoject = installerPoject; + } + + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException + { + if ("projectDescriptor".equalsIgnoreCase(qName)) + { + try + { + String name = attributes.getValue("name"); + String contentURI = attributes.getValue("contentURI"); + File exampleProject = new File(installerPoject, "../" + name).getCanonicalFile(); + + System.out.println(" Processing " + name + " --> " + contentURI); + processProjectDescriptor(exampleProject, installerPoject, contentURI); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + } + } +} diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintUnpublishedComponents.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintUnpublishedComponents.java index 74d8ebd568..c3bdbe0440 100644 --- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintUnpublishedComponents.java +++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintUnpublishedComponents.java @@ -25,7 +25,7 @@ import java.util.Set; */ public class PrintUnpublishedComponents { - public static final String DROP = "I20120611-1348"; + public static final String DROP = "I20120914-0410"; private static final Set<String> features = new HashSet<String>() { diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/.externalToolBuilders/org.eclipse.net4j.buddies.chat.ui.launch b/plugins/org.eclipse.net4j.buddies.chat.ui/.externalToolBuilders/org.eclipse.net4j.buddies.chat.ui.launch index 48ac6bba72..293f8ce4d5 100644 --- a/plugins/org.eclipse.net4j.buddies.chat.ui/.externalToolBuilders/org.eclipse.net4j.buddies.chat.ui.launch +++ b/plugins/org.eclipse.net4j.buddies.chat.ui/.externalToolBuilders/org.eclipse.net4j.buddies.chat.ui.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui" type="2"/> <item path="/org.eclipse.net4j.buddies.chat.ui" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/" type="2"/> <item path="/org.eclipse.net4j.buddies.chat.ui/.classpath" type="1"/> <item path="/org.eclipse.net4j.buddies.chat.ui/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.buddies.chat.ui/.options" type="1"/> <item path="/org.eclipse.net4j.buddies.chat.ui/.project" type="1"/> <item path="/org.eclipse.net4j.buddies.chat.ui/.settings" type="2"/> <item path="/org.eclipse.net4j.buddies.chat.ui/about.html" type="1"/> <item path="/org.eclipse.net4j.buddies.chat.ui/build.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.chat.ui/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.buddies.chat.ui/META-INF" type="2"/> <item path="/org.eclipse.net4j.buddies.chat.ui/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.chat.ui/plugin.xml" type="1"/> <item path="/org.eclipse.net4j.buddies.chat.ui/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/.project b/plugins/org.eclipse.net4j.buddies.chat.ui/.project index 558fa389ff..428385cbad 100644 --- a/plugins/org.eclipse.net4j.buddies.chat.ui/.project +++ b/plugins/org.eclipse.net4j.buddies.chat.ui/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.buddies.chat/.externalToolBuilders/org.eclipse.net4j.buddies.chat.launch b/plugins/org.eclipse.net4j.buddies.chat/.externalToolBuilders/org.eclipse.net4j.buddies.chat.launch index ac16493265..cf6a35c1c3 100644 --- a/plugins/org.eclipse.net4j.buddies.chat/.externalToolBuilders/org.eclipse.net4j.buddies.chat.launch +++ b/plugins/org.eclipse.net4j.buddies.chat/.externalToolBuilders/org.eclipse.net4j.buddies.chat.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat" type="2"/> <item path="/org.eclipse.net4j.buddies.chat" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/" type="2"/> <item path="/org.eclipse.net4j.buddies.chat/.classpath" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.buddies.chat/.options" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/.project" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/.settings" type="2"/> <item path="/org.eclipse.net4j.buddies.chat/about.html" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/about.ini" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/about.mappings" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/about.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/build.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/META-INF" type="2"/> <item path="/org.eclipse.net4j.buddies.chat/modeling32.png" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/plugin.xml" type="1"/> <item path="/org.eclipse.net4j.buddies.chat/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.buddies.chat/.project b/plugins/org.eclipse.net4j.buddies.chat/.project index 038fb20836..efa0d5fad2 100644 --- a/plugins/org.eclipse.net4j.buddies.chat/.project +++ b/plugins/org.eclipse.net4j.buddies.chat/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.buddies.common/.externalToolBuilders/org.eclipse.net4j.buddies.common.launch b/plugins/org.eclipse.net4j.buddies.common/.externalToolBuilders/org.eclipse.net4j.buddies.common.launch index 3e8bc329cb..8842c5d666 100644 --- a/plugins/org.eclipse.net4j.buddies.common/.externalToolBuilders/org.eclipse.net4j.buddies.common.launch +++ b/plugins/org.eclipse.net4j.buddies.common/.externalToolBuilders/org.eclipse.net4j.buddies.common.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common" type="2"/> <item path="/org.eclipse.net4j.buddies.common" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/" type="2"/> <item path="/org.eclipse.net4j.buddies.common/.classpath" type="1"/> <item path="/org.eclipse.net4j.buddies.common/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.buddies.common/.options" type="1"/> <item path="/org.eclipse.net4j.buddies.common/.project" type="1"/> <item path="/org.eclipse.net4j.buddies.common/.settings" type="2"/> <item path="/org.eclipse.net4j.buddies.common/about.html" type="1"/> <item path="/org.eclipse.net4j.buddies.common/build.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.common/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.buddies.common/META-INF" type="2"/> <item path="/org.eclipse.net4j.buddies.common/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.common/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.buddies.common/.project b/plugins/org.eclipse.net4j.buddies.common/.project index dbd9cbbd04..201a65029e 100644 --- a/plugins/org.eclipse.net4j.buddies.common/.project +++ b/plugins/org.eclipse.net4j.buddies.common/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.buddies.server/.externalToolBuilders/org.eclipse.net4j.buddies.server.launch b/plugins/org.eclipse.net4j.buddies.server/.externalToolBuilders/org.eclipse.net4j.buddies.server.launch index 4f739cdb9b..80c89e2c6d 100644 --- a/plugins/org.eclipse.net4j.buddies.server/.externalToolBuilders/org.eclipse.net4j.buddies.server.launch +++ b/plugins/org.eclipse.net4j.buddies.server/.externalToolBuilders/org.eclipse.net4j.buddies.server.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server" type="2"/> <item path="/org.eclipse.net4j.buddies.server" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/" type="2"/> <item path="/org.eclipse.net4j.buddies.server/.classpath" type="1"/> <item path="/org.eclipse.net4j.buddies.server/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.buddies.server/.options" type="1"/> <item path="/org.eclipse.net4j.buddies.server/.project" type="1"/> <item path="/org.eclipse.net4j.buddies.server/.settings" type="2"/> <item path="/org.eclipse.net4j.buddies.server/about.html" type="1"/> <item path="/org.eclipse.net4j.buddies.server/about.ini" type="1"/> <item path="/org.eclipse.net4j.buddies.server/about.mappings" type="1"/> <item path="/org.eclipse.net4j.buddies.server/about.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.server/BuddiesServer.launch" type="1"/> <item path="/org.eclipse.net4j.buddies.server/build.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.server/config" type="2"/> <item path="/org.eclipse.net4j.buddies.server/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.buddies.server/META-INF" type="2"/> <item path="/org.eclipse.net4j.buddies.server/modeling32.png" type="1"/> <item path="/org.eclipse.net4j.buddies.server/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.server/plugin.xml" type="1"/> <item path="/org.eclipse.net4j.buddies.server/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.buddies.server/.project b/plugins/org.eclipse.net4j.buddies.server/.project index d02d1b6ef4..1654111f6d 100644 --- a/plugins/org.eclipse.net4j.buddies.server/.project +++ b/plugins/org.eclipse.net4j.buddies.server/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.buddies.ui/.externalToolBuilders/org.eclipse.net4j.buddies.ui.launch b/plugins/org.eclipse.net4j.buddies.ui/.externalToolBuilders/org.eclipse.net4j.buddies.ui.launch index ba6a07efdc..cc146697cc 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/.externalToolBuilders/org.eclipse.net4j.buddies.ui.launch +++ b/plugins/org.eclipse.net4j.buddies.ui/.externalToolBuilders/org.eclipse.net4j.buddies.ui.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui" type="2"/> <item path="/org.eclipse.net4j.buddies.ui" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/" type="2"/> <item path="/org.eclipse.net4j.buddies.ui/.classpath" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.buddies.ui/.options" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/.project" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/.settings" type="2"/> <item path="/org.eclipse.net4j.buddies.ui/about.html" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/BuddiesClient1.launch" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/BuddiesClient2.launch" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/BuddiesClient3.launch" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/build.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/META-INF" type="2"/> <item path="/org.eclipse.net4j.buddies.ui/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/plugin.xml" type="1"/> <item path="/org.eclipse.net4j.buddies.ui/schema" type="2"/> <item path="/org.eclipse.net4j.buddies.ui/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.buddies.ui/.project b/plugins/org.eclipse.net4j.buddies.ui/.project index d88b31021a..2d53d36fa0 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/.project +++ b/plugins/org.eclipse.net4j.buddies.ui/.project @@ -31,6 +31,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.buddies/.externalToolBuilders/org.eclipse.net4j.buddies.launch b/plugins/org.eclipse.net4j.buddies/.externalToolBuilders/org.eclipse.net4j.buddies.launch index 96aaaec31f..1274eec1dd 100644 --- a/plugins/org.eclipse.net4j.buddies/.externalToolBuilders/org.eclipse.net4j.buddies.launch +++ b/plugins/org.eclipse.net4j.buddies/.externalToolBuilders/org.eclipse.net4j.buddies.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies" type="2"/> <item path="/org.eclipse.net4j.buddies" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/" type="2"/> <item path="/org.eclipse.net4j.buddies/.classpath" type="1"/> <item path="/org.eclipse.net4j.buddies/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.buddies/.options" type="1"/> <item path="/org.eclipse.net4j.buddies/.project" type="1"/> <item path="/org.eclipse.net4j.buddies/.settings" type="2"/> <item path="/org.eclipse.net4j.buddies/about.html" type="1"/> <item path="/org.eclipse.net4j.buddies/about.ini" type="1"/> <item path="/org.eclipse.net4j.buddies/about.mappings" type="1"/> <item path="/org.eclipse.net4j.buddies/about.properties" type="1"/> <item path="/org.eclipse.net4j.buddies/build.properties" type="1"/> <item path="/org.eclipse.net4j.buddies/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.buddies/META-INF" type="2"/> <item path="/org.eclipse.net4j.buddies/modeling32.png" type="1"/> <item path="/org.eclipse.net4j.buddies/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.buddies/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.core.resources.prefs index 119baf5c88..b84080df95 100644 --- a/plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Jul 04 12:57:50 CEST 2011 eclipse.preferences.version=1 - +encoding//examples/org.eclipse.net4j.buddies.chat/.project=UTF-8 +encoding//examples/org.eclipse.net4j.buddies/.project=UTF-8 +encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.eclipse.net4j.examples.installer/copyExampleLib.ant b/plugins/org.eclipse.net4j.examples.installer/copyExampleLib.ant index d16a794787..1ef3bccb70 100644 --- a/plugins/org.eclipse.net4j.examples.installer/copyExampleLib.ant +++ b/plugins/org.eclipse.net4j.examples.installer/copyExampleLib.ant @@ -37,7 +37,7 @@ <replaceregexp file="${examples.path}/@{project}/.project" byline="false" - flags="s" + flags="sg" match="\s*<buildCommand>\s+<name>org.eclipse.ui.externaltools.ExternalToolBuilder.*?</buildCommand>" replace="" /> diff --git a/plugins/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.ant b/plugins/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.ant new file mode 100644 index 0000000000..f712eb50f6 --- /dev/null +++ b/plugins/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.ant @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="generateExampleBuilders" default="main"> + + <target name="main"> + <java fork="false" classpath="../org.eclipse.emf.cdo.releng/bin" classname="org.eclipse.emf.cdo.releng.GenerateExampleBuilders"> + <arg value="${build.project}" /> + </java> + </target> + +</project> diff --git a/plugins/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.launch b/plugins/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.launch new file mode 100644 index 0000000000..1569250f07 --- /dev/null +++ b/plugins/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.launch @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> +<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/> +<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.buddies" type="4"/> <item path="/org.eclipse.net4j.buddies.chat" type="4"/> <item path="/org.eclipse.net4j.buddies.chat.ui" type="4"/> <item path="/org.eclipse.net4j.buddies.common" type="4"/> <item path="/org.eclipse.net4j.buddies.server" type="4"/> <item path="/org.eclipse.net4j.buddies.ui" type="4"/> <item path="/org.eclipse.net4j.jms" type="4"/> <item path="/org.eclipse.net4j.jms.admin" type="4"/> <item path="/org.eclipse.net4j.jms.api" type="4"/> <item path="/org.eclipse.net4j.jms.server" type="4"/> <item path="/org.eclipse.net4j.jms.server.jdbc" type="4"/> <item path="/org.eclipse.net4j.jms.tests" type="4"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.ant"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.examples.installer"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.ant}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/org.eclipse.net4j.examples.installer/generateNet4jExampleBuilders.ant}"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.net4j.jms.admin/.externalToolBuilders/org.eclipse.net4j.jms.admin.launch b/plugins/org.eclipse.net4j.jms.admin/.externalToolBuilders/org.eclipse.net4j.jms.admin.launch index 0e573f8f91..48cf04148a 100644 --- a/plugins/org.eclipse.net4j.jms.admin/.externalToolBuilders/org.eclipse.net4j.jms.admin.launch +++ b/plugins/org.eclipse.net4j.jms.admin/.externalToolBuilders/org.eclipse.net4j.jms.admin.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin" type="2"/> <item path="/org.eclipse.net4j.jms.admin" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/" type="2"/> <item path="/org.eclipse.net4j.jms.admin/.classpath" type="1"/> <item path="/org.eclipse.net4j.jms.admin/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.jms.admin/.options" type="1"/> <item path="/org.eclipse.net4j.jms.admin/.project" type="1"/> <item path="/org.eclipse.net4j.jms.admin/.settings" type="2"/> <item path="/org.eclipse.net4j.jms.admin/about.html" type="1"/> <item path="/org.eclipse.net4j.jms.admin/build.properties" type="1"/> <item path="/org.eclipse.net4j.jms.admin/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.jms.admin/META-INF" type="2"/> <item path="/org.eclipse.net4j.jms.admin/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.jms.admin/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.jms.admin/.project b/plugins/org.eclipse.net4j.jms.admin/.project index dfb5f944a7..3708d7089f 100644 --- a/plugins/org.eclipse.net4j.jms.admin/.project +++ b/plugins/org.eclipse.net4j.jms.admin/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.jms.api/.externalToolBuilders/org.eclipse.net4j.jms.api.launch b/plugins/org.eclipse.net4j.jms.api/.externalToolBuilders/org.eclipse.net4j.jms.api.launch index 22a6d8f21c..5106ee443d 100644 --- a/plugins/org.eclipse.net4j.jms.api/.externalToolBuilders/org.eclipse.net4j.jms.api.launch +++ b/plugins/org.eclipse.net4j.jms.api/.externalToolBuilders/org.eclipse.net4j.jms.api.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api" type="2"/> <item path="/org.eclipse.net4j.jms.api" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/" type="2"/> <item path="/org.eclipse.net4j.jms.api/.classpath" type="1"/> <item path="/org.eclipse.net4j.jms.api/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.jms.api/.project" type="1"/> <item path="/org.eclipse.net4j.jms.api/.settings" type="2"/> <item path="/org.eclipse.net4j.jms.api/about.html" type="1"/> <item path="/org.eclipse.net4j.jms.api/build.properties" type="1"/> <item path="/org.eclipse.net4j.jms.api/CDDL.html" type="1"/> <item path="/org.eclipse.net4j.jms.api/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.jms.api/META-INF" type="2"/> <item path="/org.eclipse.net4j.jms.api/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.jms.api/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.jms.api/.project b/plugins/org.eclipse.net4j.jms.api/.project index 28ee8d3e71..bbe885c49b 100644 --- a/plugins/org.eclipse.net4j.jms.api/.project +++ b/plugins/org.eclipse.net4j.jms.api/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.externalToolBuilders/org.eclipse.net4j.jms.server.jdbc.launch b/plugins/org.eclipse.net4j.jms.server.jdbc/.externalToolBuilders/org.eclipse.net4j.jms.server.jdbc.launch index 2a44f7462f..be5416152e 100644 --- a/plugins/org.eclipse.net4j.jms.server.jdbc/.externalToolBuilders/org.eclipse.net4j.jms.server.jdbc.launch +++ b/plugins/org.eclipse.net4j.jms.server.jdbc/.externalToolBuilders/org.eclipse.net4j.jms.server.jdbc.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms" type="2"/> <item path="/org.eclipse.net4j.jms" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/" type="2"/> <item path="/org.eclipse.net4j.jms.server.jdbc/.classpath" type="1"/> <item path="/org.eclipse.net4j.jms.server.jdbc/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.jms.server.jdbc/.options" type="1"/> <item path="/org.eclipse.net4j.jms.server.jdbc/.project" type="1"/> <item path="/org.eclipse.net4j.jms.server.jdbc/.settings" type="2"/> <item path="/org.eclipse.net4j.jms.server.jdbc/about.html" type="1"/> <item path="/org.eclipse.net4j.jms.server.jdbc/build.properties" type="1"/> <item path="/org.eclipse.net4j.jms.server.jdbc/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.jms.server.jdbc/db.txt" type="1"/> <item path="/org.eclipse.net4j.jms.server.jdbc/META-INF" type="2"/> <item path="/org.eclipse.net4j.jms.server.jdbc/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.jms.server.jdbc/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.project b/plugins/org.eclipse.net4j.jms.server.jdbc/.project index ccf7dc5571..85d21dc7c0 100644 --- a/plugins/org.eclipse.net4j.jms.server.jdbc/.project +++ b/plugins/org.eclipse.net4j.jms.server.jdbc/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.jms.server/.externalToolBuilders/org.eclipse.net4j.jms.server.launch b/plugins/org.eclipse.net4j.jms.server/.externalToolBuilders/org.eclipse.net4j.jms.server.launch index 4a92723337..a211fc2ea8 100644 --- a/plugins/org.eclipse.net4j.jms.server/.externalToolBuilders/org.eclipse.net4j.jms.server.launch +++ b/plugins/org.eclipse.net4j.jms.server/.externalToolBuilders/org.eclipse.net4j.jms.server.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server" type="2"/> <item path="/org.eclipse.net4j.jms.server" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/" type="2"/> <item path="/org.eclipse.net4j.jms.server/.classpath" type="1"/> <item path="/org.eclipse.net4j.jms.server/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.jms.server/.options" type="1"/> <item path="/org.eclipse.net4j.jms.server/.project" type="1"/> <item path="/org.eclipse.net4j.jms.server/.settings" type="2"/> <item path="/org.eclipse.net4j.jms.server/about.html" type="1"/> <item path="/org.eclipse.net4j.jms.server/build.properties" type="1"/> <item path="/org.eclipse.net4j.jms.server/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.jms.server/META-INF" type="2"/> <item path="/org.eclipse.net4j.jms.server/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.jms.server/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.jms.server/.project b/plugins/org.eclipse.net4j.jms.server/.project index 6474ca7cab..6158c7b9d4 100644 --- a/plugins/org.eclipse.net4j.jms.server/.project +++ b/plugins/org.eclipse.net4j.jms.server/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.jms.tests/.externalToolBuilders/org.eclipse.net4j.jms.tests.launch b/plugins/org.eclipse.net4j.jms.tests/.externalToolBuilders/org.eclipse.net4j.jms.tests.launch index 5a4c564e1b..0d3172f5fa 100644 --- a/plugins/org.eclipse.net4j.jms.tests/.externalToolBuilders/org.eclipse.net4j.jms.tests.launch +++ b/plugins/org.eclipse.net4j.jms.tests/.externalToolBuilders/org.eclipse.net4j.jms.tests.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests" type="2"/> <item path="/org.eclipse.net4j.jms.tests" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/" type="2"/> <item path="/org.eclipse.net4j.jms.tests/.classpath" type="1"/> <item path="/org.eclipse.net4j.jms.tests/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.jms.tests/.project" type="1"/> <item path="/org.eclipse.net4j.jms.tests/.settings" type="2"/> <item path="/org.eclipse.net4j.jms.tests/about.html" type="1"/> <item path="/org.eclipse.net4j.jms.tests/build.properties" type="1"/> <item path="/org.eclipse.net4j.jms.tests/config" type="2"/> <item path="/org.eclipse.net4j.jms.tests/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch" type="1"/> <item path="/org.eclipse.net4j.jms.tests/JMSTest.launch" type="1"/> <item path="/org.eclipse.net4j.jms.tests/META-INF" type="2"/> <item path="/org.eclipse.net4j.jms.tests/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.jms.tests/RMIRegistry.launch" type="1"/> <item path="/org.eclipse.net4j.jms.tests/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> diff --git a/plugins/org.eclipse.net4j.jms.tests/.project b/plugins/org.eclipse.net4j.jms.tests/.project index 9aa43b7825..1edc232464 100644 --- a/plugins/org.eclipse.net4j.jms.tests/.project +++ b/plugins/org.eclipse.net4j.jms.tests/.project @@ -26,6 +26,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.net4j.jms/.externalToolBuilders/org.eclipse.net4j.jms.launch b/plugins/org.eclipse.net4j.jms/.externalToolBuilders/org.eclipse.net4j.jms.launch index 2a44f7462f..a7ac283cc4 100644 --- a/plugins/org.eclipse.net4j.jms/.externalToolBuilders/org.eclipse.net4j.jms.launch +++ b/plugins/org.eclipse.net4j.jms/.externalToolBuilders/org.eclipse.net4j.jms.launch @@ -11,7 +11,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms" type="2"/> <item path="/org.eclipse.net4j.jms" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/" type="2"/> <item path="/org.eclipse.net4j.jms/.classpath" type="1"/> <item path="/org.eclipse.net4j.jms/.externalToolBuilders" type="2"/> <item path="/org.eclipse.net4j.jms/.options" type="1"/> <item path="/org.eclipse.net4j.jms/.project" type="1"/> <item path="/org.eclipse.net4j.jms/.settings" type="2"/> <item path="/org.eclipse.net4j.jms/about.html" type="1"/> <item path="/org.eclipse.net4j.jms/build.properties" type="1"/> <item path="/org.eclipse.net4j.jms/copyright.txt" type="1"/> <item path="/org.eclipse.net4j.jms/META-INF" type="2"/> <item path="/org.eclipse.net4j.jms/plugin.properties" type="1"/> <item path="/org.eclipse.net4j.jms/src" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/copyExample.ant"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${build_project}"/> |