Attachment 119102 Details for Bug 251402 – remove SDO and obsolete templateGen folder

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] remove SDO and obsolete templateGen folder

clipboard.txt (text/plain), 69.12 KB, created by Nick Boldt

on 2008-11-30 19:27:23 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Boldt

Created: 2008-11-30 19:27:23 EST

Size: 69.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.releng_HEAD
>Index: builder/tests/scripts/runtests.bat
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/builder/tests/scripts/runtests.bat,v
>retrieving revision 1.2
>diff -u -r1.2 runtests.bat
>--- builder/tests/scripts/runtests.bat	22 Apr 2004 07:09:46 -0000	1.2
>+++ builder/tests/scripts/runtests.bat	1 Dec 2008 00:24:37 -0000
>@@ -36,7 +36,7 @@
> REM ****************************************************************
> 
> unzip -qq -o eclipse-SDK*.zip
>-unzip -qq -o -C emf-sdo-xsd-JUnit-Tests*.zip */plugins/org.eclipse.test*
>+unzip -qq -o -C emf-xsd-JUnit-Tests*.zip */plugins/org.eclipse.test*
> 
> 
> :processcmdlineargs
>Index: builder/tests/scripts/test.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/builder/tests/scripts/test.xml,v
>retrieving revision 1.53
>diff -u -r1.53 test.xml
>--- builder/tests/scripts/test.xml	26 Mar 2008 01:22:06 -0000	1.53
>+++ builder/tests/scripts/test.xml	1 Dec 2008 00:24:38 -0000
>@@ -32,9 +32,9 @@
> 
> 		<unzip dest="${install}" overwrite="true"><fileset dir="${downloadsDir}"><include name="**/${eclipseFile}.zip"/></fileset></unzip>
> 		<untar compression="gzip" dest="${install}" overwrite="true"><fileset dir="${downloadsDir}"><include name="**/${eclipseFile}.tar.gz"/></fileset></untar>
>-		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-sdo-xsd-SDK-*.zip"/></fileset></unzip>
>-		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-sdo-xsd-Examples-*.zip"/></fileset></unzip>
>-		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-sdo-xsd-JUnit-Tests-*.zip"/></fileset></unzip>
>+		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-xsd-SDK-*.zip"/></fileset></unzip>
>+		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-xsd-Examples-*.zip"/></fileset></unzip>
>+		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-xsd-JUnit-Tests-*.zip"/></fileset></unzip>
> 
> 		<echo message="install: ${install}, dropins: ${install}/eclipse/dropins"/>
> 	 <echo message="eclipse-home: ${eclipse-home}, dropins-eclipse-home: ${eclipse-home}/dropins/eclipse"/>
>@@ -55,7 +55,7 @@
> 		<echo message="Done: [${runtests-endtime}]"/>
> 	</target>
> 
>-	<target name="emf-sdo-xsd" description="Runs the test.xml of the test plugins">
>+	<target name="emf-xsd" description="Runs the test.xml of the test plugins">
> 		<antcall target="runtests">
> 			<param name="testPlugin" value="${org.eclipse.emf.test.build}" />
> 			<param name="report" value="org.eclipse.emf.test.build" />
>@@ -72,11 +72,6 @@
> 		</antcall>
> 
> 		<antcall target="runtests">
>-			<param name="testPlugin" value="${org.eclipse.emf.test.sdo}" />
>-			<param name="report" value="org.eclipse.emf.test.sdo" />
>-		</antcall>
>-
>-		<antcall target="runtests">
> 			<param name="testPlugin" value="${org.eclipse.emf.test.tools}" />
> 			<param name="report" value="org.eclipse.emf.test.tools" />
> 		</antcall>
>@@ -93,7 +88,7 @@
> 	</target>
> 
> 	<target name="all">
>-		<antcall target="emf-sdo-xsd" />
>+		<antcall target="emf-xsd" />
> 		<antcall target="genHtml" />
> 	</target>
> 
>Index: builder/tests/scripts/readme.html
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/builder/tests/scripts/readme.html,v
>retrieving revision 1.8
>diff -u -r1.8 readme.html
>--- builder/tests/scripts/readme.html	22 Jan 2008 21:59:21 -0000	1.8
>+++ builder/tests/scripts/readme.html	1 Dec 2008 00:24:37 -0000
>@@ -29,11 +29,11 @@
> 3. The Automated Test feature from a
> <a href="http|//download.eclipse.org/tools/emf/downloads/"> EMF downloads</a>.
> This contains the test framework plugins and the JUnit test plugins to run. 
>- 4. The emf-runtime, sdo-runtime and xsd-runtime zip files from the same build as the Automated Test feature. You can use the emf-sdo-xsd-SDK zip file instead of the individual files. 
>+ 4. The emf-runtime and xsd-runtime zip files from the same build as the Automated Test feature. You can use the emf-xsd-SDK zip file instead of the individual files. 
> 5. An Eclipse SDK zip file. The URL and build name of the required builds
> are specified in the build.cfg file included in the Automated Test zip file.
> Setup
>-1. Extract the emf-sdo-xsd-Automated-Tests-&lt;buildid&gt;.zip. On Window, extract
>+1. Extract the emf-xsd-Automated-Tests-&lt;buildid&gt;.zip. On Window, extract
> this file close to the root of the drive to prevent some path names from exceeding
> the 255 character limit. This will create a top-level directory &quot;testing&quot;. 
> 2. Place the Eclipse SDK zip file and the EMF, SDO and XSD runtimes in the testing directory.
>@@ -104,7 +104,7 @@
> <td>Runs all the targets below.</td>
> </tr>
> <tr>
>- <td>emf-sdo-xsd</td>
>+ <td>emf-xsd</td>
> <td>Runs the JUnit tests located in the test plug-ins</td>
> </tr>
> <tr>
>Index: templateFiles/testManifest.xml.template
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/templateFiles/testManifest.xml.template,v
>retrieving revision 1.17
>diff -u -r1.17 testManifest.xml.template
>--- templateFiles/testManifest.xml.template	22 Jan 2008 21:59:21 -0000	1.17
>+++ templateFiles/testManifest.xml.template	1 Dec 2008 00:24:40 -0000
>@@ -15,20 +15,6 @@
> 				fileName='&lt;a href="emf-sourcedoc-@build@.zip"&gt;emf-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="emf-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
>-		<zipType name="sdoruntime">
>-			<platform 
>-				id="SDORUN" 
>-				name="All" 
>-				fileName='&lt;a href="sdo-runtime-@build@.zip"&gt;sdo-runtime-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@sdo-runtime-@build@.zip.size@ - checksum:&lt;a href="sdo-runtime-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>-			</platform>
>-		</zipType>
>-		<zipType name="sdosrc">
>-			<platform 
>-				id="SDOSRC" 
>-				name="All" 
>-				fileName='&lt;a href="sdo-sourcedoc-@build@.zip"&gt;sdo-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@sdo-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="sdo-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>-			</platform>
>-		</zipType>
> 		<zipType name="xsdruntime">
> 			<platform 
> 				id="XSDRUN" 
>@@ -47,28 +33,28 @@
> 			<platform 
> 				id="SDK" 
> 				name="All" 
>-				fileName='&lt;a href="emf-sdo-xsd-SDK-@build@.zip"&gt;emf-sdo-xsd-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-SDK-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>+				fileName='&lt;a href="emf-xsd-SDK-@build@.zip"&gt;emf-xsd-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-SDK-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
> 		<zipType name="alltests">
> 			<platform 
> 				id="T" 
> 				name="All" 
>-				fileName='&lt;a href="emf-sdo-xsd-Automated-Tests-@build@.zip"&gt;emf-sdo-xsd-Automated-Tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Automated-Tests-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>+				fileName='&lt;a href="emf-xsd-Automated-Tests-@build@.zip"&gt;emf-xsd-Automated-Tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Automated-Tests-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
> 		<zipType name="allexamples">
> 			<platform 
> 				id="EX" 
> 				name="All" 
>-				fileName='&lt;a href="emf-sdo-xsd-Examples-@build@.zip"&gt;emf-sdo-xsd-Examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Examples-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>+				fileName='&lt;a href="emf-xsd-Examples-@build@.zip"&gt;emf-xsd-Examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Examples-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
> 		<zipType name="allModels">
> 			<platform 
> 				id="AM" 
> 				name="All" 
>-				fileName='&lt;a href="emf-sdo-xsd-Models-@build@.zip"&gt;emf-sdo-xsd-Models-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Models-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Models-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>+				fileName='&lt;a href="emf-xsd-Models-@build@.zip"&gt;emf-xsd-Models-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Models-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Models-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
> 	</zipTypes>
>@@ -108,12 +94,6 @@
> 			<effectedFile id="XSDRUN"></effectedFile>
> 		</logFile>
> 
>-		<logFile name="org.eclipse.emf.test.sdo_linux.gtk.xml">
>-			<effectedFile id="SDK"></effectedFile>
>-			<effectedFile id="EMFSRC"></effectedFile>
>-			<effectedFile id="EMFRUN"></effectedFile>
>-		</logFile>
>-
> 		<logFile name="org.eclipse.emf.test.examples_linux.gtk.xml">
> 			<effectedFile id="SDK"></effectedFile>
> 			<effectedFile id="EMFSRC"></effectedFile>
>Index: builder/zips/build.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/builder/zips/build.xml,v
>retrieving revision 1.20
>diff -u -r1.20 build.xml
>--- builder/zips/build.xml	9 Aug 2008 16:25:21 -0000	1.20
>+++ builder/zips/build.xml	1 Dec 2008 00:24:38 -0000
>@@ -12,7 +12,7 @@
> <property name="rootDir" value="emf" />
> 
> <target name="models">
>- <property name="modelsZip" value="${outputDir}/emf-sdo-xsd-Models-${buildAlias}.zip" />
>+ <property name="modelsZip" value="${outputDir}/emf-xsd-Models-${buildAlias}.zip" />
> <property name="modelsBaseDir" value="${rootDir}/models" />
> <property name="modelsWorkingDir" value="${pluginsDir}/temp.dir.models" />
> 
>@@ -38,7 +38,6 @@
> <copyModels pluginDir="org.eclipse.emf.codegen.ecore" />
> <copyModels pluginDir="org.eclipse.emf.ecore" />
> <copyModels pluginDir="org.eclipse.emf.ecore.change" />
>- <copyModels pluginDir="org.eclipse.emf.ecore.sdo" />
> <copyModels pluginDir="org.eclipse.emf.edit" />
> <copyModels pluginDir="org.eclipse.emf.mapping" />
> <copyModels pluginDir="org.eclipse.emf.mapping.ecore2ecore" />
>Index: scripts/runJDK14Tests.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/runJDK14Tests.sh,v
>retrieving revision 1.6
>diff -u -r1.6 runJDK14Tests.sh
>--- scripts/runJDK14Tests.sh	4 Apr 2008 14:49:11 -0000	1.6
>+++ scripts/runJDK14Tests.sh	1 Dec 2008 00:24:39 -0000
>@@ -5,7 +5,7 @@
> #X# -downloadsDir /home/www-data/build/downloads \
> #X# -testDir /home/www-data/jdk14tests/2.0.1/N200409162018/200409171711 \
> #X# -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
>-#X# -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-sdo-xsd-SDK-N200409162018.zip \
>+#X# -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-xsd-SDK-N200409162018.zip \
> #X# -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt 
> 
> export ANT=/opt/apache-ant-1.6/bin/ant
>@@ -63,7 +63,7 @@
> 	echo " -downloadsDir /home/www-data/build/downloads \\"
> 	echo " -testDir /home/www-data/jdk14tests/2.0.1/R200409171617/200409221449 \\"
> 	echo " -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161125/eclipse-SDK-3.0.1-linux-gtk.zip \\"
>-	echo " -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-sdo-xsd-SDK-2.0.1.zip \\"
>+	echo " -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-xsd-SDK-2.0.1.zip \\"
> 	echo " -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
> 	exit 1
> fi
>@@ -298,7 +298,7 @@
> echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
> unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
> 
>-emfTestFile="$testDir/tests/emf-sdo-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
>+emfTestFile="$testDir/tests/emf-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
> echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
> unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
> 
>@@ -317,7 +317,7 @@
> }
> 
> # for org.eclipse.emf.test.* ...
>-for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
>+for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
> 	getTestFolder $pluginSuf;
> 	if [ "x$testFolder" != "x" ]; then
> 		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
>@@ -333,7 +333,7 @@
> echo "clean up ..."
> rm -fr $testDir/tests/eclipse
> 
>-for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
>+for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
> 	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
> 		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
> 		#echo "[jdk] unzip test.$pluginSuf.jar ..."
>Index: scripts/runJDK50Tests.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/runJDK50Tests.sh,v
>retrieving revision 1.11
>diff -u -r1.11 runJDK50Tests.sh
>--- scripts/runJDK50Tests.sh	26 Aug 2008 03:31:33 -0000	1.11
>+++ scripts/runJDK50Tests.sh	1 Dec 2008 00:24:39 -0000
>@@ -5,7 +5,7 @@
> #X# -downloadsDir /home/www-data/build/downloads \
> #X# -testDir /home/www-data/jdk50tests/2.0.1/N200409162018/200409171711 \
> #X# -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
>-#X# -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-sdo-xsd-SDK-N200409162018.zip \
>+#X# -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-xsd-SDK-N200409162018.zip \
> #X# -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt
> 
> ver=5;
>@@ -63,7 +63,7 @@
> 	echo " -downloadsDir /home/www-data/build/downloads \\"
> 	echo " -testDir /home/www-data/jdk${ver}0tests/2.0.1/R200409171617/200409221349 \\"
> 	echo " -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161129/eclipse-SDK-3.0.1-linux-gtk.zip \\"
>-	echo " -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-sdo-xsd-SDK-2.0.1.zip \\"
>+	echo " -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-xsd-SDK-2.0.1.zip \\"
> 	echo " -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
> 	exit 1
> fi
>@@ -288,7 +288,7 @@
> echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
> unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
> 
>-emfTestFile="$testDir/tests/emf-sdo-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
>+emfTestFile="$testDir/tests/emf-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
> echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
> unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
> 
>@@ -303,7 +303,7 @@
> }
> 
> # for org.eclipse.emf.test.* ...
>-for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
>+for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
> 	getTestFolder $pluginSuf;
> 	if [ "x$testFolder" != "x" ]; then
> 		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
>@@ -319,7 +319,7 @@
> echo "clean up ..."
> rm -fr $testDir/tests/eclipse
> 
>-for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
>+for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
> 	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
> 		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
> 		#echo "[jdk] unzip test.$pluginSuf.jar ..."
>@@ -338,7 +338,7 @@
> export PLUGINS_DIR=$ECLIPSE_DIR/plugins
> 
> # check to see what JDK was used for the actual build
>-#eg., for emfFile=/home/www-data/build/emf/tools/emf/downloads/drops/2.3.0/N200612201119/emf-sdo-SDK-N200612201119.zip
>+#eg., for emfFile=/home/www-data/build/emf/tools/emf/downloads/drops/2.3.0/N200612201119/emf-SDK-N200612201119.zip
> buildJava=$(grep "javaHome=" ${emfFile%/*}/build.cfg | tail -1); buildJava=${buildJava#*=}; # echo $buildJava
> 
> if [[ ${version:0:3} == 2.2 ]]; then # a 2.2 build
>Index: scripts/promoteToEclipse.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/promoteToEclipse.sh,v
>retrieving revision 1.62
>diff -u -r1.62 promoteToEclipse.sh
>--- scripts/promoteToEclipse.sh	16 Jul 2008 20:19:11 -0000	1.62
>+++ scripts/promoteToEclipse.sh	1 Dec 2008 00:24:38 -0000
>@@ -662,14 +662,14 @@
> 
> 	# find dependencyURLs from $buildDropsDir/$branch/$buildID/buildlog.txt
> 	# http://download.eclipse.org/downloads/drops/M20060609-1217/eclipse-SDK-M20060609-1217-linux-gtk.tar.gz
>-	# http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.0/I200606150000/emf-sdo-xsd-SDK-I200606150000.zip
>+	# http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.0/I200606150000/emf-xsd-SDK-I200606150000.zip
> 	dependencyURLs="";
> 	for dep in `head -50 $buildDropsDir/$branch/$buildID/buildlog.txt | grep "\-URL" | sed -e "s/^[^hf]\\+//g" -e "s/fullmoon\..\\+\.ibm\.com/download.eclipse.org/g" | sort | uniq`; do 
> 		if [ "x$dependencyURLs" != "x" ]; then dependencyURLs="$dependencyURLs,"; fi # join with commas
> 		dependencyURLs=$dependencyURLs"$dep";
> 		if [[ $debug -gt 0 ]]; then echo "[promote] Using URL = $dep"; fi			
> 	done
>-	# http://download.eclipse.org/downloads/drops/M20060609-1217/eclipse-SDK-M20060609-1217-linux-gtk.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.0/I200606150000/emf-sdo-xsd-SDK-I200606150000.zip
>+	# http://download.eclipse.org/downloads/drops/M20060609-1217/eclipse-SDK-M20060609-1217-linux-gtk.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.0/I200606150000/emf-xsd-SDK-I200606150000.zip
> 	
> 	export JAVA_HOME=/opt/sun-java2-5.0;
> 	export ANT_HOME=/opt/apache-ant-1.6;
>@@ -805,7 +805,7 @@
> if [[ $subprojectName == "emf" ]]; then
> 	i=0;
> 	while [[ $i -lt ${#cvsModulesArray[@]} ]]; do
>- 		# projects[]=cvssrc/projectName-subprojectNamespace (cvssrc/emf-org.eclipse.emf.ecore.sdo) or
>+ 		# projects[]=cvssrc/projectName-subprojectNamespace (cvssrc/mdt-org.eclipse.xsd) or
> 		# projects[]=cvssrc_branches/projectName-subprojectNamespace-cvsbranch (cvssrc_branches/mdt-org.eclipse.xsd-R2_2_maintenance)
> 		if [[ $cvsbranch = "HEAD" ]]; then
> 		parsecvsCmd=$parsecvsCmd"projects%5B%5D=cvssrc%2F"${cvsModulesArray[$i]}"&";
>@@ -890,12 +890,6 @@
> 		
> 	# EMF Special Case -- EMF + SDO + XSD
> 	if [ "$subprojectName" = "emf" ]; then 
>-		relnotesURL="http://build.eclipse.org/modeling/emf/news/relnotes.php?project=sdo&version="$relnotesver"&bugzonly&strict";
>-		echo -n "[promote] Check $relnotesURL ... ";
>-		bugList2=$(curl "$relnotesURL" 2>&1 | egrep "[0-9]{5,6}"); echo -n " found "${bugList2%;*}" bugs: "; bugList2=${bugList2#*;}; echo $bugList2; 
>-		if [[ ! $bugList ]]; then bugList=$bugList2; else bugList=$bugList","$bugList2; fi
>-		bugList2="";
>-		
> 		relnotesURL="http://build.eclipse.org/modeling/mdt/news/relnotes.php?project=xsd&version="$relnotesver"&bugzonly&strict";
> 		echo -n "[promote] Check $relnotesURL ... ";
> 		bugList2=$(curl "$relnotesURL" 2>&1 | egrep "[0-9]{5,6}"); echo -n " found "${bugList2%;*}" bugs: "; bugList2=${bugList2#*;}; echo $bugList2; 
>Index: scripts/runJDK60Tests.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/runJDK60Tests.xml,v
>retrieving revision 1.4
>diff -u -r1.4 runJDK60Tests.xml
>--- scripts/runJDK60Tests.xml	26 Feb 2008 00:16:07 -0000	1.4
>+++ scripts/runJDK60Tests.xml	1 Dec 2008 00:24:39 -0000
>@@ -179,8 +179,6 @@
> 		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
>-		<buildPlugin pluginid="commonj.sdo" parentid="org.eclipse.emf"/>
>-		<buildPlugin pluginid="ecore.sdo" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
> 	</target>
> 
>Index: scripts/runJDK14Tests.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/runJDK14Tests.xml,v
>retrieving revision 1.1
>diff -u -r1.1 runJDK14Tests.xml
>--- scripts/runJDK14Tests.xml	13 Jul 2007 05:54:06 -0000	1.1
>+++ scripts/runJDK14Tests.xml	1 Dec 2008 00:24:39 -0000
>@@ -162,8 +162,6 @@
> 		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>		
> 		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
>-		<buildPlugin pluginid="commonj.sdo" parentid="org.eclipse.emf"/>
>-		<buildPlugin pluginid="ecore.sdo" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
> 	</target>
> 	
>@@ -272,7 +270,6 @@
> 		</macrodef>
> 		<runTest testclass="org.eclipse.emf.test.core.AllSuites" testPlugin="org.eclipse.emf.test.core"/>
> 		<runTest testclass="org.eclipse.emf.test.edit.AllSuites" testPlugin="org.eclipse.emf.test.edit"/>
>-		<runTest testclass="org.eclipse.emf.test.sdo.AllSuites" testPlugin="org.eclipse.emf.test.sdo"/>
> 		<runTest testclass="org.eclipse.emf.test.xml.AllSuites" testPlugin="org.eclipse.emf.test.xml"/>
> 	</target>
> </project>
>\ No newline at end of file
>Index: scripts/runJDK50Tests.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/runJDK50Tests.xml,v
>retrieving revision 1.4
>diff -u -r1.4 runJDK50Tests.xml
>--- scripts/runJDK50Tests.xml	26 Feb 2008 00:16:07 -0000	1.4
>+++ scripts/runJDK50Tests.xml	1 Dec 2008 00:24:39 -0000
>@@ -179,8 +179,6 @@
> 		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
>-		<buildPlugin pluginid="commonj.sdo" parentid="org.eclipse.emf"/>
>-		<buildPlugin pluginid="ecore.sdo" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
> 	</target>
> 
>Index: scripts/runJDK13Tests.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/runJDK13Tests.sh,v
>retrieving revision 1.6
>diff -u -r1.6 runJDK13Tests.sh
>--- scripts/runJDK13Tests.sh	4 Apr 2008 14:49:11 -0000	1.6
>+++ scripts/runJDK13Tests.sh	1 Dec 2008 00:24:38 -0000
>@@ -8,7 +8,7 @@
> #X# -downloadsDir /home/www-data/build/downloads \
> #X# -testDir /home/www-data/jdk13tests/2.0.1/N200409162018/200409171711 \
> #X# -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
>-#X# -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-sdo-xsd-SDK-N200409162018.zip \
>+#X# -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-xsd-SDK-N200409162018.zip \
> #X# -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt 
> 
> echo [jdk] runJDK13Tests.sh started on: `date +%Y%m%d\ %k\:%M\:%S`
>@@ -53,7 +53,7 @@
> 	echo " -downloadsDir /home/www-data/build/downloads \\"
> 	echo " -testDir /home/www-data/jdk13tests/2.0.1/R200409171617/200409221349 \\"
> 	echo " -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161125/eclipse-SDK-3.0.1-linux-gtk.zip \\"
>-	echo " -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-sdo-xsd-SDK-2.0.1.zip \\"
>+	echo " -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-xsd-SDK-2.0.1.zip \\"
> 	echo " -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
> 	exit 1
> fi
>@@ -255,7 +255,7 @@
> echo "[jdk] unzip Automated-Tests*.zip ... "
> unzip -uoj $quietZip $emfTestFile -d $testDir/tests ; 
> 
>-emfTestFile="$testDir/tests/emf-sdo-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
>+emfTestFile="$testDir/tests/emf-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
> echo "[jdk] unzip JUnit-Tests*.zip ... "
> unzip -uo $quietZip $emfTestFile -d $testDir/tests ; 
> 
>@@ -270,7 +270,7 @@
> }
> 
> # for org.eclipse.emf.test.* ... 
>-for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
>+for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
> 	getTestFolder $pluginSuf; 
> 	if [ "x$testFolder" != "x" ]; then
> 		echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
>@@ -286,7 +286,7 @@
> echo "clean up ..."
> rm -fr $testDir/tests/eclipse
> 
>-for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
>+for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
> 	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
> 		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
> 		echo "[jdk] unzip test.$pluginSuf.jar ..."
>Index: scripts/runJDK13Tests.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/runJDK13Tests.xml,v
>retrieving revision 1.1
>diff -u -r1.1 runJDK13Tests.xml
>--- scripts/runJDK13Tests.xml	13 Jul 2007 05:54:07 -0000	1.1
>+++ scripts/runJDK13Tests.xml	1 Dec 2008 00:24:38 -0000
>@@ -148,8 +148,6 @@
> 		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
>-		<buildPlugin pluginid="commonj.sdo" parentid="org.eclipse.emf"/>
>-		<buildPlugin pluginid="ecore.sdo" parentid="org.eclipse.emf"/>
> 		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
> 	</target>
> 
>Index: scripts/adjustCVS.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/adjustCVS.sh,v
>retrieving revision 1.29
>diff -u -r1.29 adjustCVS.sh
>--- scripts/adjustCVS.sh	15 Sep 2008 21:37:28 -0000	1.29
>+++ scripts/adjustCVS.sh	1 Dec 2008 00:24:38 -0000
>@@ -182,7 +182,7 @@
> 	
> if [ $tagBuild != 'false' ]; then
> 	command="cvs -q rtag -r $branchCVS $buildTag"; # rtag sources
>-	command=$command" org.eclipse.emf/org.eclipse.emf org.eclipse.emf/org.eclipse.emf.ecore.sdo org.eclipse.mdt/org.eclipse.xsd"
>+	command=$command" org.eclipse.emf/org.eclipse.emf org.eclipse.mdt/org.eclipse.xsd"
> 	$baseDir/scripts/executeCommand.sh "$command"
> fi
> 
>@@ -266,7 +266,6 @@
> 
> # regenerate all feature.xml files
> $baseDir/scripts/genFeatureSDK.sh -repoInfoFile $repoInfoFile -baseProject org.eclipse.emf -baseFeatureID org.eclipse.emf
>-$baseDir/scripts/genFeatureSDK.sh -repoInfoFile $repoInfoFile -baseProject org.eclipse.emf -baseFeatureID org.eclipse.emf.ecore.sdo
> $baseDir/scripts/genFeatureSDK.sh -repoInfoFile $repoInfoFile -baseProject org.eclipse.mdt -baseFeatureID org.eclipse.xsd
> 
> # Checking in and tagging the files
>Index: scripts/NLpacks2nlzip.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/NLpacks2nlzip.sh,v
>retrieving revision 1.1
>diff -u -r1.1 NLpacks2nlzip.sh
>--- scripts/NLpacks2nlzip.sh	15 Dec 2006 21:58:54 -0000	1.1
>+++ scripts/NLpacks2nlzip.sh	1 Dec 2008 00:24:38 -0000
>@@ -6,7 +6,6 @@
> # nl.zip!/emf.ecore/org/eclipse/emf/ecore/plugin/plugin_fr.properties
> # nl.zip!/emf.ecore.change.edit/org/eclipse/emf/ecore/change/provider/plugin_fr.properties
> # nl.zip!/emf.ecore.edit/org/eclipse/emf/ecore/provider/plugin_fr.properties
>-# nl.zip!/emf.ecore.sdo.edit/org/eclipse/emf/ecore/sdo/provider/plugin_fr.properties
> # nl.zip!/emf.edit/org/eclipse/emf/edit/plugin_fr.properties
> # nl.zip!/xsd/org/eclipse/xsd/plugin_fr.properties
> # nl.zip!/xsd.edit/org/eclipse/xsd/provider/plugin_fr.properties
>@@ -68,7 +67,6 @@
> "org.eclipse.emf.ecore.nl"
> "org.eclipse.emf.ecore.change.edit.nl"
> "org.eclipse.emf.ecore.edit.nl"
>-"org.eclipse.emf.ecore.sdo.edit.nl" 
> "org.eclipse.emf.edit.nl"
> 
> "org.eclipse.xsd.nl"
>@@ -83,7 +81,6 @@
> "emf.ecore/org/eclipse/emf/ecore/plugin/"
> "emf.ecore.change.edit/org/eclipse/emf/ecore/change/provider/"
> "emf.ecore.edit/org/eclipse/emf/ecore/provider/"
>-"emf.ecore.sdo.edit/org/eclipse/emf/ecore/sdo/provider/"
> "emf.edit/org/eclipse/emf/edit/"
> 
> "xsd/org/eclipse/xsd/"
>Index: scripts/createMapAndTestManifestFile.pl
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/createMapAndTestManifestFile.pl,v
>retrieving revision 1.14
>diff -u -r1.14 createMapAndTestManifestFile.pl
>--- scripts/createMapAndTestManifestFile.pl	13 Jul 2007 05:54:06 -0000	1.14
>+++ scripts/createMapAndTestManifestFile.pl	1 Dec 2008 00:24:38 -0000
>@@ -72,9 +72,6 @@
> 	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/examples/*";
> 	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/tests/*";
> 	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/doc/*";
>-	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/*";
>-	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/*";
>-	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf.ecore.sdo/doc/*";
> 	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/features/*";
> 	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/plugins/*";
> 	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/doc/*";
>Index: scripts/purgeCVSTag.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/purgeCVSTag.sh,v
>retrieving revision 1.3
>diff -u -r1.3 purgeCVSTag.sh
>--- scripts/purgeCVSTag.sh	16 Jul 2008 20:19:07 -0000	1.3
>+++ scripts/purgeCVSTag.sh	1 Dec 2008 00:24:38 -0000
>@@ -10,7 +10,7 @@
> delete=0;
> user=$USER;
> proj="emf"
>-modules="org.eclipse.emf/org.eclipse.emf org.eclipse.emf/org.eclipse.emf.ecore.sdo org.eclipse.emf/org.eclipse.emf.releng org.eclipse.mdt/org.eclipse.xsd";
>+modules="org.eclipse.emf/org.eclipse.emf org.eclipse.emf/org.eclipse.emf.releng org.eclipse.mdt/org.eclipse.xsd";
> 
> if [ $# -lt 1 ]; then
> 	echo " "
>Index: scripts/start.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/start.sh,v
>retrieving revision 1.31
>diff -u -r1.31 start.sh
>--- scripts/start.sh	30 Jul 2008 00:08:34 -0000	1.31
>+++ scripts/start.sh	1 Dec 2008 00:24:39 -0000
>@@ -429,7 +429,7 @@
> if [[ $depsFile != "" ]]; then
> 	if [[ -f $depsFile ]]; then
> 		depNum=$(cat $depsFile | grep "$subprojectName=" | tail -1); depNum=${depNum%%$subprojectName=*};
>-		SDKURL=$(find $buildDir -maxdepth 1 -name "emf-sdo-xsd-SDK-*.zip" | tail -1);
>+		SDKURL=$(find $buildDir -maxdepth 1 -name "emf-xsd-SDK-*.zip" | tail -1);
> 		if [[ $SDKURL != "" ]]; then 
> 			SDKURL=${SDKURL##$buildDir}; SDKURL=${SDKURL##*/}; 
> 			SDKURL=http://$hostname/modeling/$projectName/$subprojectName/downloads/drops/$version/$buildType$buildTimestamp/$SDKURL; 
>@@ -508,7 +508,7 @@
> 	 -downloadsDir /home/www-data/build/downloads \
> 	 -testDir $testPath/$runJDK13Tests/$buildType$buildTimestamp/$testTimestamp \
> 	 -eclipseURL $dependURL \
>-	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDK13Tests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
>+	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDK13Tests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
> 	 -email $email \
> 	 >> $testPath/$runJDK13Tests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
> 	echo "[start] about to run the following:";
>@@ -542,14 +542,14 @@
> 	fi
> 
> 	# can't comment code within a string-block... removed to here.
>-	#	 -emfURL http://emf.torolab.ibm.com/modeling/emf/downloads/drops/$runJDK14Tests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
>+	#	 -emfURL http://emf.torolab.ibm.com/modeling/emf/downloads/drops/$runJDK14Tests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
> 
> 	cmd="/bin/bash -c ' \
> 	 exec /usr/bin/nohup /usr/bin/setsid /home/www-data/build/emf/scripts/runJDK14Tests.sh \
> 	 -downloadsDir /home/www-data/build/downloads \
> 	 -testDir $testPath/$runJDK14Tests/$buildType$buildTimestamp/$testTimestamp \
> 	 -eclipseURL $dependURL \
>-	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDK14Tests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
>+	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDK14Tests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
> 	 -email $email \
> 	 >> $testPath/$runJDK14Tests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
> 	echo "[start] about to run the following:";
>@@ -586,7 +586,7 @@
> 	fi
> 
> 	# can't comment code within a string-block... removed to here.
>-	#	 -emfURL http://emf.torolab.ibm.com/modeling/emf/downloads/drops/$runJDK50Tests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
>+	#	 -emfURL http://emf.torolab.ibm.com/modeling/emf/downloads/drops/$runJDK50Tests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
> 	# -compilerArgSource 1.5 \
> 	# -compilerArgXlint all \
> 
>@@ -595,7 +595,7 @@
> 	 -downloadsDir /home/www-data/build/downloads \
> 	 -testDir $testPath/$runJDKTestsID/$buildType$buildTimestamp/$testTimestamp \
> 	 -eclipseURL $dependURL \
>-	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDKTestsID/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
>+	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDKTestsID/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
> 	 -email $email \
> 	 >> $testPath/$runJDKTestsID/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
> 	echo "[start] about to run the following:";
>@@ -637,7 +637,7 @@
> 	 -downloadsDir /home/www-data/build/downloads \
> 	 -testDir $testPath/$runOldTests/$buildType$buildTimestamp/$testTimestamp \
> 	 -eclipseURL $dependURL \
>-	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runOldTests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
>+	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runOldTests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
> 	 -emfOldTestsBranch $emfOldTestsBranch \
> 	 -email $email \
> 	 >> $testPath/$runOldTests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
>Index: scripts/promoteToEclipse.emf.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/promoteToEclipse.emf.properties,v
>retrieving revision 1.26
>diff -u -r1.26 promoteToEclipse.emf.properties
>--- scripts/promoteToEclipse.emf.properties	14 Oct 2008 15:20:47 -0000	1.26
>+++ scripts/promoteToEclipse.emf.properties	1 Dec 2008 00:24:38 -0000
>@@ -7,12 +7,12 @@
> projectNameVanity=`echo $subprojectName | tr "a-z" "A-Z"`; # or something else manually assigned
> 
> # used to determine the actual name of the SDK zip (when builds are aliased)
>-SDKfilenamepattern="emf-sdo-xsd-SDK-*.zip"
>+SDKfilenamepattern="emf-xsd-SDK-*.zip"
> 
> # used for updating Search CVS database, eg: 
>-# http://build.eclipse.org/modeling/build/updateSearchCVS.php?projects%5B%5D=cvssrc%2Femf-org.eclipse.emf&projects%5B%5D=cvssrc%2Femf-org.eclipse.emf.ecore.sdo&projects%5B%5D=cvssrc2Femf-org.eclipse.xsd
>-# http://build.eclipse.org/modeling/build/updateSearchCVS.php?projects%5B%5D=cvssrc_branches%2Femf-org.eclipse.emf-R2_2_maintenance&projects%5B%5D=cvssrc_branches%2Femf-org.eclipse.emf.ecore.sdo-R2_2_maintenance&projects%5B%5D=cvssrc_branches2Femf-org.eclipse.xsd-R2_2_maintenance
>-cvsModulesArray=( "emf-org.eclipse.emf" "emf-org.eclipse.emf.ecore.sdo" "mdt-org.eclipse.xsd" );
>+# http://build.eclipse.org/modeling/build/updateSearchCVS.php?projects%5B%5D=cvssrc%2Femf-org.eclipse.emf&projects%5B%5D=cvssrc2Femf-org.eclipse.xsd
>+# http://build.eclipse.org/modeling/build/updateSearchCVS.php?projects%5B%5D=cvssrc_branches%2Femf-org.eclipse.emf-R2_2_maintenance&projects%5B%5D=cvssrc_branches2Femf-org.eclipse.xsd-R2_2_maintenance
>+cvsModulesArray=( "emf-org.eclipse.emf" "mdt-org.eclipse.xsd" );
> 
> # the following two arrays must be the same size (or else the second one will default to blank)
> javadocModuleArray=( "$projectName-$subprojectName" ); # array, project-subproject, for the name of the zip scp'd to remote, eg. foo-bar-doc.zip
>@@ -141,8 +141,8 @@
> vm=$javaHome/bin/java
> 
> # zips to unpack for UM jar generation
>-filePrefixesToUnzipArray=( "emf-sdo-xsd-Master-" );
>-#filePrefixesToUnzipArray=( "emf-sdo-xsd-SDK-" "emf-sdo-xsd-Examples-" );
>+filePrefixesToUnzipArray=( "emf-xsd-Master-" );
>+#filePrefixesToUnzipArray=( "emf-xsd-SDK-" "emf-xsd-Examples-" );
> 
> # additional (optional) properties for use with update site category generation; must be in quotes 
> updateSiteSDKName="EMF SDK"
>@@ -177,6 +177,6 @@
> coordsiteBranch=HEAD
> 
> # pattern to use when searching for features to include in coordsite; defaults to ".*eclipse/features/org.eclipse..*(${subprojectName}|${subprojectName}.sdk)_.*\/$" 
>-coordsiteFeaturePattern=".*eclipse/features/org.eclipse..*(emf|emf.sdk|xsd|xsd.sdk|emf.ecore.sdo|emf.ecore.sdo.sdk|emf.common|emf.common.ui|emf.ecore|emf.ecore.edit|emf.edit|emf.edit.ui|xsd.edit)_.*\/$"
>+coordsiteFeaturePattern=".*eclipse/features/org.eclipse..*(emf|emf.sdk|xsd|xsd.sdk|emf.common|emf.common.ui|emf.ecore|emf.ecore.edit|emf.edit|emf.edit.ui|xsd.edit)_.*\/$"
> # pattern to use when setting feature to include in coordsite's main feature ('Models and Model Development'); all other matching features will go in 'Enabling Features'
>-coordsiteMainFeaturePattern="org.eclipse.(emf|emf.sdk|xsd|xsd.sdk|emf.ecore.sdo|emf.ecore.sdo.sdk)$"
>+coordsiteMainFeaturePattern="org.eclipse.(emf|emf.sdk|xsd|xsd.sdk)$"
>Index: scripts/runJDK60Tests.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/runJDK60Tests.sh,v
>retrieving revision 1.9
>diff -u -r1.9 runJDK60Tests.sh
>--- scripts/runJDK60Tests.sh	4 Apr 2008 14:49:11 -0000	1.9
>+++ scripts/runJDK60Tests.sh	1 Dec 2008 00:24:39 -0000
>@@ -5,7 +5,7 @@
> #X# -downloadsDir /home/www-data/build/downloads \
> #X# -testDir /home/www-data/jdk60tests/2.0.1/N200409162018/200409171711 \
> #X# -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
>-#X# -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-sdo-xsd-SDK-N200409162018.zip \
>+#X# -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-xsd-SDK-N200409162018.zip \
> #X# -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt
> 
> ver=6;
>@@ -63,7 +63,7 @@
> 	echo " -downloadsDir /home/www-data/build/downloads \\"
> 	echo " -testDir /home/www-data/jdk${ver}0tests/2.0.1/R200409171617/200409221349 \\"
> 	echo " -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161129/eclipse-SDK-3.0.1-linux-gtk.zip \\"
>-	echo " -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-sdo-xsd-SDK-2.0.1.zip \\"
>+	echo " -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-xsd-SDK-2.0.1.zip \\"
> 	echo " -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
> 	exit 1
> fi
>@@ -283,7 +283,7 @@
> echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
> unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
> 
>-emfTestFile="$testDir/tests/emf-sdo-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
>+emfTestFile="$testDir/tests/emf-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
> echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
> unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
> 
>@@ -298,7 +298,7 @@
> }
> 
> # for org.eclipse.emf.test.* ...
>-for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
>+for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
> 	getTestFolder $pluginSuf;
> 	if [ "x$testFolder" != "x" ]; then
> 		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
>@@ -314,7 +314,7 @@
> echo "clean up ..."
> rm -fr $testDir/tests/eclipse
> 
>-for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
>+for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
> 	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
> 		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
> 		#echo "[jdk] unzip test.$pluginSuf.jar ..."
>@@ -333,7 +333,7 @@
> export PLUGINS_DIR=$ECLIPSE_DIR/plugins
> 
> # check to see what JDK was used for the actual build
>-#eg., for emfFile=/home/www-data/build/emf/tools/emf/downloads/drops/2.3.0/N200612201119/emf-sdo-SDK-N200612201119.zip
>+#eg., for emfFile=/home/www-data/build/emf/tools/emf/downloads/drops/2.3.0/N200612201119/emf-SDK-N200612201119.zip
> buildJava=$(grep "javaHome=" ${emfFile%/*}/build.cfg | tail -1); buildJava=${buildJava#*=}; # echo $buildJava
> 
> if [[ true ]]; then
>Index: scripts/doc2jar.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/doc2jar.sh,v
>retrieving revision 1.1
>diff -u -r1.1 doc2jar.sh
>--- scripts/doc2jar.sh	13 Jul 2007 05:54:06 -0000	1.1
>+++ scripts/doc2jar.sh	1 Dec 2008 00:24:38 -0000
>@@ -20,8 +20,8 @@
> 	echo " <REQUIRED: path to SDK zip to unpack> \\"
> 	echo " <OPTIONAL: path to unpack zip - defaults to \".\"> \\"
> 	echo " <OPTIONAL: filter to search - defaults to \"$filter\">"
>-	echo "Example: doc2jar -z ./2.1.2/R200601191349/emf-sdo-xsd-SDK-2.1.2.zip"
>-	echo "Example: doc2jar -z ./2.1.2/R200601191349/emf-sdo-xsd-SDK-2.1.2.zip ~/foo *doc*"
>+	echo "Example: doc2jar -z ./2.1.2/R200601191349/emf-xsd-SDK-2.1.2.zip"
>+	echo "Example: doc2jar -z ./2.1.2/R200601191349/emf-xsd-SDK-2.1.2.zip ~/foo *doc*"
> 	exit;
> fi
> 
>Index: scripts/start_cron.sh
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/scripts/start_cron.sh,v
>retrieving revision 1.18
>diff -u -r1.18 start_cron.sh
>--- scripts/start_cron.sh	16 Jul 2008 20:19:11 -0000	1.18
>+++ scripts/start_cron.sh	1 Dec 2008 00:24:39 -0000
>@@ -4,11 +4,11 @@
> # EMF only
> #00 15 * * 2 sudo -u www-data /home/www-data/build/emf/scripts/start_cron.sh -sub emf -runJDK50Tests -regex "[ISR]200.*/eclipse-SDK-" -basebuilderBranch M1_34 -n -a > $HOME/cron_logs/start_cron.sh.emf.24N.txt 2>&1
> # U/O/QTV N builds: uml2 (20-25), ocl (10-15), query (5-10), validation (7-10), transaction (12-15)
>-#00 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub uml2 -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-sdo-xsd-SDK-" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.uml2.N.txt 2>&1
>-#25 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub ocl -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-sdo-xsd-SDK-|[ISR]200.*/mdt-uml2-SDK|orbit" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.ocl.N.txt 2>&1
>-#40 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub query -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-sdo-xsd-SDK-|[S]200.*mdt-ocl-SDK-" -basebuilderBranch v20071030 -n > $HOME/cron_logs/start_cron.sh.query.N.txt 2>&1
>-#50 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub validation -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*emf-sdo-xsd-SDK-|[S]200.*mdt-ocl-SDK-" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.validation.N.txt 2>&1
>-#00 19 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub transaction -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-sdo-xsd-SDK-|[ISR]200.*/emf-validation-SDK-" -basebuilderBranch v20071030 -nosearchcvs > $HOME/cron_logs/start_cron.sh.transaction.N.txt 2>&1
>+#00 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub uml2 -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-xsd-SDK-" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.uml2.N.txt 2>&1
>+#25 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub ocl -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-xsd-SDK-|[ISR]200.*/mdt-uml2-SDK|orbit" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.ocl.N.txt 2>&1
>+#40 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub query -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-xsd-SDK-|[S]200.*mdt-ocl-SDK-" -basebuilderBranch v20071030 -n > $HOME/cron_logs/start_cron.sh.query.N.txt 2>&1
>+#50 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub validation -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*emf-xsd-SDK-|[S]200.*mdt-ocl-SDK-" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.validation.N.txt 2>&1
>+#00 19 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub transaction -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-xsd-SDK-|[ISR]200.*/emf-validation-SDK-" -basebuilderBranch v20071030 -nosearchcvs > $HOME/cron_logs/start_cron.sh.transaction.N.txt 2>&1
> 
> ###### ###### ###### ###### ###### ###### INSTRUCTIONS & OPTIONS ###### ###### ###### ###### ###### ###### 
> 
>@@ -32,7 +32,7 @@
> 	echo ""
> 	echo -e "-d, -URL <optional: list of ${yellow}type${norm}=${yellow}URL${norm} pairs for hardcoding dependencies, if you want to build with something older than"
> 	echo -e " the latest in the list). Enter one -d [...] per required ${yellow}type${norm}=${yellow}URL${norm} pair, "
>-	echo -e " eg., -d ${yellow}emf${norm}=${yellow}http://archive.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/emf-sdo-xsd-SDK-2.3.0.zip${norm} >"
>+	echo -e " eg., -d ${yellow}emf${norm}=${yellow}http://archive.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/emf-xsd-SDK-2.3.0.zip${norm} >"
> 	echo "-a, -addSDK <optional: if used, add the resulting SDK zip to the dependencies file for use with other builds>"
> 	echo "-l, -listDeps <optional: if used, list the contents of the dependencies file instead of running a build>"
> 	echo ""
>@@ -297,7 +297,7 @@
> 
> 	if [[ $searchCVSModules == "" ]]; then
> 		if [[ $subprojectName == "emf" ]]; then 
>-			searchCVSModules="emf.emf,emf.ecore.sdo,mdt.xsd,emf.releng"; # special case default for EMF
>+			searchCVSModules="emf.emf,mdt.xsd,emf.releng"; # special case default for EMF
> 		else
> 			searchCVSModules=$projectName"."$subprojectName","$projectName"."$subprojectName".releng"; # all others default to proj.sub,proj.sub.releng
> 		fi
>Index: builder/tests/customTargets.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/builder/tests/customTargets.xml,v
>retrieving revision 1.50
>diff -u -r1.50 customTargets.xml
>--- builder/tests/customTargets.xml	23 Apr 2008 21:00:25 -0000	1.50
>+++ builder/tests/customTargets.xml	1 Dec 2008 00:24:37 -0000
>@@ -18,7 +18,7 @@
> 	
> 
> 	<target name="assemble.org.eclipse.emf.tests">
>-		<property name="archiveName" value="emf-sdo-xsd-JUnit-Tests-${buildAlias}.zip" />
>+		<property name="archiveName" value="emf-xsd-JUnit-Tests-${buildAlias}.zip" />
> 		<ant antfile="${assembleScriptName}" />
> 		
> 	</target>
>@@ -193,7 +193,7 @@
> 		<mkdir dir="${workingDirectory}/eclipse/dropins/eclipse/" />
> 		<unzip dest="${workingDirectory}/eclipse/dropins/" overwrite="true">
> 			<fileset dir="${buildDirectory}/${buildLabel}">
>-				<include name="**/emf-sdo-xsd-JUnit-Tests-*.zip" />
>+				<include name="**/emf-xsd-JUnit-Tests-*.zip" />
> 			</fileset>
> 		</unzip>
> 
>@@ -225,7 +225,7 @@
> 		<delete dir="${workingDirectory}/eclipse/dropins/eclipse/plugins/${org.eclipse.test}" includeEmptyDirs="true" />
> 
> 		
>-		<zip destfile="${workingDirectory}/testing/emf-sdo-xsd-JUnit-Tests-${buildAlias}.zip">
>+		<zip destfile="${workingDirectory}/testing/emf-xsd-JUnit-Tests-${buildAlias}.zip">
> 			<zipfileset dir="${workingDirectory}/eclipse/dropins/eclipse" prefix="eclipse" />
> 		</zip>
> 
>@@ -244,12 +244,12 @@
> 		<chmod file="${workingDirectory}/testing/runtests" perm="755" />
> 
> 		
>-		<zip destfile="${buildDirectory}/${buildLabel}/emf-sdo-xsd-Automated-Tests-${buildAlias}.zip">
>+		<zip destfile="${buildDirectory}/${buildLabel}/emf-xsd-Automated-Tests-${buildAlias}.zip">
> 			<zipfileset dir="${workingDirectory}/testing" prefix="testing" />
> 		</zip>
>-		
>+		
> 
>-		<delete file="${buildDirectory}/${buildLabel}/emf-sdo-xsd-JUnit-Tests-${buildAlias}.zip" />
>+		<delete file="${buildDirectory}/${buildLabel}/emf-xsd-JUnit-Tests-${buildAlias}.zip" />
> 	</target>
> 
> 	
>Index: maps/emf.map
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/maps/emf.map,v
>retrieving revision 1.620
>diff -u -r1.620 emf.map
>--- maps/emf.map	25 Nov 2008 23:02:05 -0000	1.620
>+++ maps/emf.map	1 Dec 2008 00:24:38 -0000
>@@ -84,7 +84,6 @@
> plugin@org.eclipse.emf.test.examples=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.examples
> plugin@org.eclipse.emf.test.performance=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.performance
> plugin@org.eclipse.emf.tests=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.tests
>-plugin@org.eclipse.emf.test.sdo=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.sdo
> feature@org.eclipse.emf.tests=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.tests-feature
> plugin@org.eclipse.emf.test.tools=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools
> plugin@org.eclipse.emf.test.xml=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.xml
>@@ -92,16 +91,6 @@
> plugin@org.eclipse.emf.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.doc
> feature@org.eclipse.emf.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.doc-feature
> plugin@org.eclipse.emf.examples.jet.article2=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.examples.jet.article2
>-feature@org.eclipse.emf.ecore.sdo.edit=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/org.eclipse.emf.ecore.sdo.edit-feature
>-feature@org.eclipse.emf.ecore.sdo.editor=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/org.eclipse.emf.ecore.sdo.editor-feature
>-feature@org.eclipse.emf.ecore.sdo=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/org.eclipse.emf.ecore.sdo-feature
>-feature@org.eclipse.emf.ecore.sdo.sdk=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/org.eclipse.emf.ecore.sdo.sdk-feature
>-plugin@org.eclipse.emf.commonj.sdo=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/org.eclipse.emf.commonj.sdo
>-plugin@org.eclipse.emf.ecore.sdo=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/org.eclipse.emf.ecore.sdo
>-plugin@org.eclipse.emf.ecore.sdo.edit=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/org.eclipse.emf.ecore.sdo.edit
>-plugin@org.eclipse.emf.ecore.sdo.editor=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/org.eclipse.emf.ecore.sdo.editor
>-plugin@org.eclipse.emf.ecore.sdo.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/doc/org.eclipse.emf.ecore.sdo.doc
>-feature@org.eclipse.emf.ecore.sdo.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/doc/org.eclipse.emf.ecore.sdo.doc-feature
> feature@org.eclipse.xsd.ecore.converter=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.ecore.converter-feature
> feature@org.eclipse.xsd.edit=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.edit-feature
> feature@org.eclipse.xsd.editor=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.editor-feature
>Index: builder/all/customTargets.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/builder/all/customTargets.xml,v
>retrieving revision 1.14
>diff -u -r1.14 customTargets.xml
>--- builder/all/customTargets.xml	9 May 2008 22:10:12 -0000	1.14
>+++ builder/all/customTargets.xml	1 Dec 2008 00:24:37 -0000
>@@ -18,7 +18,7 @@
> 	
> 
> 	<target name="assemble.org.eclipse.emf.all">
>-		<property name="archiveName" value="emf-sdo-xsd-Master-${buildAlias}.zip" />
>+		<property name="archiveName" value="emf-xsd-Master-${buildAlias}.zip" />
> 		<ant antfile="${assembleScriptName}" />
> 		
> 	</target>
>@@ -182,7 +182,6 @@
> 		<emf.build.ReplaceText verbose="true" beginToken="&lt;!-- TemplateEntriesBegin --&gt;" endToken="&lt;!-- TemplateEntriesEnd --&gt;" replaceText="">
> 			<fileset dir="${featuresDir}">
> 				<include name="org.eclipse.emf.sdk*/feature.xml" />
>-				<include name="org.eclipse.emf.ecore.sdo.sdk*/feature.xml" />
> 				<include name="org.eclipse.xsd.sdk*/feature.xml" />
> 			</fileset>
> 		</emf.build.ReplaceText>
>@@ -217,11 +216,6 @@
> 			</fileset>
> 		</unzip>
> 		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
>-			<fileset dir="${buildDirectory}/features/org.eclipse.emf.ecore.sdo.sdk">
>-				<include name="*.log.zip" />
>-			</fileset>
>-		</unzip>
>-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
> 			<fileset dir="${buildDirectory}/features/org.eclipse.xsd.sdk">
> 				<include name="*.log.zip" />
> 			</fileset>
>Index: builder/tests/configs/local/testing.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/builder/tests/configs/local/testing.properties,v
>retrieving revision 1.63
>diff -u -r1.63 testing.properties
>--- builder/tests/configs/local/testing.properties	25 Feb 2008 20:43:21 -0000	1.63
>+++ builder/tests/configs/local/testing.properties	1 Dec 2008 00:24:37 -0000
>@@ -5,13 +5,13 @@
> testDir=${testBase}/${buildLabel}
> 
> #name of zip file containing automated testing framework and JUnit test plug-ins
>-testFramework=emf-sdo-xsd-Automated-Tests-${buildAlias}.zip
>+testFramework=emf-xsd-Automated-Tests-${buildAlias}.zip
> 
> #directory where test scripts are launched
> executionDir=${testDir}/testing
> 
> #name of runtime to install and test
>-runtime=emf-sdo-xsd-SDK-${buildAlias}.zip
>+runtime=emf-xsd-SDK-${buildAlias}.zip
> 
> # instead of downloading and unpacking the JDK each time, just reuse the symlinked one in /opt/
> vmExecutable=/opt/ibm-java2-5.0/jre/bin/java
>Index: builder/tests/configs/local/customTest.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/builder/tests/configs/local/customTest.xml,v
>retrieving revision 1.23
>diff -u -r1.23 customTest.xml
>--- builder/tests/configs/local/customTest.xml	6 May 2008 23:11:39 -0000	1.23
>+++ builder/tests/configs/local/customTest.xml	1 Dec 2008 00:24:37 -0000
>@@ -4,9 +4,8 @@
> 
> 		<property name="shell" value="relengbuildgtk.sh"/>
> 		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/emf-runtime-${buildAlias}.zip" />
>-		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/sdo-runtime-${buildAlias}.zip" />
> 		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/xsd-runtime-${buildAlias}.zip" />
>-		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/emf-sdo-xsd-Examples-${buildAlias}.zip" />
>+		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/emf-xsd-Examples-${buildAlias}.zip" />
> 	
> 		
> 		<copy file="${tester}/${shell}" todir="${executionDir}"/>
>Index: packager/packaging.map
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/packager/packaging.map,v
>retrieving revision 1.5
>diff -u -r1.5 packaging.map
>--- packager/packaging.map	24 Apr 2008 05:15:45 -0000	1.5
>+++ packager/packaging.map	1 Dec 2008 00:24:38 -0000
>@@ -1,2 +1,2 @@
> @eclipseFile@=file:@downloadsDir@/ | | | sdk | eclipse
>-emf-sdo-xsd-Master-@buildId@.zip=file:@buildDirectoryLabel@/ | | | sdk | emf
>\ No newline at end of file
>+emf-xsd-Master-@buildId@.zip=file:@buildDirectoryLabel@/ | | | sdk | emf
>\ No newline at end of file
>Index: buildAll.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/buildAll.xml,v
>retrieving revision 1.126
>diff -u -r1.126 buildAll.xml
>--- buildAll.xml	7 Jun 2008 01:57:48 -0000	1.126
>+++ buildAll.xml	1 Dec 2008 00:24:37 -0000
>@@ -71,7 +71,7 @@
> 		</condition>
> 
> 		
>-		<property name="masterZip" value="emf-sdo-xsd-Master-${buildAlias}.zip" />
>+		<property name="masterZip" value="emf-xsd-Master-${buildAlias}.zip" />
> 		<property name="java15-home" value="/opt/sun-java2-5.0" />
> 		<property name="stagingHome" value="/home/data/httpd/download-staging.priv" />
> 		<property name="projectPath" value="modeling/emf" />
>@@ -123,7 +123,7 @@
> 		<ant target="packMasterZip" antfile="${helper}" />
> 
> 		
>-		<zip destfile="${buildDirectory}/${buildLabel}/emf-sdo-xsd-SDK-${buildAlias}.zip" update="true" duplicate="preserve">
>+		<zip destfile="${buildDirectory}/${buildLabel}/emf-xsd-SDK-${buildAlias}.zip" update="true" duplicate="preserve">
> 			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
> 				<exclude name="**/org.eclipse.emf.all*" />
> 				<exclude name="**/org.eclipse.emf.all*/**" />
>@@ -161,8 +161,6 @@
> 			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
> 				<exclude name="**/org.eclipse.xsd*" />
> 				<exclude name="**/org.eclipse.xsd*/**" />
>-				<exclude name="**/org.eclipse.emf.*.sdo*" />
>-				<exclude name="**/org.eclipse.emf.*.sdo*/**" />
> 				<exclude name="**/org.eclipse.emf.all*" />
> 				<exclude name="**/org.eclipse.emf.all*/**" />
> 				<exclude name="**/org.eclipse.emf.mapping.xsd*" />
>@@ -187,27 +185,6 @@
> 			<zipfileset refid="rootfiles" />
> 		</zip>
> 
>-		
>-		<zip destfile="${buildDirectory}/${buildLabel}/sdo-sourcedoc-${buildAlias}.zip" update="true" duplicate="preserve">
>-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
>-				<include name="**/*.emf.ecore.sdo.doc_*" />
>-				<include name="**/*.emf.ecore.sdo.doc_*/**" />
>-				<include name="**/*.emf.ecore.sdo.source_*" />
>-				<include name="**/*.emf.ecore.sdo.source_*/**" />
>-			</zipfileset>
>-			<zipfileset refid="rootfiles" />
>-		</zip>
>-
>-		
>-		<property name="RTExcludes" value="**/org.eclipse.*.example*, **/org.eclipse.*.example*/**, **/org.eclipse.*.sdk*, **/org.eclipse.*.sdk*/**, **/org.eclipse.*.all*, **/org.eclipse.*.all*/**, **/org.eclipse.*.doc*, **/org.eclipse.*.doc*/**, **/org.eclipse.*.source*, **/org.eclipse.*.source*/**, **/*src.zip"/>
>-		<zip destfile="${buildDirectory}/${buildLabel}/sdo-runtime-${buildAlias}.zip" update="true" duplicate="preserve">
>-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="${RTExcludes}">
>-				<include name="**/org.eclipse.emf.*.sdo*" />
>-				<include name="**/org.eclipse.emf.*.sdo*/**" />
>-			</zipfileset>
>-			<zipfileset refid="rootfiles" />
>-		</zip>
>-
> 		
> 		<zip destfile="${buildDirectory}/${buildLabel}/xsd-sourcedoc-${buildAlias}.zip" update="true" duplicate="preserve">
> 			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
>@@ -233,7 +210,7 @@
> 		</zip>
> 
> 		
>-		<zip destfile="${buildDirectory}/${buildLabel}/emf-sdo-xsd-Examples-${buildAlias}.zip" update="true" duplicate="preserve">
>+		<zip destfile="${buildDirectory}/${buildLabel}/emf-xsd-Examples-${buildAlias}.zip" update="true" duplicate="preserve">
> 			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
> 				<exclude name="**/plugins/org.eclipse.xsd.example*_*.jar" />
> 				<exclude name="**/org.eclipse.*.example.installer*" />
>@@ -250,7 +227,7 @@
> 			<zipfileset refid="rootfiles" />
> 		</zip>
> 
>-		
>+		
> 		<delete file="${buildDirectory}/${buildLabel}/${allZip}" />
> 
> 		<echo-timestamp />
>Index: testManifest.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/testManifest.xml,v
>retrieving revision 1.33
>diff -u -r1.33 testManifest.xml
>--- testManifest.xml	6 May 2008 00:19:19 -0000	1.33
>+++ testManifest.xml	1 Dec 2008 00:24:37 -0000
>@@ -15,20 +15,6 @@
> 				fileName='&lt;a href="emf-sourcedoc-@build@.zip"&gt;emf-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="emf-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
>-		<zipType name="sdoruntime">
>-			<platform 
>-				id="SDORUN" 
>-				name="All" 
>-				fileName='&lt;a href="sdo-runtime-@build@.zip"&gt;sdo-runtime-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@sdo-runtime-@build@.zip.size@ - checksum:&lt;a href="sdo-runtime-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>-			</platform>
>-		</zipType>
>-		<zipType name="sdosrc">
>-			<platform 
>-				id="SDOSRC" 
>-				name="All" 
>-				fileName='&lt;a href="sdo-sourcedoc-@build@.zip"&gt;sdo-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@sdo-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="sdo-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>-			</platform>
>-		</zipType>
> 		<zipType name="xsdruntime">
> 			<platform 
> 				id="XSDRUN" 
>@@ -47,28 +33,28 @@
> 			<platform 
> 				id="SDK" 
> 				name="All" 
>-				fileName='&lt;a href="emf-sdo-xsd-SDK-@build@.zip"&gt;emf-sdo-xsd-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-SDK-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>+				fileName='&lt;a href="emf-xsd-SDK-@build@.zip"&gt;emf-xsd-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-SDK-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
> 		<zipType name="alltests">
> 			<platform 
> 				id="T" 
> 				name="All" 
>-				fileName='&lt;a href="emf-sdo-xsd-Automated-Tests-@build@.zip"&gt;emf-sdo-xsd-Automated-Tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Automated-Tests-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>+				fileName='&lt;a href="emf-xsd-Automated-Tests-@build@.zip"&gt;emf-xsd-Automated-Tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Automated-Tests-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
> 		<zipType name="allexamples">
> 			<platform 
> 				id="EX" 
> 				name="All" 
>-				fileName='&lt;a href="emf-sdo-xsd-Examples-@build@.zip"&gt;emf-sdo-xsd-Examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Examples-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>+				fileName='&lt;a href="emf-xsd-Examples-@build@.zip"&gt;emf-xsd-Examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Examples-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
> 		<zipType name="allModels">
> 			<platform 
> 				id="AM" 
> 				name="All" 
>-				fileName='&lt;a href="emf-sdo-xsd-Models-@build@.zip"&gt;emf-sdo-xsd-Models-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Models-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Models-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
>+				fileName='&lt;a href="emf-xsd-Models-@build@.zip"&gt;emf-xsd-Models-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Models-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Models-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
> 			</platform>
> 		</zipType>
> 	</zipTypes>
>@@ -108,12 +94,6 @@
> 			<effectedFile id="XSDRUN"></effectedFile>
> 		</logFile>
> 
>-		<logFile name="org.eclipse.emf.test.sdo_linux.gtk.xml">
>-			<effectedFile id="SDK"></effectedFile>
>-			<effectedFile id="EMFSRC"></effectedFile>
>-			<effectedFile id="EMFRUN"></effectedFile>
>-		</logFile>
>-
> 		<logFile name="org.eclipse.emf.test.examples_linux.gtk.xml">
> 			<effectedFile id="SDK"></effectedFile>
> 			<effectedFile id="EMFSRC"></effectedFile>
>@@ -358,9 +338,6 @@
> <logFile name="plugins/org.eclipse.emf.tests_*/*.bin.log">
> <effectedFile id="T"></effectedFile>
> </logFile>
>- <logFile name="plugins/org.eclipse.emf.test.sdo_*/*.bin.log">
>- <effectedFile id="T"></effectedFile>
>- </logFile>
> <logFile name="plugins/org.eclipse.emf.test.tools_*/*.bin.log">
> <effectedFile id="T"></effectedFile>
> </logFile>
>@@ -370,26 +347,6 @@
> <logFile name="plugins/org.eclipse.emf.examples.jet.article2_*/*.bin.log">
> <effectedFile id="EX"></effectedFile>
> </logFile>
>- <logFile name="plugins/org.eclipse.emf.commonj.sdo_*/*.bin.log">
>- <effectedFile id="SDK"></effectedFile>
>- <effectedFile id="EMFRUN"></effectedFile>
>- <effectedFile id="EMFSDK"></effectedFile>
>- </logFile>
>- <logFile name="plugins/org.eclipse.emf.ecore.sdo_*/*.bin.log">
>- <effectedFile id="SDK"></effectedFile>
>- <effectedFile id="EMFRUN"></effectedFile>
>- <effectedFile id="EMFSDK"></effectedFile>
>- </logFile>
>- <logFile name="plugins/org.eclipse.emf.ecore.sdo.edit_*/*.bin.log">
>- <effectedFile id="SDK"></effectedFile>
>- <effectedFile id="EMFRUN"></effectedFile>
>- <effectedFile id="EMFSDK"></effectedFile>
>- </logFile>
>- <logFile name="plugins/org.eclipse.emf.ecore.sdo.editor_*/*.bin.log">
>- <effectedFile id="SDK"></effectedFile>
>- <effectedFile id="EMFRUN"></effectedFile>
>- <effectedFile id="EMFSDK"></effectedFile>
>- </logFile>
> <logFile name="plugins/org.eclipse.emf.mapping.xsd2ecore_*/*.bin.log">
> <effectedFile id="SDK"></effectedFile>
> <effectedFile id="XSDRUN"></effectedFile>
>Index: packager/sdk/customTargets.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/packager/sdk/customTargets.xml,v
>retrieving revision 1.6
>diff -u -r1.6 customTargets.xml
>--- packager/sdk/customTargets.xml	24 Apr 2008 06:11:10 -0000	1.6
>+++ packager/sdk/customTargets.xml	1 Dec 2008 00:24:38 -0000
>@@ -12,7 +12,7 @@
> 	</target>
> 	
> 	
>-	<property name="archiveName" value="emf-sdo-xsd-SDK-${buildId}.zip" />
>+	<property name="archiveName" value="emf-xsd-SDK-${buildId}.zip" />
> 
> 	
>Index: packager/sdk/packager.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.releng/packager/sdk/packager.properties,v
>retrieving revision 1.12
>diff -u -r1.12 packager.properties
>--- packager/sdk/packager.properties	24 Apr 2008 05:15:43 -0000	1.12
>+++ packager/sdk/packager.properties	1 Dec 2008 00:24:38 -0000
>@@ -6,7 +6,7 @@
> filteredDependencyCheck=false
> 
> # A comma separated list of feature ids that will be part of the archive.
>-featureList=org.eclipse.emf.sdk,org.eclipse.emf.ecore.sdo.sdk,org.eclipse.xsd.sdk
>+featureList=org.eclipse.emf.sdk,org.eclipse.xsd.sdk
> 
> # The list of {os, ws, arch} configurations to build. This 
> # value is a '&' separated list of ',' separate triples.

Actions: View | Diff

Attachments on bug 251402: 116724 | 116799 | 119102 | 119103 | 119104