prep for 3.0 builds
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index a344d3e..7b848c6 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -123,10 +123,6 @@
     </project>
 
 
-
-    <!-- ++++++++++++++++ -->
-    <!-- R1.5 MAINTENANCE -->
-    <!-- ++++++++++++++++ -->
     <project name="wtp-R1.5-M">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
         <modificationset quietperiod="120">
@@ -225,8 +221,66 @@
 
     </project>
 
+    <project name="wtp-R2.0-M">
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs
+                tag="R2_0_maintenance"
+                module="releng" />
+            <cvs
+                tag="R1_0_maintenance"
+                module="releng.dali" />
+            <cvs
+                tag="R1_0_maintenance"
+                module="releng-jsf" />                
+        </modificationset>
 
-    <project name="wtp-R2.0-I">
+        <schedule interval="${time.oneHour}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+
+                <!-- this "M" label should be changed to "R" once maintenance release
+                    is warming up for its "R"elease.
+                -->
+                <property
+                    name="buildType"
+                    value="M" />
+
+                <property
+                    name="buildId"
+                    value="2.0.1" />
+                <property
+                    name="buildBranch"
+                    value="R2.0" />
+
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+
+                <property
+                    name="mapVersionTag"
+                    value="R2_0_maintenance" />
+                <property
+                    name="releng.dali-mapVersionTag"
+                    value="R1_0_maintenance"/>
+                <property
+                    name="releng-jsf-mapVersionTag"
+                    value="R1_0_maintenance"/>
+                    
+
+            </ant>
+        </schedule>
+
+    </project>
+    <project name="wtp-R3.0-I">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
         <modificationset quietperiod="120">
             <cvs module="releng" />
@@ -250,7 +304,7 @@
                     value="I" />
                 <property
                     name="buildBranch"
-                    value="R2.0" />
+                    value="R3.0" />
                 <property
                     name="checkoutprojectname"
                     value="${project.name}" />
@@ -267,7 +321,7 @@
         </schedule>
 
     </project>
-    <project name="retest-wtp-R2.0-I">
+    <project name="retest-wtp-R3.0-I">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
         <modificationset quietperiod="120">
             <cvs module="releng" />
@@ -291,7 +345,7 @@
                     value="I" />
                 <property
                     name="buildBranch"
-                    value="R2.0" />
+                    value="R3.0" />
                 <property
                     name="checkoutprojectname"
                     value="${project.name}" />
@@ -310,7 +364,7 @@
     </project>
     
 
-    <project name="wtp-R2.0-N">
+    <project name="wtp-R3.0-N">
 
         <schedule interval="${time.VeryVeryLongTime}">
             <ant
@@ -328,7 +382,7 @@
                 <!-- in this context, buildBranch is simply a label -->
                 <property
                     name="buildBranch"
-                    value="R2.0" />
+                    value="R3.0" />
                 <property
                     name="mapVersionTag"
                     value="HEAD" />
@@ -344,7 +398,7 @@
         </schedule>
 
     </project>
-    <project name="retest-wtp-R2.0-N">
+    <project name="retest-wtp-R3.0-N">
 
         <schedule interval="${time.VeryVeryLongTime}">
             <ant
@@ -362,7 +416,7 @@
                 <!-- in this context, buildBranch is simply a label -->
                 <property
                     name="buildBranch"
-                    value="R2.0" />
+                    value="R3.0" />
                 <property
                     name="mapVersionTag"
                     value="HEAD" />
@@ -379,7 +433,7 @@
 
     </project>
 
-    <project name="wtp-R2.0-S">
+    <project name="wtp-R3.0-S">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
         <modificationset quietperiod="120">
             <cvs module="releng" />
@@ -403,10 +457,10 @@
                     value="S" />
                 <property
                     name="buildId"
-                    value="2.0RC4" />
+                    value="3.0M1" />
                 <property
                     name="buildBranch"
-                    value="R2.0" />
+                    value="R3.0" />
                 <property
                     name="checkoutprojectname"
                     value="${project.name}" />
@@ -427,7 +481,7 @@
 
     </project>
 
-    <project name="retest-wtp-R2.0-S">
+    <project name="retest-wtp-R3.0-S">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
         <modificationset quietperiod="120">
             <cvs module="releng" />
@@ -451,10 +505,10 @@
                     value="S" />
                 <property
                     name="buildId"
-                    value="2.0RC4" />
+                    value="3.0M1" />
                 <property
                     name="buildBranch"
-                    value="R2.0" />
+                    value="R3.0" />
                 <property
                     name="checkoutprojectname"
                     value="${project.name}" />
@@ -476,48 +530,9 @@
     </project>
 
 
-    <project name="wtp-buildTools-R2.0-T">
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <cvs module="releng" />
-        </modificationset>
-
-        <schedule interval="${time.VeryVeryLongTime}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="cc_project_build.xml"
-                target="Build"
-                useQuiet="false"
-                useLogger="false"
-                savelogdir="${logDir}"
-                usedebug="false"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
-                <property
-                    name="buildType"
-                    value="T" />
-                <property
-                    name="checkoutprojectname"
-                    value="${project.name}" />
-
-				<property
-					name="buildBranch"
-					value="R2.0" />
-
-                <property
-                    name="mapVersionTag"
-                    value="HEAD" />
-                <property
-                    name="build.distribution"
-                    value="wtp-buildTools" />
 
 
-            </ant>
-        </schedule>
-
-    </project>
-
-
-    <project name="wtp-R2.0-R">
+    <project name="wtp-R3.0-R">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
         <modificationset quietperiod="120">
             <cvs module="releng" />
@@ -541,10 +556,10 @@
                     value="R" />
                 <property
                     name="buildId"
-                    value="2.0" />
+                    value="3.0" />
                 <property
                     name="buildBranch"
-                    value="R2.0" />
+                    value="R3.0" />
                 <property
                     name="checkoutprojectname"
                     value="${project.name}" />
@@ -555,6 +570,90 @@
                 <property
                     name="build.distribution"
                     value="wtp" />
+            </ant>
+        </schedule>
+
+    </project>
+   <project name="retest-wtp-R3.0-R">
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs module="releng" />
+            <cvs module="releng-jsf" />
+            <cvs module="releng.dali" />
+
+        </modificationset>
+
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_retest.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+                <property
+                    name="buildType"
+                    value="R" />
+                <property
+                    name="buildId"
+                    value="3.0" />
+                <property
+                    name="buildBranch"
+                    value="R3.0" />
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+                <property
+                    name="mapVersionTag"
+                    value="HEAD" />
+                <property
+                    name="build.distribution"
+                    value="wtp" />
+                <property
+                    name="build.pack-all-in-one"
+                    value="true" />
+
+            </ant>
+        </schedule>
+
+
+    </project>
+    <project name="wtp-buildTools-R3.0-T">
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs module="releng" />
+        </modificationset>
+
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+                <property
+                    name="buildType"
+                    value="T" />
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+        <property
+          name="buildBranch"
+          value="R3.0" />
+
+                <property
+                    name="mapVersionTag"
+                    value="HEAD" />
+                <property
+                    name="build.distribution"
+                    value="wtp-buildTools" />
 
 
             </ant>
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index b315061..08a5882 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -1,4 +1,7 @@
-<project name="checkout" default="checkout" basedir=".">
+<project
+    name="checkout"
+    default="checkout"
+    basedir=".">
 
     <!-- = = = standard properties pattern = = = -->
     <!--
@@ -12,181 +15,224 @@
         Let users override standard properties, if desired.
         If directory, file, or some properties do not exist,
         then standard properties will be used.
-     -->
-    <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+    -->
+    <property
+        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
 
     <!-- load standard properties for production environment -->
-    <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+    <property
+        file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
     <!-- = = = end standard properties pattern = = = -->
 
     <!-- if not otherwise set, the following are good default values -->
-    <property name="checkout.wtpbuilder.clean"
-              value="true" />
-    <property name="mapVersionTag" value="HEAD" />
+    <property
+        name="checkout.wtpbuilder.clean"
+        value="true" />
+    <property
+        name="mapVersionTag"
+        value="HEAD" />
 
-    <property name="mapCvsRoot"
-              value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+    <property
+        name="mapCvsRoot"
+        value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
 
-    <property name="codir"
-              value="${env.BUILD_HOME}/build-node/checkout/${checkoutprojectname}" />
+    <property
+        name="codir"
+        value="${env.BUILD_HOME}/build-node/checkout/${checkoutprojectname}" />
 
 
 
-        <echo message="checkoutprojectname: ${checkoutprojectname}" />
-    <target name="checkout" if="checkoutprojectname">
+    <echo message="checkoutprojectname: ${checkoutprojectname}" />
+    <target
+        name="checkout"
+        if="checkoutprojectname">
         <!-- we always check and init the builder -->
         <antcall target="getwtpbuilder" />
         <!-- and projects can do more if needed. -->
         <antcall target="${checkoutprojectname}" />
     </target>
 
-    <target name="wtp-R2.0-N">
+    <target name="wtp-R3.0-N">
 
         <!--
-                do not need, since we do nightly builds "on demand" only
+            do not need, since we do nightly builds "on demand" only
             <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${wst}" dest="${codir}" />
             <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${jst}" dest="${codir}" />
         -->
 
     </target>
-  <target name="retest-wtp-R2.0-N">
-     <antcall target="wtp-wtp-R2.0-N" />  
-  </target>
+    <target name="retest-wtp-R3.0-N">
+        <antcall target="wtp-R3.0-N" />
+    </target>
 
-    <target name="wtp-R2.0-S">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng-jsf"
-             dest="${codir}"
-             tag="HEAD" />
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng.dali"
-             dest="${codir}"
-             tag="HEAD" />
+    <target name="wtp-R3.0-S">
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng-jsf"
+            dest="${codir}"
+            tag="HEAD" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng.dali"
+            dest="${codir}"
+            tag="HEAD" />
     </target>
-  <target name="retest-wtp-R2.0-S">
-     <antcall target="wtp-R2.0-S" />  
-  </target>
-	
-    <target name="wtp-R2.0-I">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng-jsf"
-             dest="${codir}"
-             tag="HEAD" />
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng.dali"
-             dest="${codir}"
-             tag="HEAD" />
+    <target name="retest-wtp-R3.0-S">
+        <antcall target="wtp-R3.0-S" />
     </target>
-  <target name="retest-wtp-R2.0-I">
-     <antcall target="wtp-R2.0-I" />  
-  </target>
-	
-    <target name="wtp-R2.0-R">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng-jsf"
-             dest="${codir}"
-             tag="HEAD" />
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng.dali"
-             dest="${codir}"
-             tag="HEAD" />
+
+    <target name="wtp-R3.0-I">
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng-jsf"
+            dest="${codir}"
+            tag="HEAD" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng.dali"
+            dest="${codir}"
+            tag="HEAD" />
     </target>
-    <target name="retest-wtp-R2.0-R">
-    	 <antcall target="wtp-R2.0-R" />  
+    <target name="retest-wtp-R3.0-I">
+        <antcall target="wtp-R3.0-I" />
+    </target>
+
+    <target name="wtp-R3.0-R">
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng-jsf"
+            dest="${codir}"
+            tag="HEAD" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng.dali"
+            dest="${codir}"
+            tag="HEAD" />
+    </target>
+    <target name="retest-wtp-R3.0-R">
+        <antcall target="wtp-R3.0-R" />
     </target>
 
 
     <target name="wtp-R1.5-M">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="${releng}"
-             dest="${codir}"
-             tag="R1_5_maintenance" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="${releng}"
+            dest="${codir}"
+            tag="R1_5_maintenance" />
     </target>
-  <target name="retest-wtp-R1.5-M">
-     <antcall target="wtp-R1.5-M" />  
-  </target>	
-	
+    <target name="retest-wtp-R1.5-M">
+        <antcall target="wtp-R1.5-M" />
+    </target>
+    <target name="wtp-R2.0-M">
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="${releng}"
+            dest="${codir}"
+            tag="R2_0_maintenance" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng.dali"
+            dest="${codir}"
+            tag="R1_0_maintenance" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng-jsf"
+            dest="${codir}"
+            tag="R1_0_maintenance" />
+    </target>
+
+    <target name="retest-wtp-R2.0-M">
+        <antcall target="wtp-R2.0-M" />
+    </target>
+
     <target name="jem-R1.5-M">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="${releng}"
-             dest="${codir}"
-             tag="R1_5_maintenance" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="${releng}"
+            dest="${codir}"
+            tag="R1_5_maintenance" />
     </target>
     <target name="patches-R1.5-P">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="${releng}"
-             dest="${codir}"
-             tag="R1_5_maintenance_patches" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="${releng}"
+            dest="${codir}"
+            tag="R1_5_maintenance_patches" />
     </target>
 
-    <target name="wtp-buildTools-R2.0-T">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng"
-             dest="${codir}"
-             tag="HEAD" />
+    <target name="wtp-buildTools-R3.0-T">
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="releng"
+            dest="${codir}"
+            tag="HEAD" />
     </target>
 
 
-    <target name="wst-R2.0-I">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng"
-             dest="${codir}"
-             tag="HEAD" />
-    </target>
-
-
-
 
     <!--
         The order of execution of these three worker targets
         is critical, check.clean, initBuilders, and
         then getwtpbuilder.
     -->
-    <target name="getwtpbuilder"
-            depends="check.clean,initBuilders"
-            if="doClean">
+    <target
+        name="getwtpbuilder"
+        depends="check.clean,initBuilders"
+        if="doClean">
         <!-- This is a special property file, that contains (only) the
-        value of wtpBuilderVersion. Then, that version of the builder
-        is fetched to control the rest of the build -->
+            value of wtpBuilderVersion. Then, that version of the builder
+            is fetched to control the rest of the build -->
         <property file="${codir}/${releng}/maps/build.cfg" />
-        <delete dir="${codir}/releng.wtpbuilder"
-                failonerror="false" />
-        <echo message="Version tag for ${releng.wtpbuilder} is: ${wtpBuilderVersion}" />
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="${releng.wtpbuilder}"
-             dest="${codir}"
-             tag="${wtpBuilderVersion}" />
+        <delete
+            dir="${codir}/releng.wtpbuilder"
+            failonerror="false" />
+        <echo
+            message="Version tag for ${releng.wtpbuilder} is: ${wtpBuilderVersion}" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="${releng.wtpbuilder}"
+            dest="${codir}"
+            tag="${wtpBuilderVersion}" />
     </target>
 
     <target name="check.clean">
-        <echo message="checkout.wtpbuilder.clean: ${checkout.wtpbuilder.clean}" />
+        <echo
+            message="checkout.wtpbuilder.clean: ${checkout.wtpbuilder.clean}" />
         <condition property="doClean">
-            <equals arg1="${checkout.wtpbuilder.clean}"
-                    arg2="true"
-                    trim="true"
-                    casesensitive="false" />
+            <equals
+                arg1="${checkout.wtpbuilder.clean}"
+                arg2="true"
+                trim="true"
+                casesensitive="false" />
         </condition>
     </target>
 
-    <target name="initBuilders" depends="check.clean" if="doClean">
+    <target
+        name="initBuilders"
+        depends="check.clean"
+        if="doClean">
         <echo message="Version tag for ${releng}: ${mapVersionTag}" />
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="${releng}"
-             dest="${codir}"
-             tag="${mapVersionTag}" />
+        <cvs
+            quiet="true"
+            cvsRoot="${mapCvsRoot}"
+            package="${releng}"
+            dest="${codir}"
+            tag="${mapVersionTag}" />
     </target>
 
 
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
index d7c0b9e..be47a0a 100644
--- a/releng.control/commonComputedVariables.shsource
+++ b/releng.control/commonComputedVariables.shsource
@@ -49,6 +49,7 @@
 export bootclasspath_15="${JAVA_5_HOME}/jre/lib/core.jar:${JAVA_5_HOME}/jre/lib/vm.jar:${JAVA_5_HOME}/jre/lib/xml.jar:${JAVA_5_HOME}/jre/lib/graphics.jar:${JAVA_5_HOME}/jre/lib/server.jar:${JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${JAVA_5_HOME}/jre/lib/security.jar"
 export ANT_OPTS="-Xms128m -Xmx512m"
 
+
 # and change them if Sun's VM is being used
 if $sunjvm ; then
 	export bootclasspath="${JAVA_4_HOME}/jre/lib/rt.jar"
@@ -69,6 +70,8 @@
 #   and pre-reqs
 export LOCAL_PREREQS_CACHE=${BUILD_HOME}/downloads
 
+# TODO: we need some logic for windows to use "exe"
+export JAVADOC_COMMAND="${JAVA_5_HOME}/bin/javadoc"
 
 export BUILD_INITIALIZED="true"
 
diff --git a/releng.control/standardMachineProperties/cc_project_build.properties b/releng.control/standardMachineProperties/cc_project_build.properties
index fa0a473..bea7997 100644
--- a/releng.control/standardMachineProperties/cc_project_build.properties
+++ b/releng.control/standardMachineProperties/cc_project_build.properties
@@ -2,7 +2,7 @@
 
 mapVersionTag=HEAD
 buildType=I
-buildBranch=R2.0
+buildBranch=R3.0
 build.distribution=wtp