Bug 192516: Moving the loose .pm files into the Bugzilla directory, where they belong. These files pre-date the Bugzilla directory, and would have gone there had it existed at the time. The four files in question were copied on the CVS server to preserve CVS history in the files. This checkin deletes them from the old location and modifies everything else to know where they are now.

r= myk, gerv
a= justdave

6 files changed, 22 insertions, 20 deletions

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 84979d3ea..9f0467bb7 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -26,7 +26,7 @@
 
 use strict;
 
-package Attachment;
+package Bugzilla::Attachment;
 
 # This module requires that its caller have said "require CGI.pl" to import
 # relevant functions from that script and its companion globals.pl.
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 94bd628e2..b1c2ea54d 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -20,12 +20,14 @@
 # Contributor(s): Dawn Endico    <endico@mozilla.org>
 #                 Terry Weissman <terry@mozilla.org>
 #                 Chris Yeh      <cyeh@bluemartini.com>
+#                 Bradley Baetz  <bbaetz@acm.org>
+#                 Dave Miller    <justdave@bugzilla.org>
 
-package Bug;
+package Bugzilla::Bug;
 
 use strict;
 
-use RelationSet;
+use Bugzilla::RelationSet;
 use vars qw($unconfirmedstate $legal_keywords @legal_platform
             @legal_priority @legal_severity @legal_opsys @legal_bugs_status
             @settable_resolution %components %versions %target_milestone
@@ -33,7 +35,7 @@ use vars qw($unconfirmedstate $legal_keywords @legal_platform
 
 use CGI::Carp qw(fatalsToBrowser);
 
-use Attachment;
+use Bugzilla::Attachment;
 use Bugzilla::Config;
 use Bugzilla::Constants;
 use Bugzilla::Flag;
@@ -190,7 +192,7 @@ sub initBug  {
       $self->{'qa_contact'} = undef;
   }
 
-  my $ccSet = new RelationSet;
+  my $ccSet = new Bugzilla::RelationSet;
   $ccSet->mergeFromDB("select who from cc where bug_id=$bug_id");
   my @cc = $ccSet->toArrayOfStrings();
   if (@cc) {
@@ -212,7 +214,7 @@ sub initBug  {
     }
   }
 
-  $self->{'attachments'} = Attachment::query($self->{bug_id});
+  $self->{'attachments'} = Bugzilla::Attachment::query($self->{bug_id});
 
   # The types of flags that can be set on this bug.
   # If none, no UI for setting flags will be displayed.
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 059667a08..fad3ad5d8 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -30,7 +30,7 @@ use strict;
 
 package Bugzilla::BugMail;
 
-use RelationSet;
+use Bugzilla::RelationSet;
 
 use Bugzilla::Config qw(:DEFAULT $datadir);
 use Bugzilla::Util;
@@ -166,7 +166,7 @@ sub ProcessOneBug($) {
     trick_taint($start);
     trick_taint($end);
 
-    my $ccSet = new RelationSet();
+    my $ccSet = new Bugzilla::RelationSet();
     $ccSet->mergeFromDB("SELECT who FROM cc WHERE bug_id = $id");
     $values{'cc'} = $ccSet->toString();
     
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 2052f9507..8c9a4befe 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -34,8 +34,7 @@ use Bugzilla::User;
 use Bugzilla::Config;
 use Bugzilla::Util;
 use Bugzilla::Error;
-
-use Attachment;
+use Bugzilla::Attachment;
 
 use constant TABLES_ALREADY_LOCKED => 1;
 
@@ -529,7 +528,7 @@ sub GetTarget {
     my $target = { 'exists' => 0 };
 
     if ($attach_id) {
-        $target->{'attachment'} = new Attachment($attach_id);
+        $target->{'attachment'} = new Bugzilla::Attachment($attach_id);
         if ($bug_id) {
             # Make sure the bug and attachment IDs correspond to each other
             # (i.e. this is the bug to which this attachment is attached).
diff --git a/Bugzilla/RelationSet.pm b/Bugzilla/RelationSet.pm
index f2f822fc4..628746352 100644
--- a/Bugzilla/RelationSet.pm
+++ b/Bugzilla/RelationSet.pm
@@ -31,15 +31,16 @@
 
 use strict;
 
-# Everything that uses RelationSet should already have globals.pl loaded
-# so we don't want to load it here.  Doing so causes a loop in Perl because
-# globals.pl turns around and does a 'use RelationSet'
+# XXX - mod_perl
+# Everything that uses Bugzilla::RelationSet should already have globals.pl
+# loaded so we don't want to load it here.  Doing so causes a loop in Perl
+# because globals.pl turns around and does a 'use Bugzilla::RelationSet'
 # See http://bugzilla.mozilla.org/show_bug.cgi?id=72862
-#require "globals.pl";
+#require "../globals.pl";
 
-package RelationSet;
+package Bugzilla::RelationSet;
 
-# create a new empty RelationSet
+# create a new empty Bugzilla::RelationSet
 #
 sub new {
   my $type = shift();
@@ -60,7 +61,7 @@ sub new {
     confess("invalid number of arguments");
   }
 
-  # bless as a RelationSet
+  # bless as a Bugzilla::RelationSet
   #
   return $self;
 }
@@ -81,7 +82,7 @@ sub generateSqlDeltas {
   my ( $self, # instance ptr to set representing the existing state
        $endState, # instance ptr to set representing the desired state
        $table, # table where these relations are kept
-       $invariantName, # column held const for a RelationSet (often "bug_id")
+       $invariantName, # column held const for a Bugzilla::RelationSet (often "bug_id")
        $invariantValue, # what to hold the above column constant at
        $columnName # the column which varies (often a userid)
      ) = @_;
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index f7be40ab3..20ce48050 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -27,7 +27,7 @@
 use strict;
 
 # Bundle the functions in this file together into the "Token" package.
-package Token;
+package Bugzilla::Token;
 
 use Bugzilla::Config;
 use Bugzilla::Error;