remove jarprocessor from DL pages/templates

7 files changed, 91 insertions, 25 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
index b9fa3a10f..76f5fefc4 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
@@ -521,7 +521,7 @@
                 value="${buildType}" />
             <property
                 name="dropTokenList"
-                value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%jarprocessor%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
+                value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
             <property
                 name="platformIdentifierToken"
                 value="%platform%" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml
index fd27df6b0..fe10fd859 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml
@@ -554,7 +554,7 @@
                 value="${buildType}" />
             <property
                 name="dropTokenList" 
-                value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%jarprocessor%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
+                value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
             <property
                 name="platformIdentifierToken"
                 value="%platform%" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php
index ee62745f9..6db766c1c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php
@@ -84,7 +84,6 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 <li><a href="#JDTRuntime">JDT Runtime Binary</a></li>
 <li><a href="#JDTSDK">JDT SDK</a></li>
 <li><a href="#JDTCORE">JDT Core Batch Compiler</a></li>
-<li><a href="#JARPROCESSOR">Jar Processor</a></li>
 <li><a href="#PDERuntime">PDE Runtime Binary</a></li>
 <li><a href="#PDESDK">PDE SDK</a></li>
 <li><a href="#CVSRuntime">CVS Client Runtime Binary</a></li>
@@ -214,11 +213,6 @@ from the <a href="http://download.eclipse.org/tools/orbit/downloads/">Orbit Down
 				<li>
 				These drops contain the standalone batch java compiler, Ant compiler adapter and associated source. The batch compiler and Ant adapter (ecj.jar) are extracted from the org.eclipse.jdt.core plug-in as a 1.2MB download. For examples of usage, please refer to this help section: JDT Plug-in Developer Guide>Programmer's Guide>JDT Core>Compiling Java code.</li></ul>
 
-				<li><a name="JARPROCESSOR"> <b> Jar Processor </b> </a>
-				<ul>
-				<li>
-				These drops contain the standalone jar processor and associated source.  The jar processor is extracted from org.eclipse.update.core.  For details, see the	wiki pages for <a href="http://wiki.eclipse.org/index.php/Update_Site_Optimization">Update Site Optimization</a> and <a href="http://wiki.eclipse.org/index.php/Pack200#Jar_Processor">Pack200 Compression</a>.</li></ul>
-
 				<li><a name="PDERuntime"> <b> PDE Runtime Binary </b> </a>
 				<ul>
 				<li>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
index 5623188a7..5e4a8cc31 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
@@ -466,14 +466,6 @@ unnecessary duplication (see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi
 </div></td></tr>
 
 <tr><td><div class="homeitem3col">
-<h3><a name="JARPROCESSOR"> Jar Processor &nbsp;<a href="details.php#JARPROCESSOR"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3>
-<table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" >
-<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?>
-</tr> %jarprocessor% </table>
-</div></td></tr>
-
-
-<tr><td><div class="homeitem3col">
 <h3><a name="PDERuntime"> PDE Runtime Binary&nbsp;<a href="details.php#PDERuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3>
 <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" >
 <tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
index 181f80d7a..2d3884179 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
@@ -390,13 +390,6 @@ unnecessary duplication (see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi
 </div></td></tr>
 
 <tr><td><div class="homeitem3col">
-<h3><a name="JARPROCESSOR"> Jar Processor &nbsp;<a href="details.php#JARPROCESSOR"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3>
-<table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" >
-<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($_SERVER["SERVER_NAME"]); ?>
-</tr> %jarprocessor% </table>
-</div></td></tr>
-
-<tr><td><div class="homeitem3col">
 <h3><a name="PDERuntime"> PDE Runtime Binary&nbsp;<a href="details.php#PDERuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3>
 <table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" >
 <tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($_SERVER["SERVER_NAME"]); ?>
diff --git a/scripts/master-build.sh b/scripts/master-build.sh
index 81578e404..719d563f5 100644
--- a/scripts/master-build.sh
+++ b/scripts/master-build.sh
@@ -130,7 +130,9 @@ checkForErrorExit $? "Error occurred during gather parts"
 $SCRIPT_PATH/parse-logs.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/parse-logs-ouptut.txt
 $checkForErrorExit $? "Error occurred during parse-logs"
 
-/bin/bash $SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/publish-eclipse-ouptut.txt
+$SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/publish-eclipse-ouptut.txt
 checkForErrorExit $? "Error occurred during publish-eclipse"
 
-
+# if all ended well, put "promotion scripts" in known locations
+#$SCRIPT_PATH/promote-build.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/promote-build-ouptut.txt
+#checkForErrorExit $? "Error occurred during promote-build"
diff --git a/scripts/promote-build.sh b/scripts/promote-build.sh
new file mode 100644
index 000000000..6d210f497
--- /dev/null
+++ b/scripts/promote-build.sh
@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+
+# Utility to trigger the promotion of build. This utility just creates 
+# a file to be executed by cron job. The actual promotion is done by files 
+# in sdk directory of build machine. This "cron job approach" is required since
+# a different user id must promote things to "downloads". The promotion scripts 
+# also trigger the unit tests on Hudson.
+
+
+# The 'workLocation' provides a handy central place to have the
+# promote script, and log results. ASSUMING this works for all
+# types of builds, etc (which is the goal for the sdk promotions).
+workLocation=/shared/eclipse/sdk/promotion
+
+# the cron job must know about and use this same
+# location to look for its promotions scripts. (i.e. implicite tight coupling)
+promoteScriptLocationEclipse=$workLocation/queue
+
+# directory should normally exist -- best to create first, with committer's ID --
+# but in case not
+mkdir -p "${promoteScriptLocationEclipse}"
+
+#always use TEST for now
+testbuildonly=true
+scriptName=promote-${eclipseStream}-${buildId}.sh
+if [[ "${testbuildonly}" == "true" ]]
+then
+    # allows the "test" creation of promotion script, but, not have it "seen" be cron job
+    scriptName=TEST-$scriptName
+fi
+# Here is content of promtion script:
+ptimestamp=$( date +%Y%m%d%H%M )
+echo "#!/usr/bin/env bash" >  ${promoteScriptLocationEclipse}/${scriptName}
+echo "# promotion script created at $ptimestamp" >>  ${promoteScriptLocationEclipse}/${scriptName}
+echo "$workLocation/syncDropLocation.sh $eclipseStream $buildId" >> ${promoteScriptLocationEclipse}/${scriptName}
+
+# we restrict "others" rights for a bit more security or safety from accidents
+chmod -v ug=rwx,o-rwx ${promoteScriptLocationEclipse}/${scriptName}
+
+# no need to promote anything for 3.x builds
+# (equinox portion should be the same, so we will
+# create for equinox for for only 4.x primary builds)
+if [[ $eclipseStream > 4 ]]
+then
+    # The 'workLocation' provides a handy central place to have the
+    # promote script, and log results. ASSUMING this works for all
+    # types of builds, etc (which is the goal for the sdk promotions).
+    workLocationEquinox=/shared/eclipse/equinox/promotion
+
+    # the cron job must know about and use this same
+    # location to look for its promotions scripts. (i.e. tight coupling)
+    promoteScriptLocationEquinox=${workLocationEquinox}/queue
+
+    # directory should normally exist -- best to create with committer's ID --
+    # but in case not
+    mkdir -p "${promoteScriptLocationEquinox}"
+
+    eqFromDir=${equinoxPostingDirectory}/${buildId}
+    # fake location, for now
+    eqToDir="/shared/eclipse/temp/eqdrops"
+    #eqToDir="/home/data/httpd/download.eclipse.org/equinox/drops/"
+    
+    # Note: for proper mirroring at Eclipse, we probably do not want/need to
+    # maintain "times" on build machine, but let them take times at time of copying.
+    # If it turns out to be important to maintain times (such as ran more than once,
+    # to pick up a "more" output, such as test results, then add -t to rsync
+    # Similarly, if download server is set up right, it will end up with the
+    # correct permissions, but if not, we may need to set some permissions first,
+    # then use -p on rsync
+
+    # Here is content of promtion script (note, use same ptimestamp created above):
+    echo "#!/usr/bin/env bash" >  ${promoteScriptLocationEquinox}/${scriptName}
+    echo "# promotion script created at $ptimestamp" >  ${promoteScriptLocationEquinox}/${scriptName}
+    echo "rsync --recursive \"${eqFromDir}\" \"${eqToDir}\"" >> ${promoteScriptLocationEquinox}/${scriptName}
+
+    # we restrict "others" rights for a bit more security or safety from accidents
+    chmod -v ug=rwx,o-rwx ${promoteScriptLocationEquinox}/${scriptName}
+else
+    echo "Did not create promote script for equinox since $eclipseStream less than 4"
+fi
+
+
+echo "normal exit from build phase of $(basename $0)"
+
+exit 0