Bug 489519 - Oomph configuration for platform team
Fix a number of bugs in the oomph configuration
Change-Id: I0423740c6fedf42a436955f186bbbb3af35db0bf
Signed-off-by: Stefan Xenos <sxenos@gmail.com>
diff --git a/bundles/org.eclipse.team.releng/platformTeam.setup b/bundles/org.eclipse.team.releng/platformTeam.setup
index 3419be4..58d86ec 100644
--- a/bundles/org.eclipse.team.releng/platformTeam.setup
+++ b/bundles/org.eclipse.team.releng/platformTeam.setup
@@ -3,7 +3,13 @@
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
+ xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+ xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
+ xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
+ xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
+ xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
name="team"
label="Team">
<setupTask
@@ -109,7 +115,7 @@
project="org.eclipse.team.core"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@projects[name='team']/@setupTasks.15/@workingSets.1 //@projects[name='team']/@setupTasks.15/@workingSets.2"/>
+ excludedWorkingSet="//@setupTasks.16/@workingSets.1 //@setupTasks.16/@workingSets.2"/>
</predicate>
</workingSet>
<workingSet
@@ -137,8 +143,7 @@
</predicate>
</workingSet>
</setupTask>
- <stream
- name="master"
+ <stream name="master"
label="Master">
<setupTask
xsi:type="setup:VariableTask"
@@ -146,8 +151,8 @@
value="Neon"
storageURI="scope://Workspace"/>
</stream>
- <description>The Platform Team support</description>
<logicalProjectContainer
xsi:type="setup:Project"
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']"/>
+ <description>The Platform Team support</description>
</setup:Project>