[Collab-qa-commits] r553 - svnbuildstat/trunk/lib/SvnBuildStat/Controller
goneri-guest at alioth.debian.org
goneri-guest at alioth.debian.org
Tue Dec 4 22:43:09 UTC 2007
Author: goneri-guest
Date: 2007-12-04 22:43:09 +0000 (Tue, 04 Dec 2007)
New Revision: 553
Modified:
svnbuildstat/trunk/lib/SvnBuildStat/Controller/Builds.pm
svnbuildstat/trunk/lib/SvnBuildStat/Controller/Contacts.pm
svnbuildstat/trunk/lib/SvnBuildStat/Controller/Logs.pm
svnbuildstat/trunk/lib/SvnBuildStat/Controller/Maintainers.pm
svnbuildstat/trunk/lib/SvnBuildStat/Controller/Packages.pm
svnbuildstat/trunk/lib/SvnBuildStat/Controller/Repositorys.pm
svnbuildstat/trunk/lib/SvnBuildStat/Controller/Root.pm
Log:
remove the WWW from the module path
Modified: svnbuildstat/trunk/lib/SvnBuildStat/Controller/Builds.pm
===================================================================
--- svnbuildstat/trunk/lib/SvnBuildStat/Controller/Builds.pm 2007-12-04 22:40:46 UTC (rev 552)
+++ svnbuildstat/trunk/lib/SvnBuildStat/Controller/Builds.pm 2007-12-04 22:43:09 UTC (rev 553)
@@ -1,4 +1,4 @@
-package SvnBuildStat::WWW::Controller::Builds;
+package SvnBuildStat::Controller::Builds;
use strict;
use warnings;
@@ -6,7 +6,7 @@
=head1 NAME
-SvnBuildStat::WWW::Controller::Packages - Catalyst Controller
+SvnBuildStat::Controller::Packages - Catalyst Controller
=head1 DESCRIPTION
Modified: svnbuildstat/trunk/lib/SvnBuildStat/Controller/Contacts.pm
===================================================================
--- svnbuildstat/trunk/lib/SvnBuildStat/Controller/Contacts.pm 2007-12-04 22:40:46 UTC (rev 552)
+++ svnbuildstat/trunk/lib/SvnBuildStat/Controller/Contacts.pm 2007-12-04 22:43:09 UTC (rev 553)
@@ -1,4 +1,4 @@
-package SvnBuildStat::WWW::Controller::Contacts;
+package SvnBuildStat::Controller::Contacts;
use strict;
use warnings;
@@ -6,7 +6,7 @@
=head1 NAME
-SvnBuildStat::WWW::Controller::Packages - Catalyst Controller
+SvnBuildStat::Controller::Packages - Catalyst Controller
=head1 DESCRIPTION
Modified: svnbuildstat/trunk/lib/SvnBuildStat/Controller/Logs.pm
===================================================================
--- svnbuildstat/trunk/lib/SvnBuildStat/Controller/Logs.pm 2007-12-04 22:40:46 UTC (rev 552)
+++ svnbuildstat/trunk/lib/SvnBuildStat/Controller/Logs.pm 2007-12-04 22:43:09 UTC (rev 553)
@@ -1,4 +1,4 @@
-package SvnBuildStat::WWW::Controller::Logs;
+package SvnBuildStat::Controller::Logs;
use strict;
use warnings;
@@ -6,7 +6,7 @@
=head1 NAME
-SvnBuildStat::WWW::Controller::Packages - Catalyst Controller
+SvnBuildStat::Controller::Packages - Catalyst Controller
=head1 DESCRIPTION
@@ -36,7 +36,7 @@
return;
}
- my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({id => $build_id})->first;
+ my $build = $c->model('SvnBuildStat::Model::DB::Build')->search({id => $build_id})->first;
if (!$build) {
$c->response->redirect($c->uri_for('/'));
return;
@@ -78,7 +78,7 @@
return;
}
- my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({id => $build_id})->first;
+ my $build = $c->model('SvnBuildStat::Model::DB::Build')->search({id => $build_id})->first;
if (!$build) {
$c->response->redirect($c->uri_for('/'));
return;
Modified: svnbuildstat/trunk/lib/SvnBuildStat/Controller/Maintainers.pm
===================================================================
--- svnbuildstat/trunk/lib/SvnBuildStat/Controller/Maintainers.pm 2007-12-04 22:40:46 UTC (rev 552)
+++ svnbuildstat/trunk/lib/SvnBuildStat/Controller/Maintainers.pm 2007-12-04 22:43:09 UTC (rev 553)
@@ -1,4 +1,4 @@
-package SvnBuildStat::WWW::Controller::Maintainers;
+package SvnBuildStat::Controller::Maintainers;
use strict;
use warnings;
@@ -6,7 +6,7 @@
=head1 NAME
-SvnBuildStat::WWW::Controller::Packages - Catalyst Controller
+SvnBuildStat::Controller::Packages - Catalyst Controller
=head1 DESCRIPTION
@@ -34,7 +34,7 @@
my $repository_rs;
my $maintainer;
- $c->stash->{maintainers} = [ $c->model('SvnBuildStat::WWW::Model::DB::Maintainer')->search(undef,{order_by=>"name"}) ];
+ $c->stash->{maintainers} = [ $c->model('SvnBuildStat::Model::DB::Maintainer')->search(undef,{order_by=>"name"}) ];
$c->stash->{template} = 'maintainers/main.tt2';
@@ -45,7 +45,7 @@
# Retrieve all of the book records as book model objects and store in the
# stash where they can be accessed by the TT template
- my $package = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search({name => $name})->first;
+ my $package = $c->model('SvnBuildStat::Model::DB::Package')->search({name => $name})->first;
Modified: svnbuildstat/trunk/lib/SvnBuildStat/Controller/Packages.pm
===================================================================
--- svnbuildstat/trunk/lib/SvnBuildStat/Controller/Packages.pm 2007-12-04 22:40:46 UTC (rev 552)
+++ svnbuildstat/trunk/lib/SvnBuildStat/Controller/Packages.pm 2007-12-04 22:43:09 UTC (rev 553)
@@ -1,4 +1,4 @@
-package SvnBuildStat::WWW::Controller::Packages;
+package SvnBuildStat::Controller::Packages;
use strict;
use warnings;
@@ -6,7 +6,7 @@
=head1 NAME
-SvnBuildStat::WWW::Controller::Packages - Catalyst Controller
+SvnBuildStat::Controller::Packages - Catalyst Controller
=head1 DESCRIPTION
@@ -55,21 +55,21 @@
##
# people view
if ($param =~ /\@/) {
- $maintainer = $c->model('SvnBuildStat::WWW::Model::DB::Maintainer')->search({email => $param})->first;
+ $maintainer = $c->model('SvnBuildStat::Model::DB::Maintainer')->search({email => $param})->first;
$c->stash->{maintainer} = $maintainer;
- my $packagemaintainer_rs = $c->model('SvnBuildStat::WWW::Model::DB::PackageMaintainer')->search({maintainer_id => $maintainer->id});
+ my $packagemaintainer_rs = $c->model('SvnBuildStat::Model::DB::PackageMaintainer')->search({maintainer_id => $maintainer->id});
my @package_id;
while (my $packagemaintainer = $packagemaintainer_rs->next) {
push @package_id, $packagemaintainer->package_id->id;
}
- $c->stash->{packages} = [ $c->model('SvnBuildStat::WWW::Model::DB::Viewpackage')->search({ package_id => { '-in' => \@package_id } },{order_by=>"name"}) ];
+ $c->stash->{packages} = [ $c->model('SvnBuildStat::Model::DB::Viewpackage')->search({ package_id => { '-in' => \@package_id } },{order_by=>"name"}) ];
##
# team view
} elsif ($param =~ /^\d+$/) {
- $c->stash->{maintainer} = $c->model('SvnBuildStat::WWW::Model::DB::Repository')->search({id => $param})->first;
- $c->stash->{packages} = [ $c->model('SvnBuildStat::WWW::Model::DB::Viewpackage')->search({ repository_id => $param },{order_by=>"name"}) ];
+ $c->stash->{maintainer} = $c->model('SvnBuildStat::Model::DB::Repository')->search({id => $param})->first;
+ $c->stash->{packages} = [ $c->model('SvnBuildStat::Model::DB::Viewpackage')->search({ repository_id => $param },{order_by=>"name"}) ];
} else { # I don't want to kill my server with too much request
$c->response->redirect($c->uri_for('/repositorys/list'));
return;
@@ -84,7 +84,7 @@
# Retrieve all of the book records as book model objects and store in the
# stash where they can be accessed by the TT template
- my $package = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search({name => $name})->first;
+ my $package = $c->model('SvnBuildStat::Model::DB::Package')->search({name => $name})->first;
if (!$package) {
$c->response->redirect($c->uri_for('/'));
return;
@@ -108,11 +108,11 @@
$c->stash->{currentchangelogentry} = \@currentchangelogentry;
$c->stash->{todo} = \@todo;
############ Maintainers list
- my $packagemaintainer_rs = $c->model('SvnBuildStat::WWW::Model::DB::PackageMaintainer')->search({package_id => $package->id});
+ my $packagemaintainer_rs = $c->model('SvnBuildStat::Model::DB::PackageMaintainer')->search({package_id => $package->id});
$c->stash->{maintainers} = [ $packagemaintainer_rs->search_related("maintainer_id")->all ];
#############
- my $bug_rs = $c->model('SvnBuildStat::WWW::Model::DB::Bug')->search(package_id => $package->id);
+ my $bug_rs = $c->model('SvnBuildStat::Model::DB::Bug')->search(package_id => $package->id);
while (my $bug = $bug_rs->next) {
my $bugerror;
my $bugwarning;
@@ -127,7 +127,7 @@
}
##########
-my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({package_id => $package->id},{order_by => "id DESC"})->first;
+my $build = $c->model('SvnBuildStat::Model::DB::Build')->search({package_id => $package->id},{order_by => "id DESC"})->first;
if ($build) {
foreach (split $/, $build->lintian_log) {
my $error;
@@ -145,7 +145,7 @@
}
##############
-my $build_rs = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({package_id => $package->id},{order_by => "id DESC"});
+my $build_rs = $c->model('SvnBuildStat::Model::DB::Build')->search({package_id => $package->id},{order_by => "id DESC"});
my $cpt;
while (($cpt++ < 10) && (my $build = $build_rs->next)) {
my $failedstep;
@@ -189,8 +189,8 @@
# WHERE package.blacklisted = false AND package.issrcinmypool = true AND (package.lastbuildstart IS NULL OR package.lastbuildstart < (now() - '03:00:00'::interval))
# ORDER BY build.id IS NOT NULL, build."time";
- my $package_id = $c->model('SvnBuildStat::WWW::Model::DB::Viewtobuild')->search({$arch => 'true' })->first->id;
- my $package = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({id => $package_id})->first;
+ my $package_id = $c->model('SvnBuildStat::Model::DB::Viewtobuild')->search({$arch => 'true' })->first->id;
+ my $package = $c->model('SvnBuildStat::Model::DB::Package')->search ({id => $package_id})->first;
$package->lastbuildstart('now');
@@ -210,14 +210,14 @@
return unless $qatoolname =~ /^\w+$/;
- my $qatool = $c->model('SvnBuildStat::WWW::Model::DB::Qatool')->search ({name => $qatoolname})->first;
+ my $qatool = $c->model('SvnBuildStat::Model::DB::Qatool')->search ({name => $qatoolname})->first;
return unless $qatool;
- my $package_id = $c->model('SvnBuildStat::WWW::Model::DB::Qaresult')->search({$ => 'true' })->first->id;
- my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search ({id => $package_id})->first;
+ my $package_id = $c->model('SvnBuildStat::Model::DB::Qaresult')->search({$ => 'true' })->first->id;
+ my $build = $c->model('SvnBuildStat::Model::DB::Build')->search ({id => $package_id})->first;
Modified: svnbuildstat/trunk/lib/SvnBuildStat/Controller/Repositorys.pm
===================================================================
--- svnbuildstat/trunk/lib/SvnBuildStat/Controller/Repositorys.pm 2007-12-04 22:40:46 UTC (rev 552)
+++ svnbuildstat/trunk/lib/SvnBuildStat/Controller/Repositorys.pm 2007-12-04 22:43:09 UTC (rev 553)
@@ -1,4 +1,4 @@
-package SvnBuildStat::WWW::Controller::Repositorys;
+package SvnBuildStat::Controller::Repositorys;
use strict;
use warnings;
@@ -6,7 +6,7 @@
=head1 NAME
-SvnBuildStat::WWW::Controller::Packages - Catalyst Controller
+SvnBuildStat::Controller::Packages - Catalyst Controller
=head1 DESCRIPTION
@@ -34,7 +34,7 @@
my $repository_rs;
my $maintainer;
- $c->stash->{repositorys} = [ $c->model('SvnBuildStat::WWW::Model::DB::Repository')->search(undef,{order_by=>"name"}) ];
+ $c->stash->{repositorys} = [ $c->model('SvnBuildStat::Model::DB::Repository')->search(undef,{order_by=>"name"}) ];
$c->stash->{template} = 'repositorys/main.tt2';
Modified: svnbuildstat/trunk/lib/SvnBuildStat/Controller/Root.pm
===================================================================
--- svnbuildstat/trunk/lib/SvnBuildStat/Controller/Root.pm 2007-12-04 22:40:46 UTC (rev 552)
+++ svnbuildstat/trunk/lib/SvnBuildStat/Controller/Root.pm 2007-12-04 22:43:09 UTC (rev 553)
@@ -1,4 +1,4 @@
-package SvnBuildStat::WWW::Controller::Root;
+package SvnBuildStat::Controller::Root;
use strict;
use warnings;
@@ -12,7 +12,7 @@
=head1 NAME
-SvnBuildStat::WWW::Controller::Root - Root Controller for SvnBuildStat::WWW
+SvnBuildStat::Controller::Root - Root Controller for SvnBuildStat
=head1 DESCRIPTION
More information about the Collab-qa-commits
mailing list