Merge branch 'origin/release_1.2.0'
diff --git a/releng/org.eclipse.emf.ecp.releng/ecp.setup b/releng/org.eclipse.emf.ecp.releng/ecp.setup
new file mode 100644
index 0000000..95d7482
--- /dev/null
+++ b/releng/org.eclipse.emf.ecp.releng/ecp.setup
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ASCII"?>
+<setup:Project setup:toolVersion="8" xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:predicates="http://www.eclipse.org/CDO/releng/predicates/1.0" xmlns:setup="http://www.eclipse.org/CDO/releng/setup/1.0" xmlns:workingsets="http://www.eclipse.org/CDO/releng/workingsets/1.0" name="ECP" label="EMF Client Platform">
+ <setupTasks xsi:type="setup:P2Task">
+ <installableUnits id="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
+ <installableUnits id="org.eclipse.emf.cdo.releng.projectcopy.feature.group"/>
+ <installableUnits id="org.eclipse.emf.ecoretools.sdk.feature.group" versionRange="[1.0.0,2.0.0)"/>
+ <installableUnits id="org.eclipse.net4j.util.ui.feature.group"/>
+ <installableUnits id="org.eclipse.mylyn.ide_feature.feature.group"/>
+ <installableUnits id="org.eclipse.mylyn.java_feature.feature.group"/>
+ <installableUnits id="org.eclipse.mylyn.pde_feature.feature.group"/>
+ <installableUnits id="org.eclipse.mylyn.team_feature.feature.group"/>
+ <installableUnits id="org.eclipse.mylyn.gerrit.feature.feature.group"/>
+ <installableUnits id="org.eclipse.mylyn_feature.feature.group"/>
+ <installableUnits id="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
+ <installableUnits id="org.eclipse.mylyn.git.feature.group"/>
+ <installableUnits id="org.eclipse.egit.feature.group"/>
+ <installableUnits id="org.eclipse.egit.mylyn.feature.group"/>
+ <installableUnits id="net.sf.eclipsecs.feature.group"/>
+ <p2Repositories url="http://download.eclipse.org/mylyn/snapshots/weekly"/>
+ <p2Repositories url="http://download.eclipse.org/egit/updates-nightly"/>
+ <p2Repositories url="http://download.eclipse.org/modeling/emft/ecoretools/updates/1.2/201306071421"/>
+ <p2Repositories url="http://eclipse-cs.sf.net/update"/>
+ <p2Repositories url="${train.url}"/>
+ <p2Repositories url="${releng.url}"/>
+ </setupTasks>
+ <setupTasks xsi:type="setup:EclipseIniTask" option="-Xmx" value="4g" vm="true"/>
+ <setupTasks xsi:type="setup:ResourceCreationTask" excludedTriggers="STARTUP MANUAL" content="<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
		<item value="true" key="group_libraries"/>
		<item value="false" key="linkWithEditor"/>
		<item value="2" key="layout"/>
		<item value="2" key="rootMode"/>
		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer configured=&quot;true&quot; group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;2&quot; sortWorkingSets=&quot;false&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;localWorkingSetManager&gt;&#x0D;&#x0A;&lt;workingSet editPageId=&quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1382792884467_1&quot; label=&quot;Other Projects&quot; name=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/localWorkingSetManager&gt;&#x0D;&#x0A;&lt;activeWorkingSet workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;allWorkingSets workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
	</section>
</section>
" targetURL="${setup.ws.dir|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml" encoding="UTF-8"/>
+ <setupTasks xsi:type="setup:EclipseIniTask" option="-Dsetup.branch.uri" value="=${git.clone|uri}/releng/org.eclipse.emf.ecp.releng/ecp.setup" vm="true"/>
+ <setupTasks xsi:type="setup:EclipsePreferenceTask" key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="ignore"/>
+ <setupTasks xsi:type="setup:EclipsePreferenceTask" key="instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unclosedCloseable" value="ignore"/>
+ <setupTasks xsi:type="setup:EclipsePreferenceTask" key="instance/org.eclipse.pde/compilers.f.unresolved-features" value="2"/>
+ <setupTasks xsi:type="setup:ContextVariableTask" documentation="Location of CDO's Git clone." name="git.clone" value="${setup.branch.dir/git/ecp}" stringSubstitution="true"/>
+ <setupTasks xsi:type="setup:GitCloneTask" location="${git.clone}" remoteURI="ssh://git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.core.git" checkoutBranch="${ecp.git.branch}"/>
+ <setupTasks xsi:type="setup:TargletTask" name="ECP">
+ <roots id="org.eclipse.emf.ecp.all.feature.feature.group"/>
+ <roots id="org.eclipse.emf.ecp.releng"/>
+ <roots id="org.eclipse.sdk.feature.group"/>
+ <sourceLocators rootFolder="${git.clone}" locateNestedProjects="true"/>
+ <repositoryLists name="Kepler Dependencies">
+ <p2Repositories url="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-S"/>
+ <p2Repositories url="http://download.eclipse.org/releases/kepler"/>
+ <p2Repositories url="http://download.eclipse.org/technology/swtbot/releases/latest"/>
+ <p2Repositories url="http://download.eclipse.org/eclipse/updates/4.3"/>
+ <p2Repositories url="http://download.eclipse.org/rt/rap/incubator/2.1/fileupload"/>
+ <p2Repositories url="http://download.eclipse.org/emf-store/releases_11"/>
+ </repositoryLists>
+ </setupTasks>
+ <setupTasks xsi:type="setup:ApiBaselineTask" version="${ecp.baseline.version}" zipLocation="https://dl.dropboxusercontent.com/u/23674036/120.zip"/>
+ <setupTasks xsi:type="setup:WorkingSetTask">
+ <workingSets name="ECP" id="CDO CDO">
+ <predicates xsi:type="predicates:AndPredicate">
+ <operands xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.emf\.ecp.*"/>
+ <operands xsi:type="workingsets:ExclusionPredicate" excludedWorkingSets="//@setupTasks.11/@workingSets.1 //@setupTasks.11/@workingSets.2 //@setupTasks.11/@workingSets.4 //@setupTasks.11/@workingSets.3 //@setupTasks.11/@workingSets.5"/>
+ </predicates>
+ </workingSets>
+ <workingSets name="ECP Tests" id="CDO CDO Tests">
+ <predicates xsi:type="predicates:AndPredicate">
+ <operands xsi:type="predicates:NamePredicate" pattern=".*test.*"/>
+ </predicates>
+ </workingSets>
+ <workingSets name="EMF Forms" id="CDO CDO Dawn">
+ <predicates xsi:type="predicates:AndPredicate">
+ <operands xsi:type="workingsets:ExclusionPredicate" excludedWorkingSets="//@setupTasks.11/@workingSets.1 //@setupTasks.11/@workingSets.4 //@setupTasks.11/@workingSets.3"/>
+ <operands xsi:type="predicates:OrPredicate">
+ <operands xsi:type="predicates:NamePredicate" pattern=".*view.*"/>
+ <operands xsi:type="predicates:NamePredicate" pattern=".*ecp.edit"/>
+ <operands xsi:type="predicates:NamePredicate" pattern=".*ecp.edit.swt*"/>
+ <operands xsi:type="predicates:NamePredicate" pattern=".*ecp.common*"/>
+ </operands>
+ </predicates>
+ </workingSets>
+ <workingSets name="ECP Releng" id="CDO Net4j DB">
+ <predicates xsi:type="predicates:OrPredicate">
+ <operands xsi:type="predicates:NamePredicate" pattern=".*releng.*"/>
+ <operands xsi:type="predicates:NamePredicate" pattern=".*feature"/>
+ </predicates>
+ </workingSets>
+ <workingSets name="ECP IDE">
+ <predicates xsi:type="predicates:AndPredicate">
+ <operands xsi:type="predicates:NamePredicate" pattern=".*ide.*"/>
+ <operands xsi:type="workingsets:ExclusionPredicate" excludedWorkingSets="//@setupTasks.11/@workingSets.1 //@setupTasks.11/@workingSets.3"/>
+ <operands xsi:type="predicates:NotPredicate">
+ <operand xsi:type="predicates:NamePredicate" pattern=".*provider.*"/>
+ </operands>
+ </predicates>
+ </workingSets>
+ <workingSets name="ECP RAP">
+ <predicates xsi:type="predicates:NamePredicate" pattern=".*rap.*"/>
+ </workingSets>
+ <workingSets name="ECP DiffMerge">
+ <predicates xsi:type="predicates:NamePredicate" pattern=".*diffmerge.*"/>
+ </workingSets>
+ </setupTasks>
+ <setupTasks xsi:type="setup:MylynQueriesTask" repositoryURL="https://bugs.eclipse.org/bugs">
+ <queries summary="Open Bugs in current Milestone ${ecp.bugzilla.milestone}" url="https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=VERIFIED&classification=Modeling&component=Common&component=Editor&component=EMF%20Forms&component=Model%20Workspace&component=Navigator&component=Validation&list_id=8330574&product=ECP&query_format=advanced&target_milestone=${ecp.bugzilla.milestone}"/>
+ <queries summary="Resolved Bugs in current Milestone ${ecp.bugzilla.milestone}" url="https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=CLOSED&classification=Modeling&component=Common&component=Editor&component=EMF%20Forms&component=Model%20Workspace&component=Navigator&component=Validation&list_id=8330692&product=ECP&query_format=advanced&target_milestone=${ecp.bugzilla.milestone}"/>
+ <queries summary="Backlog" url="https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&classification=Modeling&component=Common&component=Editor&component=EMF%20Forms&component=Model%20Workspace&component=Navigator&component=Validation&list_id=8330721&product=ECP&query_format=advanced&target_milestone=backlog"/>
+ <queries summary="Open Bugs in next Milestone ${ecp.bugzilla.nextmilestone}" url="https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=VERIFIED&classification=Modeling&component=Common&component=Editor&component=EMF%20Forms&component=Model%20Workspace&component=Navigator&component=Validation&list_id=8330574&product=ECP&query_format=advanced&target_milestone=${ecp.bugzilla.nextmilestone}"/>
+ </setupTasks>
+ <branches name="develop">
+ <setupTasks xsi:type="setup:ContextVariableTask" name="ecp.git.branch" value="develop" stringSubstitution="true"/>
+ <setupTasks xsi:type="setup:ContextVariableTask" name="ecp.baseline.version" value="1.2" stringSubstitution="true"/>
+ <setupTasks xsi:type="setup:ContextVariableTask" name="ecp.bugzilla.milestone" value="1.2" stringSubstitution="true" label=""/>
+ <setupTasks xsi:type="setup:ContextVariableTask" name="ecp.bugzilla.nextmilestone" value="1.3" stringSubstitution="true" label=""/>
+ </branches>
+ <branches name="master">
+ <setupTasks xsi:type="setup:ContextVariableTask" name="ecp.git.branch" value="master" stringSubstitution="true"/>
+ <setupTasks xsi:type="setup:ContextVariableTask" name="ecp.baseline.version" value="1.1" stringSubstitution="true"/>
+ <setupTasks xsi:type="setup:ContextVariableTask" name="ecp.bugzilla.milestone" value="1.2" stringSubstitution="true" label=""/>
+ <setupTasks xsi:type="setup:ContextVariableTask" name="ecp.bugzilla.nextmilestone" value="1.3" stringSubstitution="true" label=""/>
+ </branches>
+</setup:Project>
