This commit was generated by cvs2svn to compensate for changes in r8593,

which included commits to RCS files with non-trunk default branches.

8 files changed, 197 insertions, 21 deletions

diff --git a/rt/sbin/extract-message-catalog b/rt/sbin/extract-message-catalog
index 34d44ed66..44f8d51e2 100644
--- a/rt/sbin/extract-message-catalog
+++ b/rt/sbin/extract-message-catalog
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -100,7 +100,7 @@ sub extract_strings_from_code {
 
     local $/;
     return if ( -d $_ );
-    return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local|\.svn' );
+    return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local' );
     return if ( /\.po$|\.bak$|~|,D|,B$|extract-message-catalog$/ );
     return if ( /^[\.#]/ );
     return if ( -f "$_.in" );
@@ -136,7 +136,7 @@ sub extract_strings_from_code {
 
         my ( $vars, $str );
         if ( $match =~
-                /\(\s*($RE{delimited}{-delim=>q{'"}}{-keep})(.*?)\s*\)$/ ) {
+                /\(\s*($RE{delimited}{-delim=>q{'"}}{-keep})(.*?)\s*\)$/s ) {
 
             $str = substr( $1, 1, -1 );       # $str comes before $vars now
             $vars = $9;
@@ -198,7 +198,8 @@ sub update {
         my $msghdr = "";
         $msghdr .= shift @lines while ( $lines[0] && $lines[0] !~ /^msgid/ );
         
-        my $msgid  = shift @lines;
+        my $msgid  = "";
+        $msgid .= shift @lines while ( $lines[0] && $lines[0] =~ /^(msgid|")/ );
         my $msgstr = "";
         $msgstr .= shift @lines while ( $lines[0] && $lines[0] =~ /^(msgstr|")/ );
 
diff --git a/rt/sbin/extract_pod_tests b/rt/sbin/extract_pod_tests
index 616560b02..897564daf 100644
--- a/rt/sbin/extract_pod_tests
+++ b/rt/sbin/extract_pod_tests
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/factory b/rt/sbin/factory
index f72a29675..6b2d896fa 100644
--- a/rt/sbin/factory
+++ b/rt/sbin/factory
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/license_tag b/rt/sbin/license_tag
index ed1d4eb64..ddb436866 100644
--- a/rt/sbin/license_tag
+++ b/rt/sbin/license_tag
@@ -5,7 +5,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -27,7 +27,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -52,7 +52,7 @@ my $LICENSE  = <<'EOL';
 
 COPYRIGHT:
  
-This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
                                          <jesse@bestpractical.com>
 
 (Except where explicitly superseded by other copyright notices)
@@ -74,7 +74,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 or visit their web page on the internet at
-http://www.gnu.org/copyleft/gpl.html.
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 
 
 CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/regression_harness b/rt/sbin/regression_harness
index 1e97a2978..7460135f2 100644
--- a/rt/sbin/regression_harness
+++ b/rt/sbin/regression_harness
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/rt-dump-database b/rt/sbin/rt-dump-database
new file mode 100755
index 000000000..647781d8d
--- /dev/null
+++ b/rt/sbin/rt-dump-database
@@ -0,0 +1,173 @@
+#!/usr/bin/perl -w
+# BEGIN BPS TAGGED BLOCK {{{
+# 
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
+# 
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+# 
+# 
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# END BPS TAGGED BLOCK }}}
+use strict;
+
+use lib "/opt/rt3/local/lib";
+use lib "/opt/rt3/lib";
+
+use RT;
+use XML::Simple;
+
+RT::LoadConfig();
+RT::Init();
+
+my $LocalOnly = @ARGV ? shift(@ARGV) : 1;
+
+my %RV;
+my %Ignore = (
+    All => [qw(
+	id Created Creator LastUpdated LastUpdatedBy
+    )],
+    Templates => [qw(
+	TranslationOf
+    )],
+);
+
+my $SystemUserId = $RT::SystemUser->Id;
+my @classes = qw(
+    Users Groups Queues ScripActions ScripConditions
+    Templates Scrips ACL CustomFields
+);
+foreach my $class (@classes) {
+    require "RT/$class.pm";
+    my $objects = "RT::$class"->new($RT::SystemUser);
+    $objects->{find_disabled_rows} = 1;
+    $objects->UnLimit;
+
+    if ($class eq 'CustomFields') {
+        $objects->OrderByCols(
+            { FIELD => 'LookupType' },
+            { FIELD => 'SortOrder' },
+            { FIELD => 'Id' },
+        );
+    }
+    else {
+        $objects->OrderBy( FIELD => 'Id' );
+    }
+
+    if ($LocalOnly) {
+        next if $class eq 'ACL'; # XXX - would go into infinite loop - XXX
+	$objects->Limit( FIELD => 'LastUpdatedBy', OPERATOR => '!=', VALUE => $SystemUserId )
+	    unless $class eq 'Groups';
+	$objects->Limit( FIELD => 'Id', OPERATOR => '!=', VALUE => $SystemUserId )
+	    if $class eq 'Users';
+	$objects->Limit( FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined' )
+	    if $class eq 'Groups';
+    }
+
+    my %fields;
+    while (my $obj = $objects->Next) {
+	next if $obj->can('LastUpdatedBy') and $obj->LastUpdatedBy == $SystemUserId;
+
+	if (!%fields) {
+	    %fields = map { $_ => 1 } keys %{$obj->_ClassAccessible};
+	    delete @fields{
+		@{$Ignore{$class}||=[]},
+		@{$Ignore{All}||=[]},
+	    };
+	}
+
+	my $rv;
+	# next if $obj-> # skip default names
+	foreach my $field (sort keys %fields) {
+	    my $value = $obj->__Value($field);
+	    $rv->{$field} = $value if length($value);
+	}
+	delete $rv->{Disabled} unless $rv->{Disabled};
+
+	foreach my $record (map { /ACL/ ? 'ACE' : substr($_, 0, -1) } @classes) {
+	    foreach my $key (map "$record$_", ('', 'Id')) {
+		next unless exists $rv->{$key};
+		my $id = $rv->{$key} or next;
+		my $obj = "RT::$record"->new($RT::SystemUser);
+		$obj->LoadByCols( Id => $id ) or next;
+		$rv->{$key} = $obj->__Value('Name') || 0;
+	    }
+	}
+
+	if ($class eq 'Users' and defined $obj->Privileged) {
+	    $rv->{Privileged} = int($obj->Privileged);
+	}
+	elsif ($class eq 'CustomFields') {
+	    my $values = $obj->Values;
+	    while (my $value = $values->Next) {
+		push @{$rv->{Values}}, {
+		    map { ($_ => $value->__Value($_)) } qw(
+			Name Description SortOrder
+		    ),
+		};
+	    }
+	}
+
+	if (eval { require RT::Attributes; 1 }) {
+	    my $attributes = $obj->Attributes;
+	    while (my $attribute = $attributes->Next) {
+		my $content = $attribute->Content;
+		$rv->{Attributes}{$attribute->Name} = $content if length($content);
+	    }
+	}
+
+	push @{$RV{$class}}, $rv;
+    }
+}
+
+print(<< ".");
+no strict; use XML::Simple; *_ = XMLin(do { local \$/; readline(DATA) }, ForceArray => [qw(
+ @classes Values
+)], NoAttr => 1, SuppressEmpty => ''); *\$_ = (\$_{\$_} || []) for keys \%_; 1; # vim: ft=xml
+__DATA__
+.
+
+print XMLout(
+    { map { ($_ => ($RV{$_} || [])) } @classes },
+    RootName => 'InitialData',
+    NoAttr => 1,
+    SuppressEmpty => '',
+    XMLDecl => '<?xml version="1.0" encoding="UTF-8"?>',
+);
diff --git a/rt/sbin/rt-dump-database.in b/rt/sbin/rt-dump-database.in
index 734e00b77..10670a2e8 100755
--- a/rt/sbin/rt-dump-database.in
+++ b/rt/sbin/rt-dump-database.in
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in
index ea6b9d154..f978d7b8b 100644
--- a/rt/sbin/rt-test-dependencies.in
+++ b/rt/sbin/rt-test-dependencies.in
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -116,6 +116,7 @@ $args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
   sub conclude {
     if ($any_missing) {
       print "\nSOMETHING WAS MISSING!\n";
+      exit 1;
     } else {
       print "\nEverything was found.\n";
     }
@@ -175,7 +176,7 @@ Digest::MD5 2.27
 DBI 1.37
 Class::ReturnValue 0.40
 Date::Format
-DBIx::SearchBuilder 1.50
+DBIx::SearchBuilder 1.53
 Text::Template
 File::Spec 0.8
 HTML::Entities 
@@ -201,6 +202,7 @@ Cache::Simple::TimedExpiry
 UNIVERSAL::require
 Calendar::Simple
 CSS::Squish 0.06
+Devel::StackTrace 1.19
 .
 
 $deps{'MASON'} = [ text_to_hash( << '.') ];
@@ -272,7 +274,7 @@ Apache::DBI 0.92
 .
 
 $deps{'MODPERL2'} = [ text_to_hash( << '.') ];
-CGI 2.92
+CGI 3.10
 Apache::DBI
 HTML::Mason 1.31
 .