2 commits - java/buildconf satellite/setup-symlinks.sh web/modules web/spacewalk-web.spec
java/buildconf/build-webapp.xml | 3 satellite/setup-symlinks.sh | 1 web/modules/cypress/Changes | 5 web/modules/cypress/Cypress.pm | 23 --- web/modules/cypress/Cypress/Channel.pm | 54 -------- web/modules/cypress/Cypress/Package.pm | 102 --------------- web/modules/cypress/Cypress/Search.pm | 73 ----------- web/modules/cypress/Cypress/ServerActions.pm | 164 ------------------------- web/modules/cypress/Cypress/ServerGroupList.pm | 106 ---------------- web/modules/cypress/Cypress/Slashdot.pm | 67 ---------- web/modules/cypress/Cypress/User.pm | 73 ----------- web/modules/cypress/Cypress/UserActions.pm | 45 ------ web/modules/cypress/Cypress/UserGroupList.pm | 90 ------------- web/modules/cypress/MANIFEST | 19 -- web/modules/cypress/Makefile | 8 - web/modules/cypress/Makefile.PL | 24 --- web/modules/cypress/test.pl | 20 --- web/modules/grail/Grail/Canvas.pm | 33 ----- web/spacewalk-web.spec | 14 -- 19 files changed, 924 deletions(-)
New commits: commit 46d171a80c8b59350bb8b4dd39b178aa5b65ef83 Author: Jan Pazdziora jpazdziora@redhat.com Date: Tue Dec 22 15:47:38 2009 +0100
Drop spacewalk-cypress -- previous commit removed the last reference to Cypress.
diff --git a/java/buildconf/build-webapp.xml b/java/buildconf/build-webapp.xml index f931b06..cedc65c 100644 --- a/java/buildconf/build-webapp.xml +++ b/java/buildconf/build-webapp.xml @@ -168,8 +168,6 @@ <symlink link="/var/www/html" resource="${git.home}/web/html"/> <mkdir dir="/var/www/lib"/> <mkdir dir="/var/www/html/nav"/> - <symlink link="/var/www/lib/Cypress" - resource="${git.home}/web/modules/cypress/Cypress"/> <symlink link="/var/www/lib/Dobby" resource="${git.home}/web/modules/dobby/Dobby"/> <symlink link="/var/www/lib/Grail" resource="${git.home}/web/modules/grail/Grail"/> <symlink link="/var/www/lib/PXT" resource="${git.home}/web/modules/pxt/PXT"/> @@ -184,7 +182,6 @@
<target name="uninstall-web" description="Used to uninstall the perl side of spacewalk devel environment"> - <symlink action="delete" link="/var/www/lib/Cypress"/> <symlink action="delete" link="/var/www/lib/Dobby"/> <symlink action="delete" link="/var/www/lib/Grail"/> <symlink action="delete" link="/var/www/lib/PXT"/> diff --git a/satellite/setup-symlinks.sh b/satellite/setup-symlinks.sh index b7473fa..d9bbdac 100755 --- a/satellite/setup-symlinks.sh +++ b/satellite/setup-symlinks.sh @@ -124,7 +124,6 @@ chdir /var/www symlink $SVNDIR/eng/web/html
chdir /var/www/lib -symlink $SVNDIR/eng/web/modules/cypress/Cypress symlink $SVNDIR/eng/web/modules/dobby/Dobby symlink $SVNDIR/eng/web/modules/grail/Grail symlink $SVNDIR/eng/web/modules/rhn/RHN diff --git a/web/modules/cypress/Changes b/web/modules/cypress/Changes deleted file mode 100644 index 37c8f17..0000000 --- a/web/modules/cypress/Changes +++ /dev/null @@ -1,5 +0,0 @@ -Revision history for Perl extension Cypress. - -0.01 Mon Apr 23 17:29:56 2001 - - original version; created by h2xs 1.19 - diff --git a/web/modules/cypress/Cypress.pm b/web/modules/cypress/Cypress.pm deleted file mode 100644 index fd570fd..0000000 --- a/web/modules/cypress/Cypress.pm +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -# stub module, mainly for $VERSION and any C stuff for later -package Cypress; - -use strict; - -our $VERSION = '0.01'; - -1; diff --git a/web/modules/cypress/Cypress/Channel.pm b/web/modules/cypress/Cypress/Channel.pm deleted file mode 100644 index 7d0003d..0000000 --- a/web/modules/cypress/Cypress/Channel.pm +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::Channel; -use Grail::Component; - -@Cypress::Channel::ISA = qw/Grail::Component/; - -my @component_modes = - ( - [ 'package_list', 'package_list', undef, undef ] - ); - -sub component_modes { - return @component_modes; -} - -sub package_list { - my $self = shift; - my $pxt = shift; - - $pxt->context(package_installable_list_view_mode => 'channel'); - $pxt->context(package_installable_list_view_mode_param => $pxt->param('cid')); - - # put this in a pxi? - my $channel = RHN::Channel->lookup(-id => $pxt->param('cid')); - my $channel_name = $channel->name; - - my $header = <<EOH; -<table width="100%" border="0" cellspacing="0" cellpadding="6"> - <tr> - <td class="redbar" align="left">Channel Packages for $channel_name</td> - <td class="redbar" align="right"><a href="/help/basic/sm-channels-packages.html#SM-CHANNEL-LIST"><img src="/img/icon_help.gif" border="0"></a></td> - </tr> -</table> -EOH - - return $header . $pxt->include('/network/components/packages/installable_package_list.pxi'); -} - -1; diff --git a/web/modules/cypress/Cypress/Package.pm b/web/modules/cypress/Cypress/Package.pm deleted file mode 100644 index 04f6188..0000000 --- a/web/modules/cypress/Cypress/Package.pm +++ /dev/null @@ -1,102 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::Package; -use Grail::Component; - -@Cypress::Package::ISA = qw/Grail::Component/; - - -# the search modes ought to be pushed to the search component i think... -my @component_modes = - ( - - # this segment is where I'm starting to do the newer, better Cypress coding -# [ 'details', 'details', undef, undef ], -# [ 'dependencies', 'dependencies', undef, undef ], -# [ 'change_log', 'change_log', undef, undef ], -# [ 'file_list', 'file_list', undef, undef ], -# [ 'system_list', 'system_list', undef, undef ], - - - # older stuff that should eventually be pushed to other components - [ 'package_list', 'package_list', undef, undef ], - [ 'package_installable_search_list', 'package_installable_search_list', undef, undef ], - [ 'package_installable_list', 'package_installable_list', undef, undef ], -# [ 'package_installable_list_no_search', 'package_installable_list_no_search', undef, undef ], - [ 'package_removable_list', 'package_removable_list', undef, undef ], - [ 'package_removal_search_list', 'package_removal_search_list', undef, undef ] - ); - -sub component_modes { - return @component_modes; -} - - -sub package_list { - my $self = shift; - my $pxt = shift; - - return $pxt->include('/network/components/packages/package_list.pxi'); -} - -sub package_installable_search_list { - my $self = shift; - my $pxt = shift; - - $pxt->context(package_installable_list_view_mode => 'search_set'); - $pxt->context(package_installable_list_view_mode_param => 'package_install_search'); - return $pxt->include('/network/components/packages/installable_package_list.pxi'); -} - -sub package_installable_list { - my $self = shift; - my $pxt = shift; - - $pxt->context(package_installable_list_view_mode => 'set'); - $pxt->context(package_installable_list_view_mode_param => 'package_installable_list'); - return $pxt->include('/network/components/packages/installable_package_list.pxi'); -} - -#sub package_installable_list_no_search { -# my $self = shift; -# my $pxt = shift; -# -# $pxt->context(package_installable_list_view_no_search => 1); -# $pxt->context(package_installable_list_view_mode => 'set'); -# $pxt->context(package_installable_list_view_mode_param => 'package_installable_list'); -# return $pxt->include('/network/components/packages/installable_package_list.pxi'); -#} - -sub package_removable_list { - my $self = shift; - my $pxt = shift; - - $pxt->context(package_removable_list_view_mode => 'set'); - $pxt->context(package_removable_list_view_mode_param => 'package_removable_list'); - return $pxt->include('/network/components/packages/removable_package_list.pxi'); -} - -sub package_removal_search_list { - my $self = shift; - my $pxt = shift; - - $pxt->context(package_removable_list_view_mode => 'search_set'); - $pxt->context(package_removable_list_view_mode_param => 'package_removal_search'); - return $pxt->include('/network/components/packages/removable_package_list.pxi'); -} - -1; diff --git a/web/modules/cypress/Cypress/Search.pm b/web/modules/cypress/Cypress/Search.pm deleted file mode 100644 index a71a3fc..0000000 --- a/web/modules/cypress/Cypress/Search.pm +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::Search; -use Grail::Component; - -@Cypress::Search::ISA = qw/Grail::Component/; - -# sigh. because of the stuff we're doing w/ parameters, there's almost no sense -# in having multiple modes. :( -my @component_modes = - ( - [ 'server_search', 'server_search', undef, undef ], - [ 'user_search', 'user_search', undef, undef ], - [ 'package_install_search', 'package_install_search', undef, undef ], - [ 'package_removal_search', 'package_removal_search', undef, undef ], -# [ 'errata_search', 'errata_search', undef, undef ], - ); - -sub component_modes { - return @component_modes; -} - -sub server_search { - my $self = shift; - my $pxt = shift; - - return $pxt->include('/network/components/search/server_search.pxi'); -} - -sub user_search { - my $self = shift; - my $pxt = shift; - - return $pxt->include('/network/components/search/user_search.pxi'); -} - -sub package_install_search { - my $self = shift; - my $pxt = shift; - - return $pxt->include('/network/components/search/package_install_search.pxi'); -} - -sub package_removal_search { - my $self = shift; - my $pxt = shift; - - return $pxt->include('/network/components/search/package_removal_search.pxi'); -} - - -#sub errata_search { -# my $self = shift; -# my $pxt = shift; -# -# return $pxt->include('/network/components/search/errata_search.pxi'); -#} - -1; diff --git a/web/modules/cypress/Cypress/ServerActions.pm b/web/modules/cypress/Cypress/ServerActions.pm deleted file mode 100644 index 7270c72..0000000 --- a/web/modules/cypress/Cypress/ServerActions.pm +++ /dev/null @@ -1,164 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::ServerActions; -use Grail::Component; - -use Carp; - -@Cypress::ServerActions::ISA = qw/Grail::Component/; - -my @component_modes = - ( - [ 'servergroup_add_remove', 'add_remove_servers_to_groups', undef, undef ], - [ 'system_set_package_set_actions', 'system_set_package_set_actions', undef, undef], - [ 'system_set_errata_set_actions', 'system_set_errata_set_actions', undef, undef], - [ 'package_install_details', 'package_install_details', undef, undef ], - [ 'package_install_package_list', 'package_install_package_list', undef, undef ], - [ 'package_install_system_list', 'package_install_system_list', undef, undef ], - [ 'package_removal_details', 'package_removal_details', undef, undef ], - [ 'package_removal_package_list', 'package_removal_package_list', undef, undef ], - [ 'package_removal_system_list', 'package_removal_system_list', undef, undef ], - [ 'errata_update_details', 'errata_update_details', undef, undef ], - [ 'errata_update_errata_list', 'errata_update_errata_list', undef, undef ], - [ 'errata_update_system_list', 'errata_update_system_list', undef, undef ] - ); - -sub component_modes { - return @component_modes; -} - -sub add_remove_servers_to_groups { - my $self = shift; - my $pxt = shift; - - my $user = $pxt->user; - - # what are the rules about adding/removing servers to a group? - croak "attempt to add/remove servers from servergroups by a non-orgadmin " unless $user->is('org_admin'); - - return $pxt->include('/network/components/systemactions/system_set_group_assign.pxi'); -} - -# speedy interface when you have a set of systems and a set of packages... -sub system_set_package_set_actions { - my $self = shift; - my $pxt = shift; - - # hrm. what priviledge checking should we do here? - - return $pxt->include('/network/components/systemactions/system_set_package_set_actions.pxi'); -} - -# speedy interface when you have a set of systems and a set of packages... -sub system_set_errata_set_actions { - my $self = shift; - my $pxt = shift; - - # hrm. what priviledge checking should we do here? - - return $pxt->include('/network/components/systemactions/system_set_errata_set_actions.pxi'); -} - -sub package_install_details { - my $self = shift; - my $pxt = shift; - - - return $pxt->include('/network/components/systemactions/package_install_details.pxi'); -} - -sub package_install_package_list { - my $self = shift; - my $pxt = shift; - - # faking out the ServerList sniglet. woot! - $pxt->context(package_installable_list_view_mode => 'install_action'); - $pxt->context(package_installable_list_view_mode_param => $pxt->param('aid')); - return $pxt->include('/network/components/systemactions/package_install_package_list.pxi'); -} - -sub package_install_system_list { - my $self = shift; - my $pxt = shift; - - # faking out the ServerList sniglet. woot! - $pxt->context(system_list_view_mode => 'action'); - $pxt->context(system_list_view_mode_param => $pxt->param('aid')); - - return $pxt->include('/network/components/systemactions/package_install_system_list.pxi'); -} - -sub package_removal_details { - my $self = shift; - my $pxt = shift; - - - return $pxt->include('/network/components/systemactions/package_removal_details.pxi'); -} - -sub package_removal_package_list { - my $self = shift; - my $pxt = shift; - - # faking out the ServerList sniglet. woot! - $pxt->context(package_removable_list_view_mode => 'remove_action'); - $pxt->context(package_removable_list_view_mode_param => $pxt->param('aid')); - return $pxt->include('/network/components/systemactions/package_removal_package_list.pxi'); -} - -sub package_removal_system_list { - my $self = shift; - my $pxt = shift; - - # faking out the ServerList sniglet. woot! - $pxt->context(system_list_view_mode => 'action'); - $pxt->context(system_list_view_mode_param => $pxt->param('aid')); - - return $pxt->include('/network/components/systemactions/package_removal_system_list.pxi'); -} - -sub errata_update_details { - my $self = shift; - my $pxt = shift; - - - return $pxt->include('/network/components/systemactions/errata_update_details.pxi'); -} - -sub errata_update_errata_list { - my $self = shift; - my $pxt = shift; - - $pxt->context(errata_list_view_mode => 'action'); - $pxt->context(errata_list_view_mode_param => $pxt->param('aid')); - - #return $pxt->include('/network/components/errata/errata_list.pxi'); - return $pxt->include('/network/components/systemactions/errata_update_errata_list.pxi'); -} - -sub errata_update_system_list { - my $self = shift; - my $pxt = shift; - - # faking out the ServerList sniglet. woot! - $pxt->context(system_list_view_mode => 'action'); - $pxt->context(system_list_view_mode_param => $pxt->param('aid')); - - return $pxt->include('/network/components/systemactions/errata_update_system_list.pxi'); -} - -1; diff --git a/web/modules/cypress/Cypress/ServerGroupList.pm b/web/modules/cypress/Cypress/ServerGroupList.pm deleted file mode 100644 index 8120c50..0000000 --- a/web/modules/cypress/Cypress/ServerGroupList.pm +++ /dev/null @@ -1,106 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::ServerGroupList; -use Grail::Component; - -@Cypress::ServerGroupList::ISA = qw/Grail::Component/; - -my @component_modes = - ( - [ 'sgroups_in_org_full', 'sgroups_in_org_full', undef, undef ], - [ 'sgroups_in_org_partial', 'sgroups_in_org_partial', 'System Group List Summary', undef ], - [ 'groups_for_a_server', 'groups_for_a_server', undef, undef ], - [ 'groups_for_a_user_group', 'groups_for_a_user_group', undef, undef ], - [ 'groups_for_a_user', 'groups_for_a_user', undef, undef ], - [ 'sgroups_in_org_no_header', 'sgroups_in_org_no_header', undef, undef], - [ 'sgroups_set_no_header', 'sgroups_set_no_header', undef, undef] - ); - -sub component_modes { - return @component_modes; -} - -sub groups_for_a_user_group { - my $self = shift; - my $pxt = shift; - - $pxt->context(server_group_list_view_mode => 'ugroup'); - $pxt->context(server_group_list_view_mode_param => $pxt->param('ugid')); - return $pxt->include('/network/components/systemgroups/system_group_list_no_header.pxi'); -} - -sub sgroups_set_no_header { - my $self = shift; - my $pxt = shift; - - $pxt->context(server_group_list_view_mode => 'set'); - $pxt->context(server_group_list_view_mode_param => 'server_group_list'); - return $pxt->include('/network/components/systemgroups/system_group_list_no_header.pxi'); -} - -sub groups_for_a_user { - my $self = shift; - my $pxt = shift; - - $pxt->context(server_group_list_view_mode => 'user'); - $pxt->context(server_group_list_view_mode_param => $pxt->param('uid')); - return $pxt->include('/network/components/systemgroups/system_group_list_no_header.pxi'); -} - -sub sgroups_in_org_no_header { - my $self = shift; - my $pxt = shift; - - return $pxt->include('/network/components/systemgroups/system_group_list_no_header.pxi'); -} - -sub sgroups_in_org_full { - my $self = shift; - my $pxt = shift; - - return guts($pxt); -} - -sub sgroups_in_org_partial { - my $self = shift; - my $pxt = shift; - - # this is going to the ServerList sniglet... - $pxt->context(server_group_lower => 1); - $pxt->context(server_group_upper => 5); - - return windowed_guts($pxt); -} - -sub groups_for_a_server { - my $self = shift; - my $pxt = shift; - - return guts($pxt); -} - -sub guts { - my $pxt = shift; - return $pxt->include("/network/components/systemgroups/system_group_list.pxi"); -} - -sub windowed_guts { - my $pxt = shift; - return $pxt->include("/network/components/systemgroups/system_group_list_partial.pxi"); -} - -1; diff --git a/web/modules/cypress/Cypress/Slashdot.pm b/web/modules/cypress/Cypress/Slashdot.pm deleted file mode 100644 index 208380a..0000000 --- a/web/modules/cypress/Cypress/Slashdot.pm +++ /dev/null @@ -1,67 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::Slashdot; -use Grail::Component; - -use LWP::UserAgent; -use HTTP::Request; - -@Cypress::Slashdot::ISA = qw/Grail::Component/; - -my @component_modes = - ( - [ 'nav_canvas', 'slashdot_headlines', 'Slashdot Headlines', undef ], - [ 'main_canvas_partial', 'slashdot_headlines', 'Slashdot Headlines', undef ], - ); - -sub component_modes { - return @component_modes; -} - -sub slashdot_headlines { - my $self = shift; - my $pxt = shift; - my %params = @_; - my $num = $params{num} || 100; - - my $ua = new LWP::UserAgent; - my $req = new HTTP::Request GET => "http://minbar.devel.redhat.com/network/slashdot.rdf"; - my $response = $ua->request($req); - - if ($response->is_success) { - my $rdf = $response->content; - - my @bullets; - my @items = $rdf =~ m(<item>(.*?)</item>)gsm; - - $#items = $num - 1 if $#items > $num - 1; - - foreach my $item (@items) { - my ($title) = $item =~ m(<title>(.*?)</title>)gms; - my ($link) = $item =~ m(<link>(.*?)</link>)gms; - - push @bullets, qq{<A HREF="$link">$title</A>}; - } - - return "<UL>" . join("", map { "<LI>$_</LI>\n" } @bullets) . "</UL>"; - } - else { - return "<pre>Error reading from slashdot: " . $response->status_line . "</pre>\n"; - } -} - -1; diff --git a/web/modules/cypress/Cypress/User.pm b/web/modules/cypress/Cypress/User.pm deleted file mode 100644 index bb95993..0000000 --- a/web/modules/cypress/Cypress/User.pm +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::User; -use Grail::Component; - -@Cypress::User::ISA = qw/Grail::Component/; - -my @component_modes = - ( - - # revised modes: - [ 'need_more_info', 'need_more_info', undef, undef ], - - [ 'user_search', 'user_search', undef, undef ], - [ 'selection_list', 'selection_list', undef, undef ] - ); - -sub component_modes { - return @component_modes; -} - -sub check_access_or_die { - my $pxt = shift; - - my $user = $pxt->user; - if(!$user->is('org_admin') and $pxt->param('uid') and $user->id != $pxt->param('uid')) { - die "Insufficinet access rights"; - } -} - -sub need_more_info { - my $self = shift; - my $pxt = shift; - - check_access_or_die($pxt); - - $pxt->redirect('/network/user/user_addresses.pxt?uid=' . $pxt->user->id); -} - - -sub selection_list { - my $self = shift; - my $pxt = shift; - - return '' unless $pxt->user; - - return $pxt->include('/network/components/user/user_selections.pxi') . $pxt->include('/network/components/user/recent_wizards.pxi'); - - #return "Current Selections:<br><ul>" . join("", map { exists $pretty{$_->[0]} ? "<li>$_->[1] $pretty{$_->[0]}</li>" : () } $pxt->user->selection_details) . "</ul>"; -} - -sub user_search { - my $self = shift; - my $pxt = shift; - - return $pxt->include('/network/components/search/user_search.pxi'); -} - -1; diff --git a/web/modules/cypress/Cypress/UserActions.pm b/web/modules/cypress/Cypress/UserActions.pm deleted file mode 100644 index 6d44599..0000000 --- a/web/modules/cypress/Cypress/UserActions.pm +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::UserActions; -use Grail::Component; - -use Carp; - -@Cypress::UserActions::ISA = qw/Grail::Component/; - -my @component_modes = - ( - [ 'usergroup_add_remove', 'add_remove_to_groups', undef, undef ] - ); - -sub component_modes { - return @component_modes; -} - -sub add_remove_to_groups { - my $self = shift; - my $pxt = shift; - - my $user = $pxt->user; - - # what are the rules about adding/removing servers to a group? - croak "attempt to add/remove users from usergroups by a non-orgadmin " unless $user->is('org_admin'); - - return $pxt->include('/network/components/useractions/user_set_group_assign.pxi'); -} - -1; diff --git a/web/modules/cypress/Cypress/UserGroupList.pm b/web/modules/cypress/Cypress/UserGroupList.pm deleted file mode 100644 index 16f789b..0000000 --- a/web/modules/cypress/Cypress/UserGroupList.pm +++ /dev/null @@ -1,90 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; -package Cypress::UserGroupList; -use Grail::Component; - -@Cypress::UserGroupList::ISA = qw/Grail::Component/; - -my @component_modes = - ( - [ 'user_group_list', 'ugroups_in_org', undef, undef ], - [ 'user_group_list_windowed', 'ugroups_in_org_partial', 'User Group List Summary', undef ], - [ 'groups_for_a_user', 'groups_for_a_user', undef, undef ], - [ 'ugroups_in_org_no_header', 'ugroups_in_org_no_header', undef, undef], - [ 'ugroups_set_no_header', 'ugroups_set_no_header', undef, undef] - ); - -sub component_modes { - return @component_modes; -} - -sub ugroups_set_no_header { - my $self = shift; - my $pxt = shift; - - $pxt->context(user_group_list_view_mode => 'set'); - $pxt->context(user_group_list_view_mode_param => 'user_group_list'); - return $pxt->include('/network/components/usergroups/user_group_list_no_header.pxi'); -} - -sub ugroups_in_org_no_header { - my $self = shift; - my $pxt = shift; - - return $pxt->include('/network/components/usergroups/user_group_list_no_header.pxi'); -} - - -sub ugroups_in_org { - my $self = shift; - my $pxt = shift; - - return guts($pxt); -} - -sub ugroups_in_org_partial { - my $self = shift; - my $pxt = shift; - - # this is going to the UserList sniglet... - $pxt->context(user_group_lower => 1); - $pxt->context(user_group_upper => 5); - - return windowed_guts($pxt); -} - -sub groups_for_a_user { - my $self = shift; - my $pxt = shift; - - $pxt->context(user_group_list_view_mode => 'user'); - $pxt->context(user_group_list_view_mode_param => $pxt->param('uid')); - return $pxt->include('/network/components/usergroups/user_group_list_no_header.pxi'); -} - - -sub guts { - my $pxt = shift; - return $pxt->include("/network/components/usergroups/user_group_list.pxi"); -} - -sub windowed_guts { - my $pxt = shift; - $pxt->include("/network/components/usergroups/user_group_list_partial.pxi"); -} - -1; diff --git a/web/modules/cypress/MANIFEST b/web/modules/cypress/MANIFEST deleted file mode 100644 index 4b8af2e..0000000 --- a/web/modules/cypress/MANIFEST +++ /dev/null @@ -1,19 +0,0 @@ -Changes -Makefile.PL -MANIFEST -test.pl -cypress.spec -Cypress/Alerts.pm -Cypress/Channel.pm -Cypress/Errata.pm -Cypress/EventsAndTraining.pm -Cypress/Package.pm -Cypress.pm -Cypress/RhnServices.pm -Cypress/Search.pm -Cypress/ServerActions.pm -Cypress/ServerGroupList.pm -Cypress/Slashdot.pm -Cypress/UserActions.pm -Cypress/UserGroupList.pm -Cypress/User.pm diff --git a/web/modules/cypress/Makefile b/web/modules/cypress/Makefile deleted file mode 100644 index 392f26c..0000000 --- a/web/modules/cypress/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# dummy Makefile for perl module -# -# $Id$ - -TOP = ../.. -export TOP - -include $(TOP)/Makefile.defs diff --git a/web/modules/cypress/Makefile.PL b/web/modules/cypress/Makefile.PL deleted file mode 100644 index 3101155..0000000 --- a/web/modules/cypress/Makefile.PL +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl -# perl makefile for the cypress module -# -# $Id$ - -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile that is written. - -my $file = qx|ls $ENV{'TOP'}/*.spec|; -chomp $file; -my $version = qx|grep '^Version: ' $file|; -chomp $version; -$version = (split /\s*:\s*/, $version)[-1]; - -die "No version or name from $file spec" unless $version; - -WriteMakefile('NAME' => "Cypress", - 'VERSION' => $version, - 'LIBS' => [''], # e.g., '-lm' - 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' - 'INC' => '', # e.g., '-I/usr/include/other' - 'MAKEFILE' => "Makefile.perl", # the name of the output Makefile file -); diff --git a/web/modules/cypress/test.pl b/web/modules/cypress/test.pl deleted file mode 100644 index b897f20..0000000 --- a/web/modules/cypress/test.pl +++ /dev/null @@ -1,20 +0,0 @@ -# Before `make install' is performed this script should be runnable with -# `make test'. After `make install' it should work as `perl test.pl' - -######################### We start with some black magic to print on failure. - -# Change 1..1 below to 1..last_test_to_print . -# (It may become useful if the test is moved to ./t subdirectory.) - -BEGIN { $| = 1; print "1..1\n"; } -END {print "not ok 1\n" unless $loaded;} -use Cypress; -$loaded = 1; -print "ok 1\n"; - -######################### End of black magic. - -# Insert your test code below (better if it prints "ok 13" -# (correspondingly "not ok 13") depending on the success of chunk 13 -# of the test code): - diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 0e7db68..12dfd18 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -68,15 +68,6 @@ Dobby is collection of perl modules and scripts to administer an Oracle database.
-%package -n spacewalk-cypress -Summary: Cypress, a collection of Grail applications for Red Hat Network -Group: Applications/Internet -Obsoletes: rhn-cypress < 5.3.0 -Provides: rhn-cypress = 5.3.0 - -%description -n spacewalk-cypress -Cypress is a collection of Components for Grail. - %package -n spacewalk-grail Summary: Grail, a component framework for Red Hat Network Requires: spacewalk-base @@ -253,11 +244,6 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorlib}/PXT/Config.pm %attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_web.conf
-%files -n spacewalk-cypress -%defattr(644,root,root,755) -%{perl_vendorlib}/Cypress.pm -%{perl_vendorlib}/Cypress/ - %files -n spacewalk-dobby %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/db-control
commit 827ff2e3e18040f355013d8054f281cdf7e27318 Author: Jan Pazdziora jpazdziora@redhat.com Date: Tue Dec 22 15:45:07 2009 +0100
Removing render_dynamic_canvas as only render_canvas is used in Grail::Frame.
diff --git a/web/modules/grail/Grail/Canvas.pm b/web/modules/grail/Grail/Canvas.pm index 533b3b4..e40c93b 100644 --- a/web/modules/grail/Grail/Canvas.pm +++ b/web/modules/grail/Grail/Canvas.pm @@ -25,7 +25,6 @@ use Carp; my @component_modes = ( [ 'render_canvas', 'render_canvas', undef, undef ], - [ 'render_dynamic_canvas', 'render_dynamic_canvas', undef, undef ] );
sub component_modes { @@ -81,38 +80,6 @@ sub render_canvas { return $self->render_components($pxt, $mode, $block, @components); }
-sub render_dynamic_canvas { - my $self = shift; - my $pxt = shift; - my $mode = shift; - my $block = shift; - - my @component_list; - if (not $pxt->user or $pxt->user->id < 0) { - @component_list = map { [ $_, $mode ] } qw/Cypress::Slashdot/; - } - else { - @component_list = RHN::Grail->components_for_user($pxt->user->id); - } - -# warn "Component list: " . Data::Dumper->Dump(@component_list); - - my @components; - foreach (@component_list) { - my $file = $_->[0]; - $file =~ s/::///g; - $file =~ /(.*)/; # clear taint, grr - $file = $1; - - require "$file.pm"; - - - push @components, [ $_->[0]->new(), $_->[1], [ ] ]; - } - - return $self->render_components($pxt, $mode, $block, @components); -} -
sub render_components { my $self = shift;
spacewalk-commits@lists.fedorahosted.org
-
Jan Pazdziora