[302834] Add plugin filtering supports to map files process
diff --git a/babel-setup.sql b/babel-setup.sql
index a7798bf..955b078 100644
--- a/babel-setup.sql
+++ b/babel-setup.sql
@@ -559,7 +559,6 @@
insert into map_files values ("eclipse", "3.4", "jdtcore.map", "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.releng/maps/jdtcore.map?view=co", 1, 1);
insert into map_files values ("eclipse", "3.4", "jdtdebug.map", "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.releng/maps/jdtdebug.map?view=co", 1, 1);
insert into map_files values ("eclipse", "3.4", "jdtui.map", "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.releng/maps/jdtui.map?view=co", 1, 1);
-insert into map_files values ("eclipse", "3.4", "orbit.map", "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.releng/maps/orbit.map?view=co", 1, 1);
insert into map_files values ("eclipse", "3.4", "pde.map", "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.releng/maps/pde.map?view=co", 1, 1);
insert into map_files values ("eclipse", "3.4", "rcp.map", "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.releng/maps/rcp.map?view=co", 1, 1);
insert into map_files values ("eclipse", "3.4", "releng.map", "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.releng/maps/releng.map?view=co", 1, 1);
diff --git a/html/global.php b/html/global.php
index b17d4d6..225407c 100644
--- a/html/global.php
+++ b/html/global.php
@@ -37,7 +37,8 @@
if (empty($GLOBALS['page']))
$GLOBALS['page'] = '';
- if((strpos($_SERVER['REQUEST_URI'], "login.php") == FALSE) &&
+ if (isset($_SERVER['REQUEST_URI']) &&
+ (strpos($_SERVER['REQUEST_URI'], "login.php") == FALSE) &&
(strpos($_SERVER['REQUEST_URI'], "callback") == FALSE)) {
SetSessionVar('s_pageLast', $_SERVER['REQUEST_URI']);
}
@@ -70,13 +71,15 @@
$GLOBALS['g_PHPSELF'] = $GLOBALS['page'];
$GLOBALS['g_PAGE'] = $page;
- $GLOBALS['g_SITEURL'] = $_SERVER['HTTP_HOST'];
- $GLOBALS['g_SITENAME'] = substr($GLOBALS['g_SITEURL'],0,strlen($GLOBALS['g_SITEURL'])-4);
- $GLOBALS['g_TITLE'] = $GLOBALS['g_SITENAME'];
+ if (isset($_SERVER['HTTP_HOST'])) {
+ $GLOBALS['g_SITEURL'] = $_SERVER['HTTP_HOST'];
+ $GLOBALS['g_SITENAME'] = substr($GLOBALS['g_SITEURL'],0,strlen($GLOBALS['g_SITEURL'])-4);
+ $GLOBALS['g_TITLE'] = $GLOBALS['g_SITENAME'];
+ }
$GLOBALS['g_ERRSTRS'] = array("","","","","","","","","","","",);
$GLOBALS['DEBUG'] = "";
}
-?>
\ No newline at end of file
+?>
diff --git a/html/process_map_files.php b/html/process_map_files.php
index 6b6870d..c64740d 100755
--- a/html/process_map_files.php
+++ b/html/process_map_files.php
@@ -14,219 +14,243 @@
* Kit Lo (IBM) - Bug 266250, Map file processor not running properly on live server
* Kit Lo (IBM) - Bug 272176, Support "bundle" element type in map file
* Kit Lo (IBM) - Bug 257332, NLS warnings appear unnecessarily in runtime log
+ * Kit Lo (IBM) - Bug 302834, Add plugin filtering supports to map files process
*******************************************************************************/
header("Content-type: text/plain");
include("global.php");
InitPage("");
$headless = 0;
-if(!isset($User)) {
- echo "User not defined -- running headless.";
- $User = getGenieUser();
- $headless = 1;
+if (!isset($User)) {
+ echo "User not defined - running headless\n";
+ $User = getGenieUser();
+ $headless = 1;
}
-
require(dirname(__FILE__) . "/../classes/file/file.class.php");
$html_spacer = " ";
+$files = array();
global $dbh;
-if(!is_dir("/tmp/tmp-babel")) {
- mkdir("/tmp/tmp-babel") || die("Cannot create a working directory");
+if (!is_dir("/tmp/tmp-babel")) {
+ mkdir("/tmp/tmp-babel") || die("Cannot create a working directory");
}
chdir("/tmp/tmp-babel") || die("Cannot use working directory");
-
-$files = array();
-$sql = "SELECT * from files";
-$rs_files = mysql_query($sql, $dbh);
-while($myrow_file = mysql_fetch_assoc($rs_files)) {
- $File = new File();
- $File->project_id = $myrow_file['project_id'];
- $File->version = $myrow_file['version'];
- $File->name = $myrow_file['name'];
- $File->plugin_id = $myrow_file['plugin_id'];
- $File->file_id = $myrow_file['file_id'];
- $files[$File->file_id] = $File;
-}
-
-
-$sql = "SELECT * FROM map_files WHERE is_active = 1 ORDER BY RAND()";
+$sql = "SELECT * FROM map_files WHERE is_active = 1 AND is_map_file = 1";
$rs_maps = mysql_query($sql, $dbh);
-while($myrow_maps = mysql_fetch_assoc($rs_maps)) {
- echo "Processing map file: " . $myrow_maps['filename'] . " in location: " . $myrow_maps['location'] . "\n";
-
- $tmpdir = "/tmp/tmp-babel/" . str_replace(" ", "_", $myrow_maps['project_id']);
- if(is_dir($tmpdir)) {
- # zap the directory to make sure CVS versions don't overlap
- exec("rm -rf " . $tmpdir);
- }
- mkdir($tmpdir) || die("Cannot create working directory $tmpdir !");
- chdir($tmpdir) || die("Cannot write to $tmpdir !");
-
- $h = fopen($myrow_maps['location'], "rb");
- $file_contents = stream_get_contents($h);
- fclose($h);
- $file_contents = ereg_replace("\r\n?", "\n", $file_contents);
- $aLines = split("\n", $file_contents);
-
-
- foreach ($aLines as $line) {
- $line = trim($line);
+while ($myrow_maps = mysql_fetch_assoc($rs_maps)) {
+ $location = $myrow_maps['location'];
+ $project_id = $myrow_maps['project_id'];
+ $version = $myrow_maps['version'];
+ $properties_file_count = 0;
- # $line looks something like this:
- # See http://help.eclipse.org/help33/index.jsp?topic=/org.eclipse.pde.doc.user/guide/tasks/pde_fetch_phase.htm for more info
- # plugin@org.eclipse.emf.query=v200802262150,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.query/plugins/org.eclipse.emf.query
- # plugin@org.eclipse.equinox.frameworkadmin=CVS,tag=R34x_v20080910,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
- # bundle@org.eclipse.wst.xml.xpath.ui=v200902122100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.xpath.ui
-
- # Bug 272176 - Support "bundle" element type in map file
- if(preg_match("/^(plugin|bundle)/", $line)) {
- echo $html_spacer . "Processing line: " . $line . "\n";
- $aParts = split("=", $line);
- $aElements = split("@", $aParts[0]);
- $plugin_id = $aElements[1];
- # Bug 272176 - Support "bundle" element type in map file
- if($aElements[0] == "plugin" || $aElements[0] == "bundle") {
- $plugin = $aParts[1];
- if($aParts[1] == "CVS,tag") {
- $tagPart = split(",", $aParts[2]);
- $cvsRootPart = split(",", $aParts[3]);
- $plugin = $tagPart[0] . "," . $cvsRootPart[0] . "," . $aParts[4];
- }
- echo $html_spacer . $html_spacer . "Processing plugin: " . $plugin . "\n";
- $aStuff = parseLocation($plugin);
-
- $tagstring = "";
- if(isset($aStuff['tag'])) {
- $tagstring = "-r " . $aStuff['tag'] . " ";
- }
- if(isset($aStuff['plugin'])) {
- if($aStuff['plugin'] != "") {
- $aElements[1] = $aStuff['plugin'];
- }
- }
-
- $command = "";
- # determine CVS or SVN
- if(isset($aStuff['cvsroot'])) {
- $command = "cvs -d " . $aStuff['cvsroot'] . " co " . $tagstring . $aElements[1];
- }
- elseif( isset($aStuff['svnroot'])) {
- $command = "/usr/local/bin/svn co " . $aStuff['svnroot'] . " --config-dir /tmp";
- }
- echo $html_spacer . $html_spacer ."--> " . $command . "\n";
-
- $out = "";
- if($command != "") {
- $out = shell_exec($command);
- }
-
- # process the output lines for .properties
- $aOutLines = split("\n", $out);
- foreach ($aOutLines as $out_line) {
- $out_line = trim($out_line);
- # remove SVN's multiple spaces
- $out_line = preg_replace("/\s+/", " ", $out_line);
-
- echo $html_spacer . $html_spacer . "CVS out line: " . $out_line . "\n";
- # CVS:
- # U org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/AntDTDUtilMessages.properties
- # SVN:
- # A org.eclipse.stp.bpmn/trunk/org.eclipse.stp.bpmn/org.eclipse.stp.eid/trunk/org.eclipse.stp.eid.generator.test/build.properties
- if(preg_match("/\.properties$/", $out_line) && !preg_match("/build\.properties$/", $out_line)) {
- # this is a .properties file!
- $file_name = trim(substr($out_line, 2));
- echo $html_spacer . $html_spacer . $html_spacer . "Processing .properties file: " . $file_name . "\n";
-
- $file_id = File::getFileID($file_name, $myrow_maps['project_id'], $myrow_maps['version']);
-
- if ($files[$file_id] != null) {
- $File = $files[$file_id];
- $File->is_active = 1;
- unset($files[$file_id]);
- } else {
- $File = new File();
- $File->project_id = $myrow_maps['project_id'];
- $File->version = $myrow_maps['version'];
- $File->name = $file_name;
- $File->plugin_id = $plugin_id;
- $File->is_active = 1;
- }
- if(!$File->save()) {
- echo $html_spacer . $html_spacer . $html_spacer . $html_spacer . "***ERROR saving file: " . $file_name . "\n";
- }
- else {
- # Start importing the strings!
- $fh = fopen($file_name, 'r');
- $size = filesize($file_name);
-
- $content = fread($fh, $size);
- fclose($fh);
-
- $strings = $File->parseProperties($content);
- echo $html_spacer . $html_spacer . $html_spacer . $html_spacer . "Strings processed: $strings\n\n";
- }
-
- }
- }
- }
- }
- }
+ # Parse each properties file for this project version
+ echo "Start processing properties files in project $project_id version $version...\n";
+ echo " Map file location: $location\n";
+
+ # Get all files for this project version
+ $sql = "SELECT * FROM files WHERE project_id = \"$project_id\" AND version = \"$version\"";
+ $rs_files = mysql_query($sql, $dbh);
+ while($myrow_file = mysql_fetch_assoc($rs_files)) {
+ $file = new File();
+ $file->project_id = $myrow_file['project_id'];
+ $file->version = $myrow_file['version'];
+ $file->name = $myrow_file['name'];
+ $file->plugin_id = $myrow_file['plugin_id'];
+ $file->file_id = $myrow_file['file_id'];
+ $files[$file->file_id] = $file;
+ }
+
+ # Get all plugin exclude patterns for this project version
+ $sql = "SELECT pattern FROM plugin_exclude_patterns WHERE project_id = \"$project_id\" AND version = \"$version\"";
+ $rs_patterns = mysql_query($sql, $dbh);
+ $patterns = Array();
+ while ($myrow_patterns = mysql_fetch_assoc($rs_patterns)) {
+ $patterns[] = $myrow_patterns['pattern'];
+ }
+
+ # echo "Processing map file: " . $myrow_maps['filename'] . " in location: " . $myrow_maps['location'] . "\n";
+
+ $tmpdir = "/tmp/tmp-babel/" . str_replace(" ", "_", $myrow_maps['project_id']);
+ if (is_dir($tmpdir)) {
+ # zap the directory to make sure CVS versions don't overlap
+ exec("rm -rf " . $tmpdir);
+ }
+ mkdir($tmpdir) || die("Cannot create working directory $tmpdir !");
+ chdir($tmpdir) || die("Cannot write to $tmpdir !");
+
+ $h = fopen($myrow_maps['location'], "rb");
+ $file_contents = stream_get_contents($h);
+ fclose($h);
+ $file_contents = ereg_replace("\r\n?", "\n", $file_contents);
+ $aLines = split("\n", $file_contents);
+
+ foreach ($aLines as $line) {
+ $line = trim($line);
+
+ # $line looks something like this:
+ # See http://help.eclipse.org/help33/index.jsp?topic=/org.eclipse.pde.doc.user/guide/tasks/pde_fetch_phase.htm for more info
+ # plugin@org.eclipse.emf.query=v200802262150,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.query/plugins/org.eclipse.emf.query
+ # plugin@org.eclipse.equinox.frameworkadmin=CVS,tag=R34x_v20080910,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
+ # bundle@org.eclipse.wst.xml.xpath.ui=v200902122100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.xpath.ui
+
+ # Bug 272176 - Support "bundle" element type in map file
+ if (preg_match("/^(plugin|bundle)/", $line)) {
+ # echo $html_spacer . "Processing line: " . $line . "\n";
+ $aParts = split("=", $line);
+ $aElements = split("@", $aParts[0]);
+ $plugin_id = $aElements[1];
+ # Bug 272176 - Support "bundle" element type in map file
+ if ($aElements[0] == "plugin" || $aElements[0] == "bundle") {
+ $plugin = $aParts[1];
+ if ($aParts[1] == "CVS,tag") {
+ $tagPart = split(",", $aParts[2]);
+ $cvsRootPart = split(",", $aParts[3]);
+ $plugin = $tagPart[0] . "," . $cvsRootPart[0] . "," . $aParts[4];
+ }
+ $aStuff = parseLocation($plugin);
+
+ $tagstring = "";
+ if (isset($aStuff['tag'])) {
+ $tagstring = "-r " . $aStuff['tag'] . " ";
+ }
+ if (isset($aStuff['plugin'])) {
+ if ($aStuff['plugin'] != "") {
+ $aElements[1] = $aStuff['plugin'];
+ }
+ }
+
+ $command = "";
+ # determine CVS or SVN
+ if (isset($aStuff['cvsroot'])) {
+ $command = "cvs -q -d " . $aStuff['cvsroot'] . " co " . $tagstring . $aElements[1];
+ } elseif (isset($aStuff['svnroot'])) {
+ $command = "/usr/local/bin/svn co " . $aStuff['svnroot'] . " --config-dir /tmp";
+ }
+ # echo $html_spacer . $html_spacer ."--> " . $command . "\n";
+
+ $out = "";
+ if ($command != "") {
+ $out = shell_exec($command);
+ }
+
+ # process the output lines for .properties
+ $aOutLines = split("\n", $out);
+ foreach ($aOutLines as $out_line) {
+ $out_line = trim($out_line);
+ # remove SVN's multiple spaces
+ $out_line = preg_replace("/\s+/", " ", $out_line);
+
+ # echo $html_spacer . $html_spacer . "CVS out line: " . $out_line . "\n";
+ # CVS:
+ # U org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/AntDTDUtilMessages.properties
+ # SVN:
+ # A org.eclipse.stp.bpmn/trunk/org.eclipse.stp.bpmn/org.eclipse.stp.eid/trunk/org.eclipse.stp.eid.generator.test/build.properties
+ if (preg_match("/\.properties$/", $out_line) && !preg_match("/build\.properties$/", $out_line)) {
+ # this is a .properties file!
+ $file_name = trim(substr($out_line, 2));
+ # echo $html_spacer . $html_spacer . $html_spacer . "Processing .properties file: " . $file_name . "\n";
+ $file_id = File::getFileID($file_name, $myrow_maps['project_id'], $myrow_maps['version']);
+ $properties_file_count = $properties_file_count + 1;
+
+ # Match plugin exclude list
+ $match = false;
+ foreach ($patterns as $pattern) {
+ if (preg_match($pattern, $file_name)) {
+ $match = true;
+ break;
+ }
+ }
+
+ if (!$match) {
+ if ($file_id > 0 && $files[$file_id] != null) {
+ $file = $files[$file_id];
+ $file->is_active = 1;
+ unset($files[$file_id]);
+ } else {
+ $file = new File();
+ $file->project_id = $myrow_maps['project_id'];
+ $file->version = $myrow_maps['version'];
+ $file->name = $file_name;
+ $file->plugin_id = $plugin_id;
+ $file->is_active = 1;
+ }
+ if (!$file->save()) {
+ echo $html_spacer . $html_spacer . $html_spacer . $html_spacer . "***ERROR saving file: " . $file_name . "\n";
+ } else {
+ $file->parseProperties(file_get_contents($file_name));
+ echo " $file_name\n";
+ }
+ } else {
+ echo " !!! Excluding $file_name\n";
+ }
+ }
+ }
+ }
+ }
+ }
+ echo "Done processing " . $properties_file_count . " properties files in project $project_id version $version\n\n";
}
-echo "Marking the remaining files as inactive\n";
+# Deactivate the rest of the files
+echo "Start deactivating inactive properties files in all projects above...\n";
foreach ($files as $file) {
- $file->is_active = 0;
- if(!$file->save()) {
- echo $html_spacer . $html_spacer . $html_spacer . $html_spacer . "***ERROR saving file: " . $file->name . "\n";
- }
+ if ($file->is_active == 1) {
+ $file->is_active = 0;
+ if (!$file->save()) {
+ echo $html_spacer . $html_spacer . $html_spacer . $html_spacer . "***ERROR saving file: " . $file->name . "\n";
+ }
+ echo " " . $file->name . "\n";
+ } else {
+ unset($files[$file->file_id]);
+ }
+}
+echo "Done deactivating " . sizeof($files) . " inactive properties files in all projects above\n\n";
+
+if ($headless) {
+ $User = null;
}
-echo "Done.";
-
-if($headless) {
- $User = null;
-}
+echo "Done\n";
function parseLocation($in_string) {
- # in_string looks something like this:
- # v_832,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
- # v20080204,:pserver:anonymous@dev.eclipse.org:/cvsroot/birt,,source/org.eclipse.birt.report.designer.core
- # v200802262150,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.query/plugins/org.eclipse.emf.query
- # SVN,tags/1.0M5,http://dev.eclipse.org/svnroot/dsdp/org.eclipse.mtj,,features/org.eclipse.mtj
- # svn://dev.eclipse.org/svnroot/stp/org.eclipse.stp.bpmn/trunk/
-
- $aTheseElements = array();
-
- $aLocation = split(",", $in_string);
- foreach($aLocation as $location_part) {
- # TAG
- # Bug 257332, NLS warnings appear unnecessarily in runtime log
- if(preg_match("/^[0-9a-zA-Z_]+/", $location_part) && !isset($aTheseElements['cvsroot'])) {
- $aTheseElements['tag'] = $location_part;
- }
- # CVSROOT
- if(preg_match("/^:.*:.*@.*:\//", $location_part)) {
- $aTheseElements['cvsroot'] = $location_part;
- }
- # SVNROOT
- # SVN,<tagPath>[:revision],<svnRepositoryURL>,<preTagPath>,<postTagPath>
- # maps to: svn://<svnRepositoryURL>/<preTagPath>/<tagPath>/<postTagPath>
- if(preg_match("/^(http|svn):\/\//", $location_part)) {
- $location_part = str_replace("http", "svn", $location_part);
- if ($aLocation[3] == ' ' || $aLocation[3] == '') {
- $aTheseElements['svnroot'] = $location_part . "/" . $aLocation[1] . "/" . $aLocation[4];
- } else {
- $aTheseElements['svnroot'] = $location_part . "/" . $aLocation[3] . "/" . $aLocation[1] . "/" . $aLocation[4];
- }
- }
- }
-
- $aTheseElements['plugin'] = substr($in_string, strrpos($in_string, ",") + 1);
-
- return $aTheseElements;
-}
+ # in_string looks something like this:
+ # v_832,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
+ # v20080204,:pserver:anonymous@dev.eclipse.org:/cvsroot/birt,,source/org.eclipse.birt.report.designer.core
+ # v200802262150,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.query/plugins/org.eclipse.emf.query
+ # SVN,tags/1.0M5,http://dev.eclipse.org/svnroot/dsdp/org.eclipse.mtj,,features/org.eclipse.mtj
+ # svn://dev.eclipse.org/svnroot/stp/org.eclipse.stp.bpmn/trunk/
+ $aTheseElements = array();
+
+ $aLocation = split(",", $in_string);
+ foreach($aLocation as $location_part) {
+ # TAG
+ # Bug 257332, NLS warnings appear unnecessarily in runtime log
+ if (preg_match("/^[0-9a-zA-Z_]+/", $location_part) && !isset($aTheseElements['cvsroot'])) {
+ $aTheseElements['tag'] = $location_part;
+ }
+ # CVSROOT
+ if (preg_match("/^:.*:.*@.*:\//", $location_part)) {
+ $aTheseElements['cvsroot'] = $location_part;
+ }
+ # SVNROOT
+ # SVN,<tagPath>[:revision],<svnRepositoryURL>,<preTagPath>,<postTagPath>
+ # maps to: svn://<svnRepositoryURL>/<preTagPath>/<tagPath>/<postTagPath>
+ if (preg_match("/^(http|svn):\/\//", $location_part)) {
+ $location_part = str_replace("http", "svn", $location_part);
+ if ($aLocation[3] == ' ' || $aLocation[3] == '') {
+ $aTheseElements['svnroot'] = $location_part . "/" . $aLocation[1] . "/" . $aLocation[4];
+ } else {
+ $aTheseElements['svnroot'] = $location_part . "/" . $aLocation[3] . "/" . $aLocation[1] . "/" . $aLocation[4];
+ }
+ }
+ }
+
+ $aTheseElements['plugin'] = substr($in_string, strrpos($in_string, ",") + 1);
+
+ return $aTheseElements;
+}
?>
