Packaging and branding improvements and fixes.
diff --git a/releng/org.eclipse.amp.releng/build-local-macosx.properties b/releng/org.eclipse.amp.releng/build-local-macosx.properties
deleted file mode 100644
index bf51d32..0000000
--- a/releng/org.eclipse.amp.releng/build-local-macosx.properties
+++ /dev/null
@@ -1,102 +0,0 @@
-## BEGIN PROJECT BUILD PROPERTIES ##

-

-# default settings for all this project's builds, for this branch; see also o.e.d.common.releng/build.properties for more overrideable defaults

-

-# To permit automatic downloads of non-EPL compatible code, set this to property to "I accept"

-thirdPartyDownloadLicenseAcceptance="I accept"

-

-# MUST BE SET #

-projectid=modeling.amp

-zipPrefix=AMP

-incubation=-incubation

-version=0.2.0

-buildType=I

-mainFeatureToBuildID=org.eclipse.amp.axf.feature

-runPackager=true

-individualSourceBundles=true

-flattenDependencies=true

-parallelCompilation=true

-generateFeatureVersionSuffix=true

-allowBinaryCycles = false

-javacSource=1.6

-javacTarget=1.6

-compilerArg=-encoding ISO-8859-1

-

-#	LINUX		#

-#JAVA_HOME=/opt/public/common/ibm-java2-ppc-50

-#JAVA50_HOME=/opt/public/common/ibm-java2-ppc-50

-#dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-linux-gtk-ppc.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-SDK-2.5.0.zip,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/orbit-R20090529135407.zip

-#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

-#build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

-

-#-------------#

-#	Mac OSX	#

-JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

-JAVA50_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

-JAVA50_64_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

-JAVA60_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

-JAVA60_64_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

-JAVA14_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

-JAVADOC_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/bin

-JavaSE-1.6=${JAVA60_HOME}/jre/lib/rt.jar:${JAVA60_HOME}/jre/lib/annotation.jar:${JAVA60_HOME}/jre/lib/beans.jar:${JAVA60_HOME}/jre/lib/ibmorbapi.jar:${JAVA60_HOME}/jre/lib/java.util.jar:${JAVA60_HOME}/jre/lib/jlm.jar:${JAVA60_HOME}/jre/lib/logging.jar:${JAVA60_HOME}/jre/lib/resources.jar:${JAVA60_HOME}/jre/lib/rt.jar:${JAVA60_HOME}/jre/lib/security.jar:${JAVA60_HOME}/jre/lib/sql.jar:${JAVA60_HOME}/jre/lib/vm.jar:${JAVA60_HOME}/jre/lib/xmldsigfw.jar:${JAVA60_HOME}/jre/lib/xml.jar:${JAVA60_HOME}/jre/lib/jsse.jar:${JAVA60_HOME}/lib/dt.jar:${JAVA60_HOME}/lib/ui.jar:${JAVA60_HOME}/../Classes/dt.jar:${JAVA60_HOME}/../Classes/classes.jar:${JAVA60_HOME}/../Classes/jsse.jar

-J2SE-1.5=${JAVA60_HOME}/jre/lib/rt.jar:${JAVA60_HOME}/jre/lib/annotation.jar:${JAVA60_HOME}/jre/lib/beans.jar:${JAVA60_HOME}/jre/lib/ibmorbapi.jar:${JAVA60_HOME}/jre/lib/java.util.jar:${JAVA60_HOME}/jre/lib/jlm.jar:${JAVA60_HOME}/jre/lib/logging.jar:${JAVA60_HOME}/jre/lib/resources.jar:${JAVA60_HOME}/jre/lib/rt.jar:${JAVA60_HOME}/jre/lib/security.jar:${JAVA60_HOME}/jre/lib/sql.jar:${JAVA60_HOME}/jre/lib/vm.jar:${JAVA60_HOME}/jre/lib/xmldsigfw.jar:${JAVA60_HOME}/jre/lib/xml.jar:${JAVA60_HOME}/jre/lib/jsse.jar:${JAVA60_HOME}/lib/dt.jar:${JAVA60_HOME}/lib/ui.jar:${JAVA60_HOME}/../Classes/dt.jar:${JAVA60_HOME}/../Classes/classes.jar:${JAVA60_HOME}/../Classes/jsse.jar

-J2SE-1.4=${JAVA60_HOME}/jre/lib/rt.jar:${JAVA60_HOME}/jre/lib/annotation.jar:${JAVA60_HOME}/jre/lib/beans.jar:${JAVA60_HOME}/jre/lib/ibmorbapi.jar:${JAVA60_HOME}/jre/lib/java.util.jar:${JAVA60_HOME}/jre/lib/jlm.jar:${JAVA60_HOME}/jre/lib/logging.jar:${JAVA60_HOME}/jre/lib/resources.jar:${JAVA60_HOME}/jre/lib/rt.jar:${JAVA60_HOME}/jre/lib/security.jar:${JAVA60_HOME}/jre/lib/sql.jar:${JAVA60_HOME}/jre/lib/vm.jar:${JAVA60_HOME}/jre/lib/xmldsigfw.jar:${JAVA60_HOME}/jre/lib/xml.jar:${JAVA60_HOME}/jre/lib/jsse.jar:${JAVA60_HOME}/lib/dt.jar:${JAVA60_HOME}/lib/ui.jar:${JAVA60_HOME}/../Classes/dt.jar:${JAVA60_HOME}/../Classes/classes.jar:${JAVA60_HOME}/../Classes/jsse.jar

-#J2SE-1.5=${JAVA50_HOME}/jre/lib/rt.jar:${JAVA50_HOME}/jre/lib/vm.jar:${JAVA50_HOME}/jre/lib/core.jar:${JAVA50_HOME}/jre/lib/xml.jar:${JAVA50_HOME}/jre/lib/graphics.jar:${JAVA50_HOME}/jre/lib/server.jar:${JAVA50_HOME}/jre/lib/ibmorbapi.jar:${JAVA50_HOME}/jre/lib/security.jar:${JAVA50_HOME}/jre/lib/classes.jar:${JAVA50_HOME}/jre/lib/jsse.jar:${JAVA50_HOME}/../Classes/dt.jar:${JAVA50_HOME}/../Classes/classes.jar:${JAVA50_HOME}/../Classes/jsse.jar

-#J2SE-1.4=${JAVA14_HOME}/lib/rt.jar:${JAVA14_HOME}/jre/lib/rt.jar:${JAVA14_HOME}/jre/lib/core.jar:${JAVA14_HOME}/jre/lib/xml.jar:${JAVA14_HOME}/jre/lib/graphics.jar:${JAVA14_HOME}/jre/lib/server.jar:${JAVA14_HOME}/jre/lib/ibmorbapi.jar:${JAVA14_HOME}/jre/lib/security.jar:${JAVA14_HOME}/jre/lib/classes.jar:${JAVA14_HOME}/jre/lib/jsse.jar:${JAVA14_HOME}/../Classes/dt.jar:${JAVA14_HOME}/../Classes/classes.jar:${JAVA14_HOME}/../Classes/jsse.jar

-#JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

-#JAVA_CLASSES=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes

-#Java-All=${JAVA_CLASSES}/classes.jar:${JAVA_CLASSES}/ui.jar:${JAVA_CLASSES}/charsets.jar:${JAVA_CLASSES}/dt.jar:${JAVA_CLASSES}/jce.jar:${JAVA_CLASSES}/jconsole.jar:${JAVA_CLASSES}/jsse.jar:${JAVA_CLASSES}/laf.jar

-#JavaSE-1.6=${Java-All}

-#J2SE-1.5=${Java-All}

-#J2SE-1.4=${Java-All}

-configs=macosx, cocoa, x86_6

-dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/S-3.5.1RC1-200908070800/eclipse-SDK-3.5.1RC1-macosx-cocoa-x86_64.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-SDK-2.5.0.zip,http://download.eclipse.org/tools/gef/downloads/drops/3.5.0/R200906221200/GEF-ALL-3.5.0.zip,ftp://mirror.csclub.uwaterloo.ca/eclipse/birt/downloads/drops/R-R1-2_5_0-200906180630/birt-report-framework-2_5_0.zip,http://lwjgl.org/update/plugins/org.lwjgl_2.1.0.jar,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.jdom_1.0.0.v200806100616.jar,http://download.eclipse.org/modeling/tmf/xtext/downloads/drops/0.7.2/R200908120607/tmf-xtext-SDK-incubation-0.7.2.zip,http://download.eclipse.org/modeling/emft/mwe/downloads/drops/0.7.2/S200908101326/emft-mwe-SDK-incubation-0.7.2RC1.zip,http://download.eclipse.org/modeling/emf/compare/downloads/drops/1.0.0/R200906220949/emft-compare-runtime-incubation-1.0.0.zip,http://download.eclipse.org/modeling/m2t/xpand/downloads/drops/0.7.2/S200908101418/m2t-xpand-SDK-incubation-0.7.2RC1.zip,http://download.eclipse.org/modeling/mdt/uml2/downloads/drops/3.0.0/R200906151558/mdt-uml2-SDK-3.0.0.zip,http://download.eclipse.org/datatools/downloads/1.7/dtp_1.7.0.zip,http://download.eclipse.org/tools/gef/downloads/drops/3.5.0/R200906221200/GEF-ALL-3.5.0.zip,http://download.eclipse.org/webtools/downloads/drops/R3.1/R-3.1-20090616035105/wtp-R-3.1-20090616035105.zip

-#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

-#build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

-build.steps=buildUpdate,cleanup

-#-------------#

-

-

-#	Mac OSX	#

-#JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

-#JAVA50_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

-#dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-macosx-cocoa.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-SDK-2.5.0.zip,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/orbit-R20090529135407.zip

-#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

-#build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

-#-------------#

-

-#	WINDOWS	#

-#JAVA_HOME=c:/Java/sun/jre1.5.0_13

-#JAVA50_HOME=c:/Java/sun/jre1.5.0_13

-#dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-win32.zip,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-SDK-2.5.0.zip,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-Examples-2.5.0.zip,http://download.eclipse.org/modeling/mdt/ocl/downloads/drops/1.3.0/R200906151742/mdt-ocl-runtime-1.3.0.zip

-#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

-#build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,cleanup

-#-------------#

-

-

-

-

-#################################################################################################################

-

-#TODO: [269290] make javadokken work.

-#javadocEnabled=true

-#JAVADOC14_HOME=/opt/public/common/ibm-java2-ppc-50/bin

-

-# TODO: are these still required/used?

-#projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools

-projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling

-projRelengPath=org.eclipse.amp/releng/org.eclipse.amp.releng

-basebuilderBranch=R35_RC4
-

-# TODO: not used yet

-# define regex patterns to use when automatically selecting zips from a directory or list file

-#dependencyRegexFilter=R3_4_maintenance:M200.*/eclipse-SDK-|R-.*200.*/eclipse-SDK-

-

-# TODO: not used yet

-# could be file://, http://, cvs path, or relative path?

-#mapLocation=maps/

-

-# TODO: implement use of packager.map for defining deps?

-# TODO: could be relative, absolute (local), or http/ftp paths to archives when defining dependencyURLs above

-

-## END PROJECT BUILD PROPERTIES ##

diff --git a/releng/org.eclipse.amp.releng/build.properties b/releng/org.eclipse.amp.releng/build.properties
index 024d9a2..13fa48a 100755
--- a/releng/org.eclipse.amp.releng/build.properties
+++ b/releng/org.eclipse.amp.releng/build.properties
@@ -1,39 +1,95 @@
-## BEGIN PROJECT BUILD PROPERTIES ##
-
-# default settings for all this project's builds, for this branch; see also o.e.d.common.releng/build.properties for more overrideable defaults
-
-# To permit automatic downloads of non-EPL compatible code, set this to property to "I accept"
-#thirdPartyDownloadLicenseAcceptance="I accept"
-
-# MUST BE SET #
-projectid=modeling.amp
-zipPrefix=AMP
-incubation=-incubation
-version=0.2.0
-buildType=I
-mainFeatureToBuildID=org.eclipse.amp.axf.feature
-testFeatureToBuildID=org.eclipse.amp.test
-
-downloadsDir=/Users/milesparker/Downloads
-
-#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup
-build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup
-
-compilerArg=-enableJavadoc -encoding ISO-8859-1
-flattenDependencies=true
-parallelCompilation=true
-generateFeatureVersionSuffix=true
-#individualSourceBundles=true
-
-#################################################################################################################
-
-#TODO: [269290] make javadokken work.
-#javadocEnabled=true
-#JAVADOC14_HOME=/opt/public/common/ibm-java2-ppc-50/bin
-
-# TODO: are these still required/used?
-#projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
-projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling
-projRelengPath=org.eclipse.amp/releng/org.eclipse.amp.releng
+## BEGIN PROJECT BUILD PROPERTIES ##

+downloadsDir=/Users/milesparker/Downloads

+

+writableBuildRoot=/Volumes/Resources/Developer/builds

+

+# default settings for all this project's builds, for this branch; see also o.e.d.common.releng/build.properties for more overrideable defaults

+

+# To permit automatic downloads of non-EPL compatible code, set this to property to "I accept"

+thirdPartyDownloadLicenseAcceptance="I accept"

+

+# MUST BE SET #

+projectid=modeling.amp

+zipPrefix=AMP

+incubation=-incubation

+version=0.2.0

+buildType=I

+mainFeatureToBuildID=org.eclipse.amp.all.feature

+runPackager=true

+individualSourceBundles=true

+flattenDependencies=true

+parallelCompilation=true

+generateFeatureVersionSuffix=true

+allowBinaryCycles = false

+javacSource=1.5

+javacTarget=1.5

+compilerArg=-enableJavadoc -encoding ISO-8859-1

+skipSign=true

+

+#-------------#

+#	Mac OSX	#

+JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

+JAVA50_HOME=${JAVA_HOME}

+JAVA50_64_HOME=${JAVA_HOME}

+JAVA60_HOME=${JAVA_HOME}

+JAVA60_64_HOME=${JAVA_HOME}

+JAVA14_HOME=${JAVA_HOME}

+JAVADOC_HOME=${JAVA_HOME}/bin

+#J2SE-1.5=${JAVA50_HOME}/jre/lib/rt.jar:${JAVA50_HOME}/jre/lib/vm.jar:${JAVA50_HOME}/jre/lib/core.jar:${JAVA50_HOME}/jre/lib/xml.jar:${JAVA50_HOME}/jre/lib/graphics.jar:${JAVA50_HOME}/jre/lib/server.jar:${JAVA50_HOME}/jre/lib/ibmorbapi.jar:${JAVA50_HOME}/jre/lib/security.jar:${JAVA50_HOME}/jre/lib/classes.jar:${JAVA50_HOME}/jre/lib/jsse.jar:${JAVA50_HOME}/../Classes/dt.jar:${JAVA50_HOME}/../Classes/classes.jar:${JAVA50_HOME}/../Classes/jsse.jar

+#J2SE-1.4=${JAVA14_HOME}/lib/rt.jar:${JAVA14_HOME}/jre/lib/rt.jar:${JAVA14_HOME}/jre/lib/core.jar:${JAVA14_HOME}/jre/lib/xml.jar:${JAVA14_HOME}/jre/lib/graphics.jar:${JAVA14_HOME}/jre/lib/server.jar:${JAVA14_HOME}/jre/lib/ibmorbapi.jar:${JAVA14_HOME}/jre/lib/security.jar:${JAVA14_HOME}/jre/lib/classes.jar:${JAVA14_HOME}/jre/lib/jsse.jar:${JAVA14_HOME}/../Classes/dt.jar:${JAVA14_HOME}/../Classes/classes.jar:${JAVA14_HOME}/../Classes/jsse.jar

+#JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

+#JAVA_CLASSES=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes

+#Java-All=${JAVA_CLASSES}/classes.jar:${JAVA_CLASSES}/ui.jar:${JAVA_CLASSES}/charsets.jar:${JAVA_CLASSES}/dt.jar:${JAVA_CLASSES}/jce.jar:${JAVA_CLASSES}/jconsole.jar:${JAVA_CLASSES}/jsse.jar:${JAVA_CLASSES}/laf.jar

+#JavaSE-1.6=${Java-All}

+#J2SE-1.5=${Java-All}

+#J2SE-1.4=${Java-All}

+dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/S-3.5.1RC1-200908070800/eclipse-SDK-3.5.1RC1-macosx-cocoa-x86_64.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-SDK-2.5.0.zip,http://download.eclipse.org/tools/gef/downloads/drops/3.5.0/R200906221200/GEF-ALL-3.5.0.zip,ftp://mirror.csclub.uwaterloo.ca/eclipse/birt/downloads/drops/R-R1-2_5_0-200906180630/birt-report-framework-2_5_0.zip,http://lwjgl.org/update/plugins/lwjgl.zip,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.jdom_1.0.0.v200806100616.jar,http://download.eclipse.org/modeling/tmf/xtext/downloads/drops/0.7.2/R200908120607/tmf-xtext-SDK-incubation-0.7.2.zip,http://download.eclipse.org/modeling/emft/mwe/downloads/drops/0.7.2/S200908101326/emft-mwe-SDK-incubation-0.7.2RC1.zip,http://download.eclipse.org/modeling/emf/compare/downloads/drops/1.0.0/R200906220949/emft-compare-runtime-incubation-1.0.0.zip,http://download.eclipse.org/modeling/m2t/xpand/downloads/drops/0.7.2/S200908101418/m2t-xpand-SDK-incubation-0.7.2RC1.zip,http://download.eclipse.org/modeling/mdt/uml2/downloads/drops/3.0.0/R200906151558/mdt-uml2-SDK-3.0.0.zip,http://download.eclipse.org/datatools/downloads/1.7/dtp_1.7.0.zip,http://download.eclipse.org/tools/gef/downloads/drops/3.5.0/R200906221200/GEF-ALL-3.5.0.zip,http://download.eclipse.org/webtools/downloads/drops/R3.1/R-3.1-20090616035105/wtp-R-3.1-20090616035105.zip

+#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

+#build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

+build.steps=buildUpdate,buildZips,generateDigests,publish

+#-------------#

+

+

+#	Mac OSX	#

+#JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

+#JAVA50_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

+#dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-macosx-cocoa.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-SDK-2.5.0.zip,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/orbit-R20090529135407.zip

+#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

+#build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

+#-------------#

+

+#	WINDOWS	#

+#JAVA_HOME=c:/Java/sun/jre1.5.0_13

+#JAVA50_HOME=c:/Java/sun/jre1.5.0_13

+#dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-win32.zip,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-SDK-2.5.0.zip,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-xsd-Examples-2.5.0.zip,http://download.eclipse.org/modeling/mdt/ocl/downloads/drops/1.3.0/R200906151742/mdt-ocl-runtime-1.3.0.zip

+#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

+#build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,cleanup

+#-------------#

+

+

+

+

+#################################################################################################################

+

+#TODO: [269290] make javadokken work.

+#javadocEnabled=true

+#JAVADOC14_HOME=/opt/public/common/ibm-java2-ppc-50/bin

+

+# TODO: are these still required/used?

+#projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools

+projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling

+projRelengPath=org.eclipse.amp/releng/org.eclipse.amp.releng

 basebuilderBranch=R35_RC4
-
+

+# TODO: not used yet

+# define regex patterns to use when automatically selecting zips from a directory or list file

+#dependencyRegexFilter=R3_4_maintenance:M200.*/eclipse-SDK-|R-.*200.*/eclipse-SDK-

+

+# TODO: not used yet

+# could be file://, http://, cvs path, or relative path?

+#mapLocation=maps/

+

+# TODO: implement use of packager.map for defining deps?

+# TODO: could be relative, absolute (local), or http/ftp paths to archives when defining dependencyURLs above

+

+## END PROJECT BUILD PROPERTIES ##

diff --git a/releng/org.eclipse.amp.releng/build.propertiesdis b/releng/org.eclipse.amp.releng/build.propertiesdis
new file mode 100755
index 0000000..024d9a2
--- /dev/null
+++ b/releng/org.eclipse.amp.releng/build.propertiesdis
@@ -0,0 +1,39 @@
+## BEGIN PROJECT BUILD PROPERTIES ##
+
+# default settings for all this project's builds, for this branch; see also o.e.d.common.releng/build.properties for more overrideable defaults
+
+# To permit automatic downloads of non-EPL compatible code, set this to property to "I accept"
+#thirdPartyDownloadLicenseAcceptance="I accept"
+
+# MUST BE SET #
+projectid=modeling.amp
+zipPrefix=AMP
+incubation=-incubation
+version=0.2.0
+buildType=I
+mainFeatureToBuildID=org.eclipse.amp.axf.feature
+testFeatureToBuildID=org.eclipse.amp.test
+
+downloadsDir=/Users/milesparker/Downloads
+
+#what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup
+build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup
+
+compilerArg=-enableJavadoc -encoding ISO-8859-1
+flattenDependencies=true
+parallelCompilation=true
+generateFeatureVersionSuffix=true
+#individualSourceBundles=true
+
+#################################################################################################################
+
+#TODO: [269290] make javadokken work.
+#javadocEnabled=true
+#JAVADOC14_HOME=/opt/public/common/ibm-java2-ppc-50/bin
+
+# TODO: are these still required/used?
+#projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
+projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling
+projRelengPath=org.eclipse.amp/releng/org.eclipse.amp.releng
+basebuilderBranch=R35_RC4
+
diff --git a/releng/org.eclipse.amp.releng/build.xml b/releng/org.eclipse.amp.releng/build.xml
index 211b065..83fe6ae 100644
--- a/releng/org.eclipse.amp.releng/build.xml
+++ b/releng/org.eclipse.amp.releng/build.xml
@@ -37,8 +37,7 @@
 		-->
 
 		<!-- load properties and set timestamp for the build -->
-		<property file="build-office.properties" />
-		<property file="build-local-macosx.properties" />
+		<property file="build.properties" />
 		<tstamp>
 			<format property="buildTimestamp" pattern="yyyyMMddHHmm" />
 		</tstamp>
diff --git a/releng/org.eclipse.amp.releng/maps/amp_local.mapdis b/releng/org.eclipse.amp.releng/maps/amp_local.map
similarity index 97%
rename from releng/org.eclipse.amp.releng/maps/amp_local.mapdis
rename to releng/org.eclipse.amp.releng/maps/amp_local.map
index 3ee8206..0e121ae 100755
--- a/releng/org.eclipse.amp.releng/maps/amp_local.mapdis
+++ b/releng/org.eclipse.amp.releng/maps/amp_local.map
@@ -6,7 +6,7 @@
 fragment@org.eclipse.ant.optional.junit=v20050226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
 
 plugin@org.apache.commons.collections=COPY,/Volumes/Resources/Developer/repos/eclipse,dependencies/plugins/org.apache.commons.collections
-plugin@org.lwjgl=COPY,/Volumes/Resources/Developer/repos/eclipse,dependencies/plugins/org.lwjgl_2.1.0
+plugin@org.lwjgl=COPY,/Volumes/Resources/Developer/repos/eclipse,dependencies/plugins/org.lwjgl_2.1.0.jar
 
 !***DEPENDENCIES
 !***plugin@org.eclipse.emf.java=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/dependencies/plugins/org.eclipse.emf.java
@@ -48,7 +48,7 @@
 feature@org.eclipse.amp.agf.zest.feature=COPY,/Volumes/Resources/Developer/repos/eclipse,org.eclipse.amp.agf/features/org.eclipse.amp.agf.zest.feature
 feature@org.eclipse.amp.agf3d.feature=COPY,/Volumes/Resources/Developer/repos/eclipse,org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature
 feature@org.eclipse.amp.amf.feature=COPY,/Volumes/Resources/Developer/repos/eclipse,org.eclipse.amp.amf/features/org.eclipse.amp.amf.feature
-feature@org.eclipse.amp.amf.gen.feature=COPY,/Volumes/Resources/Developer/repos/eclipse,org.eclipse.amp.amf/features/org.eclipse.amp.amf.gen.feature
+!***feature@org.eclipse.amp.amf.gen.feature=COPY,/Volumes/Resources/Developer/repos/eclipse,org.eclipse.amp.amf/features/org.eclipse.amp.amf.gen.feature
 feature@org.eclipse.amp.amf.core.feature=COPY,/Volumes/Resources/Developer/repos/eclipse,org.eclipse.amp.amf/features/org.eclipse.amp.amf.core.feature
 feature@org.eclipse.amp.amf.target.ascape.feature=COPY,/Volumes/Resources/Developer/repos/eclipse,org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.ascape.feature
 !***TODO Fix this directory name on CVS
diff --git a/releng/org.eclipse.amp.releng/maps/amp_simple.map b/releng/org.eclipse.amp.releng/maps/amp_simple.mapdis
similarity index 100%
rename from releng/org.eclipse.amp.releng/maps/amp_simple.map
rename to releng/org.eclipse.amp.releng/maps/amp_simple.mapdis
diff --git a/releng/org.eclipse.amp.releng/promote.properties b/releng/org.eclipse.amp.releng/promote.properties
index 9e8880d..155819b 100644
--- a/releng/org.eclipse.amp.releng/promote.properties
+++ b/releng/org.eclipse.amp.releng/promote.properties
@@ -1,17 +1,17 @@
 # source dir
-sourceZipsDir=/opt/users/hudsonbuild/.hudson/jobs/cbi-emft-mwe-0.7/lastSuccessful/archive/build/
+sourceZipsDir=/opt/users/hudsonbuild/.hudson/jobs/cbi-amp-0.2/lastSuccessful/archive/build/
 
 # target dir
-targetZipsDir=/home/data/httpd/download.eclipse.org/modeling/emft/updates/nightly/0.7.0
+targetZipsDir=/home/data/httpd/download.eclipse.org/modeling/amp/updates/interim/0.2.0
 
 # group owner of new files
-targetGroup=emftadmin
+targetGroup=ampadmin
 
 # type(s) to copy (N, I, M, S, R; default to all)
-buildTypes=N
+buildTypes=I
 
 # synch method method (add or replace; add = keep adding new builds; replace = keep 1 build per branch)
 synchMethod=replace
 
 # if set, update zip will be unpacked into destination dir and use synchMethod above to add or replace contents 
-targetUpdateDir=/home/data/httpd/download.eclipse.org/modeling/emft/updates/nightly
+targetUpdateDir=/home/data/httpd/download.eclipse.org/modeling/amp/updates/interim