Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Helleboid2015-03-20 05:04:15 -0400
committerMatthieu Helleboid2015-03-20 05:04:15 -0400
commit91eef9e16f6b440412e4709aac1436bf16bd49d2 (patch)
tree509e43acdd1e6b0846d3dc9360bf6a0d56a729d1
parent15c66100b2bb42595f4300a33ac3f059927a3b5c (diff)
downloadorg.eclipse.emf.diffmerge.core-0.1.x.tar.gz
org.eclipse.emf.diffmerge.core-0.1.x.tar.xz
org.eclipse.emf.diffmerge.core-0.1.x.zip
Update RelEng0.1.x
Change-Id: I2ee4f01ecd50ee15a63656454d78c4c5dd10be62 Signed-off-by: Matthieu Helleboid <matthieu.helleboid@thalesgroup.com>
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/.classpath14
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/.project62
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/.settings/org.eclipse.jdt.core.prefs19
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/META-INF/MANIFEST.MF5
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/build.properties31
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/egf/script_generation.fcore101
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/generated/default_package/install_buckminster.java103
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/config.xml160
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/buckminster_Import_and_compile/build.cquery29
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/build.xml12
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39I8KHEeSIKPkbYbn5Dg.pt1
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39IsKHEeSIKPkbYbn5Dg.pt1
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JMKHEeSIKPkbYbn5Dg.pt0
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JcKHEeSIKPkbYbn5Dg.pt27
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JsKHEeSIKPkbYbn5Dg.pt0
15 files changed, 363 insertions, 202 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.releng/.classpath b/releng/org.eclipse.emf.diffmerge.releng/.classpath
index 45f024e8..915bfef9 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/.classpath
+++ b/releng/org.eclipse.emf.diffmerge.releng/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="generated"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/releng/org.eclipse.emf.diffmerge.releng/.project b/releng/org.eclipse.emf.diffmerge.releng/.project
index f907a0ec..f4d760fc 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/.project
+++ b/releng/org.eclipse.emf.diffmerge.releng/.project
@@ -1,28 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.releng</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.releng</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.egf.pattern.ui.PatternBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.egf.core.EGFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.diffmerge.releng/.settings/org.eclipse.jdt.core.prefs b/releng/org.eclipse.emf.diffmerge.releng/.settings/org.eclipse.jdt.core.prefs
index dd7ab29f..416f4fb6 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/.settings/org.eclipse.jdt.core.prefs
+++ b/releng/org.eclipse.emf.diffmerge.releng/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,11 @@
-#Mon Jul 23 15:44:31 CEST 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/releng/org.eclipse.emf.diffmerge.releng/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.diffmerge.releng/META-INF/MANIFEST.MF
index 329d289e..bc182a64 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.emf.diffmerge.releng/META-INF/MANIFEST.MF
@@ -4,3 +4,8 @@ Bundle-Name: EMF Diff/Merge Releng
Bundle-SymbolicName: org.eclipse.emf.diffmerge.releng;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.egf.pattern;visibility:=reexport,
+ org.eclipse.egf.pattern.ftask;visibility:=reexport,
+ org.eclipse.egf.portfolio.eclipse.build
+Export-Package: default_package
diff --git a/releng/org.eclipse.emf.diffmerge.releng/build.properties b/releng/org.eclipse.emf.diffmerge.releng/build.properties
index 076c1698..432d5994 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/build.properties
+++ b/releng/org.eclipse.emf.diffmerge.releng/build.properties
@@ -1,14 +1,17 @@
-###############################################################################
-# Copyright (c) 2010-2012 Thales Global Services S.A.S.
-# 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
-###############################################################################
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- egf/,\
- model/,\
- plugin.xml
-source.. = src/
+###############################################################################
+# Copyright (c) 2010-2012 Thales Global Services S.A.S.
+# 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
+###############################################################################
+source.. = generated/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ egf/,\
+ model/,\
+ plugin.xml,\
+ ant/,\
+ jobs/,\
+ templates/
diff --git a/releng/org.eclipse.emf.diffmerge.releng/egf/script_generation.fcore b/releng/org.eclipse.emf.diffmerge.releng/egf/script_generation.fcore
index cac23278..304f20dc 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/egf/script_generation.fcore
+++ b/releng/org.eclipse.emf.diffmerge.releng/egf/script_generation.fcore
@@ -1,37 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fcore:FactoryComponent xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:domain="http://www.eclipse.org/egf/1.0.0/domain"
- xmlns:fcore="http://www.eclipse.org/egf/1.0.0/fcore" xmlns:fprod="http://www.eclipse.org/egf/1.0.0/fprod"
- xmlns:types="http://www.eclipse.org/egf/1.0.0/types" xmi:id="_SzDQYNTNEeGOc4hDMM5euQ"
- name="script_generation">
- <viewpointContainer xmi:id="_TetcgNTNEeGOc4hDMM5euQ">
- <viewpoints xmi:type="domain:DomainViewpoint" xmi:id="_TxyJgNTNEeGOc4hDMM5euQ">
- <domains xmi:type="domain:EMFDomain" xmi:id="_UHiXENTNEeGOc4hDMM5euQ" helperImplementation="org.eclipse.egf.domain.emf.EMFDomainHelper"
- uri="platform:/resource/org.eclipse.emf.diffmerge.releng/model/diffmerge.egfbuild"/>
- <domains xmi:type="domain:EMFDomain" xmi:id="_xJrLMO0kEeGUh5cCyocRdQ" helperImplementation="org.eclipse.egf.domain.emf.EMFDomainHelper"
- uri="platform:/resource/org.eclipse.emf.diffmerge.releng/model/diffmerge_local.egfbuild"/>
- </viewpoints>
- </viewpointContainer>
- <orchestration xmi:type="fprod:ProductionPlan" xmi:id="_WUD5ANTNEeGOc4hDMM5euQ">
- <invocations xmi:id="_ZrrVENTNEeGOc4hDMM5euQ" invokedActivity="fcore:FactoryComponent platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_N4pRwI6UEd-e7viTqNBNrA">
- <invocationContractContainer xmi:id="_ZrrVEdTNEeGOc4hDMM5euQ">
- <invocationContracts xmi:id="_ZrrVEtTNEeGOc4hDMM5euQ" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_ad5FkY6VEd-e7viTqNBNrA">
- <type xmi:type="domain:TypeDomain" xmi:id="_a4tv8NTNEeGOc4hDMM5euQ" domain="#_UHiXENTNEeGOc4hDMM5euQ"/>
- </invocationContracts>
- <invocationContracts xmi:id="_ZrrVE9TNEeGOc4hDMM5euQ" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_npIcUJlgEd-cRYVfj6AwNg">
- <type xmi:type="types:TypeString" xmi:id="_b6broNTNEeGOc4hDMM5euQ" value="platform:/resource/org.eclipse.emf.diffmerge.releng/jobs/"/>
- </invocationContracts>
- </invocationContractContainer>
- </invocations>
- <invocations xmi:id="_yzxVgO0kEeGUh5cCyocRdQ" invokedActivity="fcore:FactoryComponent platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_N4pRwI6UEd-e7viTqNBNrA">
- <invocationContractContainer xmi:id="_yzxVge0kEeGUh5cCyocRdQ">
- <invocationContracts xmi:id="_yzxVgu0kEeGUh5cCyocRdQ" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_ad5FkY6VEd-e7viTqNBNrA">
- <type xmi:type="domain:TypeDomain" xmi:id="_yzxVg-0kEeGUh5cCyocRdQ" domain="#_xJrLMO0kEeGUh5cCyocRdQ"/>
- </invocationContracts>
- <invocationContracts xmi:id="_yzxVhO0kEeGUh5cCyocRdQ" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_npIcUJlgEd-cRYVfj6AwNg">
- <type xmi:type="types:TypeString" xmi:id="_yzxVhe0kEeGUh5cCyocRdQ" value="platform:/resource/org.eclipse.emf.diffmerge.releng/jobs/"/>
- </invocationContracts>
- </invocationContractContainer>
- </invocations>
- </orchestration>
-</fcore:FactoryComponent>
+<?xml version="1.0" encoding="UTF-8"?>
+<fcore:FactoryComponent xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:domain="http://www.eclipse.org/egf/1.0.0/domain"
+ xmlns:fcore="http://www.eclipse.org/egf/1.0.0/fcore" xmlns:fprod="http://www.eclipse.org/egf/1.0.0/fprod"
+ xmlns:jetpattern="http://www.eclipse.org/egf/1.0.0/jetpattern" xmlns:pattern="http://www.eclipse.org/egf/1.0.0/pattern"
+ xmlns:types="http://www.eclipse.org/egf/1.0.0/types" xmi:id="_SzDQYNTNEeGOc4hDMM5euQ" name="script_generation">
+ <viewpointContainer xmi:id="_TetcgNTNEeGOc4hDMM5euQ">
+ <viewpoints xmi:type="domain:DomainViewpoint" xmi:id="_TxyJgNTNEeGOc4hDMM5euQ">
+ <domains xmi:type="domain:EMFDomain" xmi:id="_UHiXENTNEeGOc4hDMM5euQ" helperImplementation="org.eclipse.egf.domain.emf.EMFDomainHelper"
+ uri="platform:/resource/org.eclipse.emf.diffmerge.releng/model/diffmerge.egfbuild"/>
+ <domains xmi:type="domain:EMFDomain" xmi:id="_xJrLMO0kEeGUh5cCyocRdQ" helperImplementation="org.eclipse.egf.domain.emf.EMFDomainHelper"
+ uri="platform:/resource/org.eclipse.emf.diffmerge.releng/model/diffmerge_local.egfbuild"/>
+ </viewpoints>
+ <viewpoints xmi:type="pattern:PatternViewpoint" xmi:id="_B1NKMMKHEeSIKPkbYbn5Dg">
+ <libraries xmi:id="_CPujAMKHEeSIKPkbYbn5Dg" name="default_package">
+ <elements xmi:id="_Cu39IMKHEeSIKPkbYbn5Dg" name="install_buckminster" superPattern="platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_WzN4sI6XEd-e7viTqNBNrA"
+ headerMethod="#_Cu39IsKHEeSIKPkbYbn5Dg" conditionMethod="#_Cu39JMKHEeSIKPkbYbn5Dg"
+ initMethod="#_Cu39I8KHEeSIKPkbYbn5Dg" footerMethod="#_Cu39JsKHEeSIKPkbYbn5Dg">
+ <nature xmi:type="jetpattern:JetNature" xmi:id="_Cu39IcKHEeSIKPkbYbn5Dg"
+ name="JET"/>
+ <methods xmi:id="_Cu39IsKHEeSIKPkbYbn5Dg" name="header" patternFilePath="templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39IsKHEeSIKPkbYbn5Dg.pt"/>
+ <methods xmi:id="_Cu39I8KHEeSIKPkbYbn5Dg" name="init" patternFilePath="templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39I8KHEeSIKPkbYbn5Dg.pt"/>
+ <methods xmi:id="_Cu39JMKHEeSIKPkbYbn5Dg" name="preCondition" patternFilePath="templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JMKHEeSIKPkbYbn5Dg.pt"/>
+ <methods xmi:id="_Cu39JcKHEeSIKPkbYbn5Dg" name="install_buckminster" patternFilePath="templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JcKHEeSIKPkbYbn5Dg.pt"/>
+ <methods xmi:id="_Cu39JsKHEeSIKPkbYbn5Dg" name="footer" patternFilePath="templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JsKHEeSIKPkbYbn5Dg.pt"/>
+ <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cu39J8KHEeSIKPkbYbn5Dg"/>
+ </elements>
+ </libraries>
+ </viewpoints>
+ </viewpointContainer>
+ <orchestration xmi:type="fprod:ProductionPlan" xmi:id="_WUD5ANTNEeGOc4hDMM5euQ">
+ <invocations xmi:id="_ZrrVENTNEeGOc4hDMM5euQ" invokedActivity="fcore:FactoryComponent platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_N4pRwI6UEd-e7viTqNBNrA">
+ <invocationContractContainer xmi:id="_ZrrVEdTNEeGOc4hDMM5euQ">
+ <invocationContracts xmi:id="_ZrrVEtTNEeGOc4hDMM5euQ" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_ad5FkY6VEd-e7viTqNBNrA">
+ <type xmi:type="domain:TypeDomain" xmi:id="_a4tv8NTNEeGOc4hDMM5euQ" domain="#_UHiXENTNEeGOc4hDMM5euQ"/>
+ </invocationContracts>
+ <invocationContracts xmi:id="_ZrrVE9TNEeGOc4hDMM5euQ" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_npIcUJlgEd-cRYVfj6AwNg">
+ <type xmi:type="types:TypeString" xmi:id="_b6broNTNEeGOc4hDMM5euQ" value="platform:/resource/org.eclipse.emf.diffmerge.releng/jobs/"/>
+ </invocationContracts>
+ <invocationContracts xmi:id="_EUyyEMKHEeSIKPkbYbn5Dg" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_mb-o4I_tEd-ggNhbFv1Fiw">
+ <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_FxBfgMKHEeSIKPkbYbn5Dg">
+ <substitutions xmi:id="_Ki6hMMKHEeSIKPkbYbn5Dg" replacedElement="platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_WzN4sI6XEd-e7viTqNBNrA"
+ replacement="#_Cu39IMKHEeSIKPkbYbn5Dg"/>
+ </type>
+ </invocationContracts>
+ </invocationContractContainer>
+ </invocations>
+ <invocations xmi:id="_yzxVgO0kEeGUh5cCyocRdQ" invokedActivity="fcore:FactoryComponent platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_N4pRwI6UEd-e7viTqNBNrA">
+ <invocationContractContainer xmi:id="_yzxVge0kEeGUh5cCyocRdQ">
+ <invocationContracts xmi:id="_yzxVgu0kEeGUh5cCyocRdQ" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_ad5FkY6VEd-e7viTqNBNrA">
+ <type xmi:type="domain:TypeDomain" xmi:id="_yzxVg-0kEeGUh5cCyocRdQ" domain="#_xJrLMO0kEeGUh5cCyocRdQ"/>
+ </invocationContracts>
+ <invocationContracts xmi:id="_yzxVhO0kEeGUh5cCyocRdQ" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_npIcUJlgEd-cRYVfj6AwNg">
+ <type xmi:type="types:TypeString" xmi:id="_yzxVhe0kEeGUh5cCyocRdQ" value="platform:/resource/org.eclipse.emf.diffmerge.releng/jobs/"/>
+ </invocationContracts>
+ <invocationContracts xmi:id="_GKDDgMKHEeSIKPkbYbn5Dg" invokedContract="fcore:FactoryComponentContract platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_mb-o4I_tEd-ggNhbFv1Fiw">
+ <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_GKDDgcKHEeSIKPkbYbn5Dg">
+ <substitutions xmi:id="_I_1k4MKHEeSIKPkbYbn5Dg" replacedElement="platform:/plugin/org.eclipse.egf.portfolio.eclipse.build/egf/Build.fcore#_WzN4sI6XEd-e7viTqNBNrA"
+ replacement="#_Cu39IMKHEeSIKPkbYbn5Dg"/>
+ </type>
+ </invocationContracts>
+ </invocationContractContainer>
+ </invocations>
+ </orchestration>
+</fcore:FactoryComponent>
diff --git a/releng/org.eclipse.emf.diffmerge.releng/generated/default_package/install_buckminster.java b/releng/org.eclipse.emf.diffmerge.releng/generated/default_package/install_buckminster.java
new file mode 100644
index 00000000..00ff3b62
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.releng/generated/default_package/install_buckminster.java
@@ -0,0 +1,103 @@
+//Generated with EGF 1.2.0.v20140805-0858
+package default_package;
+
+import org.eclipse.egf.common.helper.*;
+import java.util.*;
+import org.eclipse.emf.ecore.*;
+import org.eclipse.egf.model.pattern.*;
+import org.eclipse.egf.pattern.execution.*;
+import org.eclipse.egf.pattern.query.*;
+
+public class install_buckminster extends org.eclipse.egf.portfolio.eclipse.build.buckminster.buildxml {
+ protected static String nl;
+
+ public static synchronized install_buckminster create(String lineSeparator) {
+ nl = lineSeparator;
+ install_buckminster result = new install_buckminster();
+ nl = null;
+ return result;
+ }
+
+ public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+ protected final String TEXT_1 = " <target name=\"install.buckminster\">" + NL
+ + " <available file=\"${tools}/buckminster/buckminster\" property=\"buckminster.exists\" />" + NL + " <antcall target=\"do.install.buckminster\" />" + NL
+ + "\t</target>" + NL + "\t" + NL + " <target name=\"do.install.buckminster\" unless=\"buckminster.exists\" depends=\"install.director\">" + NL
+ + " <echo message=\"Configuring headless buckminster with needed features\" />" + NL + " <echo message=\"Headless site: ${bm.headless.site}\" />" + NL
+ + " <echo message=\"External site: ${bm.external.site}\" />" + NL + " <eclipse.launch app=\"director\">" + NL + " <args>" + NL
+ + " <jvmarg value=\"-Declipse.p2.mirrors=false\" />" + NL + " <arg value=\"-r\" />" + NL
+ + " <arg value=\"${bm.headless.site}\" />" + NL + " <arg value=\"-d\" />" + NL + " <arg value=\"${tools}/buckminster\" />"
+ + NL + " <arg value=\"-p\" />" + NL + " <arg value=\"Buckminster\" />" + NL + " <arg value=\"-i\" />" + NL
+ + " <arg value=\"org.eclipse.buckminster.cmdline.product\" />" + NL + " <arg value=\"-i\" />" + NL
+ + " <arg value=\"org.eclipse.buckminster.core.headless.feature.feature.group\" />" + NL + " <arg value=\"-i\" />" + NL
+ + " <arg value=\"org.eclipse.buckminster.pde.headless.feature.feature.group\" />" + NL + " </args>" + NL + " </eclipse.launch>" + NL
+ + " </target>" + NL;
+ protected final String TEXT_2 = NL;
+ protected final String TEXT_3 = NL;
+
+ public install_buckminster() {
+ //Here is the constructor
+ StringBuffer stringBuffer = new StringBuffer();
+
+ // add initialisation of the pattern variables (declaration has been already done).
+
+ }
+
+ public String generate(Object argument) throws Exception {
+ final StringBuffer stringBuffer = new StringBuffer();
+
+ InternalPatternContext ctx = (InternalPatternContext) argument;
+ Map<String, String> queryCtx = null;
+ IQuery.ParameterDescription paramDesc = null;
+ Node.Container currentNode = ctx.getNode();
+
+ List<Object> jobList = null;
+ //this pattern can only be called by another (i.e. it's not an entry point in execution)
+
+ for (Object jobParameter : jobList) {
+
+ this.job = (org.eclipse.egf.portfolio.eclipse.build.buildcore.Job) jobParameter;
+
+ if (preCondition(ctx)) {
+ ctx.setNode(new Node.Container(currentNode, getClass()));
+ orchestration(ctx);
+ }
+
+ }
+ ctx.setNode(currentNode);
+ if (ctx.useReporter()) {
+ ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
+ }
+
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(TEXT_3);
+ return stringBuffer.toString();
+ }
+
+ public String orchestration(PatternContext ctx) throws Exception {
+ InternalPatternContext ictx = (InternalPatternContext) ctx;
+
+ super.orchestration(new SuperOrchestrationContext(ictx));
+
+ if (ictx.useReporter()) {
+ Map<String, Object> parameterValues = new HashMap<String, Object>();
+ parameterValues.put("job", this.job);
+ String outputWithCallBack = OutputManager.computeLoopOutput(ictx);
+ String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);
+ ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);
+ }
+ return null;
+ }
+
+ public Map<String, Object> getParameters() {
+ final Map<String, Object> parameters = new HashMap<String, Object>();
+ parameters.put("job", this.job);
+ return parameters;
+ }
+
+ protected void method_install_buckminster(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {
+
+ stringBuffer.append(TEXT_1);
+ InternalPatternContext ictx = (InternalPatternContext) ctx;
+ new Node.DataLeaf(ictx.getNode(), getClass(), "install_buckminster", stringBuffer.toString());
+ }
+} \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/config.xml b/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/config.xml
index 2c9b356d..969759c2 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/config.xml
+++ b/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/config.xml
@@ -1,80 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This file was generated by Eclipse EGF
--->
-<project>
- <description></description>
- <actions>
-
- </actions>
- <builders>
- <hudson.tasks.Ant>
- <targets>all</targets>
- <buildFile>../releng/build.xml</buildFile>
- </hudson.tasks.Ant>
-
- </builders>
- <buildWrappers>
-
- </buildWrappers>
- <properties>
-
- </properties>
- <publishers>
- <hudson.tasks.ArtifactArchiver>
- <artifacts>result/publish/**</artifacts>
- <latestOnly>false</latestOnly>
- </hudson.tasks.ArtifactArchiver>
- <hudson.tasks.JavadocArchiver>
- <javadocDir>../javadoc</javadocDir>
- <keepAll>false</keepAll>
- </hudson.tasks.JavadocArchiver>
-
- </publishers>
- <triggers class="vector">
-
- </triggers>
- <scm class="hudson.plugins.git.GitSCM">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <name></name>
- <refspec></refspec>
- <url>http://git.eclipse.org/gitroot/diffmerge/org.eclipse.emf.diffmerge.core.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>**</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <disableSubmodules>false</disableSubmodules>
- <recursiveSubmodules>false</recursiveSubmodules>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <authorOrCommitter>false</authorOrCommitter>
- <clean>false</clean>
- <wipeOutWorkspace>false</wipeOutWorkspace>
- <pruneBranches>false</pruneBranches>
- <remotePoll>false</remotePoll>
- <ignoreNotifyCommit>false</ignoreNotifyCommit>
- <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
- <gitTool>Default</gitTool>
- <submoduleCfg class="list"/>
- <relativeTargetDir>git</relativeTargetDir>
- <reference></reference>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <gitConfigName></gitConfigName>
- <gitConfigEmail></gitConfigEmail>
- <skipTag>false</skipTag>
- <includedRegions></includedRegions>
- <scmName></scmName>
- </scm>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>-1</artifactNumToKeep>
- </logRotator>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This file was generated by Eclipse EGF
+-->
+<project>
+ <description></description>
+ <actions>
+
+ </actions>
+ <builders>
+ <hudson.tasks.Ant>
+ <targets>all</targets>
+ <buildFile>../releng/build.xml</buildFile>
+ </hudson.tasks.Ant>
+
+ </builders>
+ <buildWrappers>
+
+ </buildWrappers>
+ <properties>
+
+
+
+ </properties>
+ <publishers>
+ <hudson.tasks.ArtifactArchiver>
+ <artifacts>result/publish/**</artifacts>
+ <latestOnly>false</latestOnly>
+ </hudson.tasks.ArtifactArchiver>
+ <hudson.tasks.JavadocArchiver>
+ <javadocDir>../javadoc</javadocDir>
+ <keepAll>false</keepAll>
+ </hudson.tasks.JavadocArchiver>
+
+ </publishers>
+ <triggers class="vector">
+
+ </triggers>
+ <scm class="hudson.plugins.git.GitSCM">
+ <configVersion>2</configVersion>
+ <userRemoteConfigs>
+ <hudson.plugins.git.UserRemoteConfig>
+ <name></name>
+ <refspec></refspec>
+ <url>http://git.eclipse.org/gitroot/diffmerge/org.eclipse.emf.diffmerge.core.git</url>
+ </hudson.plugins.git.UserRemoteConfig>
+ </userRemoteConfigs>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>**</name>
+ </hudson.plugins.git.BranchSpec>
+ </branches>
+ <disableSubmodules>false</disableSubmodules>
+ <recursiveSubmodules>false</recursiveSubmodules>
+ <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+ <authorOrCommitter>false</authorOrCommitter>
+ <clean>false</clean>
+ <wipeOutWorkspace>false</wipeOutWorkspace>
+ <pruneBranches>false</pruneBranches>
+ <remotePoll>false</remotePoll>
+ <ignoreNotifyCommit>false</ignoreNotifyCommit>
+ <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+ <gitTool>Default</gitTool>
+ <submoduleCfg class="list"/>
+ <relativeTargetDir>git</relativeTargetDir>
+ <reference></reference>
+ <excludedRegions></excludedRegions>
+ <excludedUsers></excludedUsers>
+ <gitConfigName></gitConfigName>
+ <gitConfigEmail></gitConfigEmail>
+ <skipTag>false</skipTag>
+ <includedRegions></includedRegions>
+ <scmName></scmName>
+ </scm>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
+
</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/buckminster_Import_and_compile/build.cquery b/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/buckminster_Import_and_compile/build.cquery
index 7b1cd2d9..57dbe593 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/buckminster_Import_and_compile/build.cquery
+++ b/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/buckminster_Import_and_compile/build.cquery
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This file was generated by Eclipse EGF
--->
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="build.rmap">
- <cq:rootRequest name="Import_and_compile" componentType="buckminster"/>
-
- <!-- we ignore source plugin and feature by default -->
- <cq:advisorNode namePattern=".*\.source" skipComponent="true"/>
-
- <!-- we ignore some missing plugins -->
- <cq:advisorNode namePattern="^org\.eclipse\.swt\.(?:gtk\.(?:linux\.s390x|aix\.ppc(?:64)?)|motif\.solaris\.sparc|photon\.qnx\.x86)\.source$" skipComponent="true"/>
- <cq:advisorNode namePattern="^org\.eclipse\.swt\.(?:gtk\.aix\.ppc(?:64)?|motif\.solaris\.sparc|photon\.qnx\.x86)$" skipComponent="true"/>
- <cq:advisorNode namePattern="^org\.eclipse\.equinox\.launcher\.gtk\.aix\.ppc(?:64)?$" skipComponent="true"/>
-
- <cq:advisorNode namePattern=".*" useMaterialization="false" useTargetPlatform="false"/>
-</cq:componentQuery>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This file was generated by Eclipse EGF
+-->
+<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="build.rmap">
+ <cq:rootRequest name="Import_and_compile" componentType="buckminster"/>
+
+ <!-- we ignore source plugin and feature by default -->
+ <cq:advisorNode namePattern=".*\.source" skipComponent="true"/>
+
+ <cq:advisorNode namePattern=".*" useMaterialization="false" useTargetPlatform="false"/>
+</cq:componentQuery>
diff --git a/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/build.xml b/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/build.xml
index 65fb61f9..a09273ba 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/build.xml
+++ b/releng/org.eclipse.emf.diffmerge.releng/jobs/diffmerge/releng/build.xml
@@ -123,10 +123,6 @@ This file was generated by Eclipse EGF
<jvmarg value="-Declipse.p2.mirrors=false" />
<arg value="-r" />
<arg value="${bm.headless.site}" />
- <arg value="-r" />
- <arg value="${bm.external.site}" />
- <arg value="-r" />
- <arg value="${polarion.site}" />
<arg value="-d" />
<arg value="${tools}/buckminster" />
<arg value="-p" />
@@ -137,14 +133,6 @@ This file was generated by Eclipse EGF
<arg value="org.eclipse.buckminster.core.headless.feature.feature.group" />
<arg value="-i" />
<arg value="org.eclipse.buckminster.pde.headless.feature.feature.group" />
- <arg value="-i" />
- <arg value="org.eclipse.buckminster.cvs.headless.feature.feature.group" />
- <arg value="-i" />
- <arg value="org.eclipse.buckminster.subversive.headless.feature.feature.group" />
- <arg value="-i" />
- <arg value="org.eclipse.buckminster.git.headless.feature.feature.group" />
- <arg value="-i" />
- <arg value="org.eclipse.buckminster.emma.headless.feature.feature.group" />
</args>
</eclipse.launch>
</target>
diff --git a/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39I8KHEeSIKPkbYbn5Dg.pt b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39I8KHEeSIKPkbYbn5Dg.pt
new file mode 100644
index 00000000..d6300533
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39I8KHEeSIKPkbYbn5Dg.pt
@@ -0,0 +1 @@
+<%// add initialisation of the pattern variables (declaration has been already done).%>
diff --git a/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39IsKHEeSIKPkbYbn5Dg.pt b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39IsKHEeSIKPkbYbn5Dg.pt
new file mode 100644
index 00000000..dbc5974c
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39IsKHEeSIKPkbYbn5Dg.pt
@@ -0,0 +1 @@
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*" %> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JMKHEeSIKPkbYbn5Dg.pt b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JMKHEeSIKPkbYbn5Dg.pt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JMKHEeSIKPkbYbn5Dg.pt
diff --git a/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JcKHEeSIKPkbYbn5Dg.pt b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JcKHEeSIKPkbYbn5Dg.pt
new file mode 100644
index 00000000..46bb32db
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JcKHEeSIKPkbYbn5Dg.pt
@@ -0,0 +1,27 @@
+ <target name="install.buckminster">
+ <available file="${tools}/buckminster/buckminster" property="buckminster.exists" />
+ <antcall target="do.install.buckminster" />
+ </target>
+
+ <target name="do.install.buckminster" unless="buckminster.exists" depends="install.director">
+ <echo message="Configuring headless buckminster with needed features" />
+ <echo message="Headless site: ${bm.headless.site}" />
+ <echo message="External site: ${bm.external.site}" />
+ <eclipse.launch app="director">
+ <args>
+ <jvmarg value="-Declipse.p2.mirrors=false" />
+ <arg value="-r" />
+ <arg value="${bm.headless.site}" />
+ <arg value="-d" />
+ <arg value="${tools}/buckminster" />
+ <arg value="-p" />
+ <arg value="Buckminster" />
+ <arg value="-i" />
+ <arg value="org.eclipse.buckminster.cmdline.product" />
+ <arg value="-i" />
+ <arg value="org.eclipse.buckminster.core.headless.feature.feature.group" />
+ <arg value="-i" />
+ <arg value="org.eclipse.buckminster.pde.headless.feature.feature.group" />
+ </args>
+ </eclipse.launch>
+ </target>
diff --git a/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JsKHEeSIKPkbYbn5Dg.pt b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JsKHEeSIKPkbYbn5Dg.pt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.releng/templates/pattern._Cu39IMKHEeSIKPkbYbn5Dg/method._Cu39JsKHEeSIKPkbYbn5Dg.pt

Back to the top