diff options
author | Eike Stepper | 2013-07-28 06:46:14 +0000 |
---|---|---|
committer | Eike Stepper | 2013-07-28 06:46:14 +0000 |
commit | 90807b2dffb1bd8850fdf39c8ec436da7782104c (patch) | |
tree | 1c5036668688e9494957a3668d282e2fdd199ae7 | |
parent | 8cc8e58ce9e5091813224e1903fb700329b0c66a (diff) | |
download | cdo-90807b2dffb1bd8850fdf39c8ec436da7782104c.tar.gz cdo-90807b2dffb1bd8850fdf39c8ec436da7782104c.tar.xz cdo-90807b2dffb1bd8850fdf39c8ec436da7782104c.zip |
Adjust build for maintenance
13 files changed, 216 insertions, 131 deletions
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 50c599ef08..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 @@ -5,5 +5,4 @@ encoding/buckminster.cspex=UTF-8 encoding/build.cquery=UTF-8 encoding/build.mspec=UTF-8 encoding/build.rmap=UTF-8 -encoding/cdo.target=UTF-8 encoding/local.mspec=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex index 94822b598a..7090445cb9 100644 --- a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex +++ b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex @@ -36,7 +36,7 @@ <cs:dependency name="org.dom4j" componentType="eclipse.feature"/> <cs:dependency name="javax.persistence" componentType="eclipse.feature"/> <cs:dependency name="javax.annotation" componentType="osgi.bundle"/> - <cs:dependency name="oracle.database.driver.jdk50" componentType="osgi.bundle"/> + <cs:dependency name="oracle.database.driver" componentType="osgi.bundle"/> </cs:dependencies> <cs:actions> diff --git a/plugins/org.eclipse.emf.cdo.releng/build.cquery b/plugins/org.eclipse.emf.cdo.releng/build.cquery index e3e24e2ee8..75e06900f5 100644 --- a/plugins/org.eclipse.emf.cdo.releng/build.cquery +++ b/plugins/org.eclipse.emf.cdo.releng/build.cquery @@ -16,8 +16,5 @@ <!-- For unknown reasons source 1.0.4 gets included for 1.1.1 --> <cq:advisorNode namePattern="org\.apache\.commons\.logging\.source" skipComponent="true"/> - <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> diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap index 9c2d0241ad..d59dd58b53 100644 --- a/plugins/org.eclipse.emf.cdo.releng/build.rmap +++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap @@ -8,14 +8,13 @@ <rm:property mutable="true" key="emf.version" value="2.9-I-builds"/> <rm:property mutable="true" key="orbit.version" value="R20130517111416"/> - <rm:property mutable="true" key="git.clone" value="${user.home}/git/cdo"/> - <rm:property mutable="true" key="build.type" value="N"/> - <!-- Locators --> <rm:locator searchPathRef="git" pattern="^org\.eclipse\.emf\.cdo(?:\..+)?$"/> <rm:locator searchPathRef="git" pattern="^org\.eclipse\.net4j(?:\..+)?$"/> <rm:locator searchPathRef="git" pattern="^org\.gastro(?:\..+)?$"/> + <rm:locator searchPathRef="p2pool" failOnError="false"/> + <rm:locator searchPathRef="junit4" pattern="^org\.junit4$"/> <rm:locator searchPathRef="p2"/> <!-- Search Paths --> @@ -37,6 +36,21 @@ </rm:provider> </rm:searchPath> + <rm:searchPath name="p2pool"> + <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:uri format="file:/{0}"> + <bc:propertyRef key="p2.pool"/> + </rm:uri> + </rm:provider> + </rm:searchPath> + + <rm:searchPath name="junit4"> + <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:uri format="http://download.eclipse.org/eclipse/updates/3.8"> + </rm:uri> + </rm:provider> + </rm:searchPath> + <rm:searchPath name="p2"> <!-- PLATFORM --> @@ -53,19 +67,24 @@ </rm:uri> </rm:provider> - <!-- EMF Transaction, Validation, ... --> + <!-- EMF Transaction --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/modeling/emf/updates/milestones"/> + <rm:uri format="http://download.eclipse.org/modeling/emf/transaction/updates/releases"/> + </rm:provider> + + <!-- EMF Validation --> + <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:uri format="http://download.eclipse.org/modeling/emf/validation/updates/releases"/> </rm:provider> <!-- EMF Compare --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/modeling/emf/compare/updates/milestones/2.1"/> + <rm:uri format="http://download.eclipse.org/modeling/emf/compare/updates/releases/2.1"/> </rm:provider> <!-- MWE --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/modeling/emft/mwe/updates/milestones"/> + <rm:uri format="http://download.eclipse.org/modeling/emft/mwe/updates/releases"/> </rm:provider> <!-- EcoreTools --> @@ -75,37 +94,47 @@ <!-- GEF --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/tools/gef/updates/milestones"/> + <rm:uri format="http://download.eclipse.org/tools/gef/updates/releases"/> </rm:provider> <!-- Graphiti --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/graphiti/updates/milestones"/> + <rm:uri format="http://download.eclipse.org/graphiti/updates/0.10.0"/> + </rm:provider> + + <!-- GMF Notation --> + <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:uri format="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/> + </rm:provider> + + <!-- GMF Runtime --> + <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:uri format="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases"/> </rm:provider> - <!-- GMP --> + <!-- GMF Tooling --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/modeling/gmp/updates/milestones"/> + <rm:uri format="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases"/> </rm:provider> <!-- OCL --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/4.1.0"/> + <rm:uri format="http://download.eclipse.org/modeling/mdt/ocl/updates/releases/4.1.0"/> </rm:provider> <!-- QVTO --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/mmt/qvto/updates/milestones"/> + <rm:uri format="http://download.eclipse.org/mmt/qvto/updates/releases/3.3.0"/> </rm:provider> <!-- UML2 --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/modeling/mdt/uml2/updates/4.0.x"/> + <rm:uri format="http://download.eclipse.org/modeling/mdt/uml2/updates/releases"/> </rm:provider> <!-- XPAND --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones"/> + <rm:uri format="http://download.eclipse.org/modeling/m2t/xpand/updates/releases"/> </rm:provider> <!-- SWTBOT --> @@ -118,17 +147,17 @@ <!-- MYLYN --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/mylyn/snapshots/kepler"/> + <rm:uri format="http://download.eclipse.org/mylyn/releases/latest"/> </rm:provider> <!-- EGIT --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/egit/updates"/> + <rm:uri format="http://download.eclipse.org/egit/updates-3.0"/> </rm:provider> <!-- BUCKMINSTER --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/tools/buckminster/headless-4.2"/> + <rm:uri format="http://download.eclipse.org/tools/buckminster/updates-4.3"/> </rm:provider> <!-- NEBULA --> @@ -150,7 +179,7 @@ <!-- ORACLE.COM --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.oracle.com/otn_software/oepe/juno"/> + <rm:uri format="http://download.oracle.com/otn_software/oepe/kepler"/> </rm:provider> <!-- EVLER.ORG --> diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml index f38e3dcb69..36de789e78 100644 --- a/plugins/org.eclipse.emf.cdo.releng/build.xml +++ b/plugins/org.eclipse.emf.cdo.releng/build.xml @@ -57,11 +57,16 @@ <sysproperties /> </properties> <args> - <jvmarg value="-Xmx4096m" /> + <jvmarg value="-XX:MaxPermSize=256M" /> + <jvmarg value="-Xmx4g" /> <jvmarg value="-Dsite.pack200=${site.signing}" /> + <jvmarg value="-Dsite.retain.unpacked=true" /> + <jvmarg value="-Dorg.eclipse.update.jarprocessor.pack200=/shared/common/jdk-1.5.0-22.x86_64/bin" /> + <jvmarg value="-Declipse.p2.MD5Check=false" /> <jvmarg value="-Declipse.p2.mirrors=false" /> <jvmarg value="-Declipse.p2.unsignedPolicy=allow" /> <jvmarg value="-Dgit.clone=${git.clone}" /> + <jvmarg value="-Dp2.pool=none" /> <arg value="-data" /> <arg value="@{workspace}" /> <arg value="--loglevel" /> @@ -77,7 +82,7 @@ </sequential> </macrodef> - <macrodef name="generate.product"> + <macrodef name="generate.product.platform"> <attribute name="id" /> <attribute name="profile" /> <attribute name="platform" /> @@ -100,17 +105,22 @@ <eclipse.launch app="director"> <properties> + <sysproperty key="org.eclipse.update.jarprocessor.pack200" + value="/shared/common/jdk-1.5.0-22.x86_64/bin" /> <sysproperty key="eclipse.p2.mirrors" value="false" /> + <sysproperty key="eclipse.p2.MD5Check" value="false" /> </properties> <args> <arg value="-r" /> <arg value="file:${hudson.WORKSPACE}" /> <arg value="-r" /> - <arg value="${train.releases}" /> + <arg value="http://download.eclipse.org/releases/${train}" /> + <arg value="-r" /> + <arg value="http://download.eclipse.org/releases/${train.previous}" /> <arg value="-r" /> - <arg value="${eclipse.updates}" /> + <arg value="http://download.eclipse.org/eclipse/updates/${eclipse}" /> <arg value="-r" /> - <arg value="${eclipse.milestones}" /> + <arg value="http://download.eclipse.org/eclipse/updates/${eclipse}-I-builds" /> <arg value="-d" /> <arg value="${temp.products}/@{profile}-@{platform}" /> <arg value="-p" /> @@ -154,6 +164,35 @@ </sequential> </macrodef> + <macrodef name="generate.product"> + <attribute name="id" /> + <attribute name="profile" /> + <attribute name="priority" /> + <sequential> + <generate.product.platform id="@{id}" + profile="@{profile}" + platform="Windows" + os="win32" + ws="win32" + arch="x86_64" + priority="@{priority}50" /> + <generate.product.platform id="@{id}" + profile="@{profile}" + platform="Linux" + os="linux" + ws="gtk" + arch="x86_64" + priority="@{priority}40" /> + <generate.product.platform id="@{id}" + profile="@{profile}" + platform="Mac" + os="macosx" + ws="cocoa" + arch="x86_64" + priority="@{priority}30" /> + </sequential> + </macrodef> + <!-- =============== --> <!-- Init Properties --> <!-- =============== --> @@ -235,7 +274,8 @@ suffix=".zip" property="director.zip" deleteonexit="true" /> - <get src="${director}" dest="${director.zip}" /> + <get src="http://download.eclipse.org/tools/buckminster/products/director_latest.zip" + dest="${director.zip}" /> <mkdir dir="${tools}" /> <unzip src="${director.zip}" dest="${tools}" /> <delete file="${director.zip}" /> @@ -251,11 +291,14 @@ <echo message="Installing buckminster" /> <eclipse.launch app="director"> <properties> + <sysproperty key="org.eclipse.update.jarprocessor.pack200" + value="/shared/common/jdk-1.5.0-22.x86_64/bin" /> <sysproperty key="eclipse.p2.mirrors" value="false" /> + <sysproperty key="eclipse.p2.MD5Check" value="false" /> </properties> <args> <arg value="-r" /> - <arg value="${buckminster.headless}" /> + <arg value="http://download.eclipse.org/tools/buckminster/headless-4.3" /> <arg value="-r" /> <arg value="http://download.eclipse.org/eclipse/updates/3.8" /> <arg value="-r" /> @@ -307,6 +350,8 @@ <loadresource property="build.trigger"> <propertyresource name="action.cause.shortDescription" /> <filterchain> + <replaceregex pattern="^Triggered by " replace="" /> + <replaceregex pattern="^Gerrit: .*" replace="gerrit" /> <replaceregex pattern="^Started by " replace="" /> <replaceregex pattern="^Gestartet durch " replace="" /> <replaceregex pattern="Benutzer" replace="user" /> @@ -314,6 +359,9 @@ </loadresource> </then> </if> + <condition property="gerrit.trigger" value="true"> + <equals arg1="${build.trigger}" arg2="gerrit" /> + </condition> <echo message="build.trigger = ${build.trigger}" /> <if> @@ -431,11 +479,15 @@ <echo message="Importing projects into ${ws}" /> <echo message="Importing binaries into ${tp}" /> <mkdir dir="${tp}" /> + <move file="${releng}/hudson/target.xml" tofile="${releng}/hudson/cdo.target" /> + <move file="${releng}/hudson/api_baseline.xml" tofile="${releng}/hudson/api_baseline.target" /> + <buckminster command="setpref"> <cmdargs> <arg value="maxParallelResolutions=1" /> </cmdargs> </buckminster> + <buckminster command="import"> <cmdargs> <arg value="-B" /> @@ -484,31 +536,39 @@ <!-- ======= --> <target name="site.p2" depends="build" description="Generates the site and depending artifacts"> - <echo message="Performing org.eclipse.emf.cdo.site#site.p2" /> - <buckminster command="perform"> - <cmdargs> - <arg value="org.eclipse.emf.cdo.site#site.p2" /> - </cmdargs> - </buckminster> - - <pathconvert property="site.p2.dir"> - <dirset dir="${buckminster.output.root}"> - <filename name="org.eclipse.emf.cdo.site_*-eclipse.feature/site.p2" /> - </dirset> - </pathconvert> - <echoproperties destfile="${result}/all.properties" /> - - <copy todir="${hudson.WORKSPACE}" - overwrite="true" - includeemptydirs="true" - preservelastmodified="true" - failonerror="true"> - <fileset dir="${site.p2.dir}"> - <include name="**" /> - </fileset> - </copy> - - <antcall target="-generate.all" /> + <if> + <isset property="gerrit.trigger" /> + <then> + <echo message="Skipping org.eclipse.emf.cdo.site#site.p2" /> + </then> + <else> + <echo message="Performing org.eclipse.emf.cdo.site#site.p2" /> + <buckminster command="perform"> + <cmdargs> + <arg value="org.eclipse.emf.cdo.site#site.p2" /> + </cmdargs> + </buckminster> + + <pathconvert property="site.p2.dir"> + <dirset dir="${buckminster.output.root}"> + <filename name="org.eclipse.emf.cdo.site_*-eclipse.feature/site.p2" /> + </dirset> + </pathconvert> + <echoproperties destfile="${result}/all.properties" /> + + <copy todir="${hudson.WORKSPACE}" + overwrite="true" + includeemptydirs="true" + preservelastmodified="true" + failonerror="true"> + <fileset dir="${site.p2.dir}"> + <include name="**" /> + </fileset> + </copy> + + <antcall target="-generate.all" /> + </else> + </if> </target> <!-- ==== --> @@ -516,11 +576,16 @@ <!-- ==== --> <target name="test" depends="site.p2" description="Runs the tests"> - <echo message="Running JUnit tests" /> + <condition property="launch.config" + value="org.eclipse.emf.cdo.tests.all/CDO GerritTests" + else="org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 ALL)"> + <isset property="gerrit.trigger" /> + </condition> + <echo message="Running ${launch.config}" /> <buckminster command="junit"> <cmdargs> <arg value="-l" /> - <arg value="org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 ALL).launch" /> + <arg value="${launch.config}.launch" /> <arg value="-o" /> <arg value="${test.report}" /> <arg value="--terseXML" /> @@ -529,16 +594,6 @@ </buckminster> </target> - <!-- ============= --> - <!-- Generate Only --> - <!-- ============= --> - - <target name="generate.only" depends="-init.properties" description="Runs the post-site.p2 generators"> - <echo message="Loading build-info.xml" /> - <xmlproperty file="${hudson.WORKSPACE}/build-info.xml" collapseAttributes="true" /> - <antcall target="-generate.all" /> - </target> - <!-- ============ --> <!-- Generate All --> <!-- ============ --> @@ -677,6 +732,7 @@ <arg value="org.eclipse.emf.cdo.releng#generate.api.reports" /> </cmdargs> </buckminster> + <echo message="Converting to HTML" /> <java classname="org.eclipse.emf.cdo.releng.Api2Html"> <classpath> <pathelement location="${releng}/bin/" /> @@ -702,53 +758,9 @@ </delete> <mkdir dir="${temp.products}" /> - <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2" - profile="CDOServer" - platform="Windows" - os="win32" - ws="win32" - arch="x86" - priority="450" /> - - <generate.product id="org.eclipse.emf.cdo.explorer.product" - profile="CDOExplorer" - platform="Windows" - os="win32" - ws="win32" - arch="x86" - priority="350" /> - - <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2" - profile="CDOServer" - platform="Linux" - os="linux" - ws="gtk" - arch="x86" - priority="440" /> - - <generate.product id="org.eclipse.emf.cdo.explorer.product" - profile="CDOExplorer" - platform="Linux" - os="linux" - ws="gtk" - arch="x86" - priority="340" /> - - <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2" - profile="CDOServer" - platform="Mac" - os="macosx" - ws="cocoa" - arch="x86" - priority="430" /> - - <generate.product id="org.eclipse.emf.cdo.explorer.product" - profile="CDOExplorer" - platform="Mac" - os="macosx" - ws="cocoa" - arch="x86" - priority="330" /> + <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2" profile="CDOServer" priority="4" /> + <generate.product id="org.eclipse.emf.cdo.explorer.product" profile="CDOExplorer" priority="3" /> + <generate.product id="org.eclipse.emf.cdo.releng.setup.product.ide" profile="Setup" priority="2" /> </target> </project> diff --git a/plugins/org.eclipse.emf.cdo.releng/cdo.target b/plugins/org.eclipse.emf.cdo.releng/cdo.target deleted file mode 100644 index b8b9e277ab..0000000000 --- a/plugins/org.eclipse.emf.cdo.releng/cdo.target +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="CDO Target" sequenceNumber="99"> -<locations> -<location path="${workspace_loc}\.buckminster\tp" type="Directory"/> -<location path="/develop/bin/extensions/db2/eclipse" type="Directory"/> -</locations> -<environment> -<os>win32</os> -<ws>win32</ws> -<arch>x86_64</arch> -<nl>de_DE</nl> -</environment> -<launcherArgs> -<vmArgs>-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m</vmArgs> -</launcherArgs> -</target> diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/api_baseline.target b/plugins/org.eclipse.emf.cdo.releng/hudson/api_baseline.xml index cc38a2e9b0..cc38a2e9b0 100644 --- a/plugins/org.eclipse.emf.cdo.releng/hudson/api_baseline.target +++ b/plugins/org.eclipse.emf.cdo.releng/hudson/api_baseline.xml diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/target.xml b/plugins/org.eclipse.emf.cdo.releng/hudson/target.xml new file mode 100644 index 0000000000..44c270916d --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng/hudson/target.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.8"?> +<target name="CDO Target" sequenceNumber="0"> + <locations> + <location path="${workspace_loc}/../tp" type="Directory"/> + </locations> +</target> diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip b/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip Binary files differindex 8406045003..cccba0b932 100644 --- a/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip +++ b/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip.old b/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip.old Binary files differnew file mode 100644 index 0000000000..8406045003 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip.old 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 index e605bfdc12..0e700c7217 100644 --- 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 @@ -179,6 +179,7 @@ public class GenerateExampleBuilders try { out = new FileWriter(file); + @SuppressWarnings("resource") BufferedWriter writer = new BufferedWriter(out); writer.write(content); diff --git a/plugins/org.eclipse.emf.cdo.tests.all/CDO GerritTests.launch b/plugins/org.eclipse.emf.cdo.tests.all/CDO GerritTests.launch new file mode 100644 index 0000000000..b54e1e62b7 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.all/CDO GerritTests.launch @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.jdt.junit.launchconfig"> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.all.GerritTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.all"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Dorg.eclipse.net4j.util.om.trace.disable=true -Dorg.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.disableServerBrowser=true"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java b/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java new file mode 100644 index 0000000000..e2fc7e5800 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2010-2013 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 + * Stefan Winkler - introduced variable mapping strategies + */ +package org.eclipse.emf.cdo.tests.all; + +import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation; +import org.eclipse.emf.cdo.tests.db.DBConfigs; +import org.eclipse.emf.cdo.tests.db.H2Config; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author Eike Stepper + */ +public class GerritTests extends DBConfigs +{ + public static Test suite() + { + return new GerritTests().getTestSuite(); + } + + @Override + protected void initConfigSuites(TestSuite parent) + { + addScenario(parent, COMBINED, new H2Config(true, true, true, false, IDGenerationLocation.STORE), JVM, NATIVE); + } +} |