Menu
▾
▴
openinteract-commits — CVS updates for OpenInteract/SPOPS
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(381) |
Nov
(176) |
Dec
(310) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(334) |
Feb
(96) |
Mar
(149) |
Apr
(214) |
May
(120) |
Jun
(56) |
Jul
(10) |
Aug
(273) |
Sep
(182) |
Oct
(56) |
Nov
(125) |
Dec
(22) |
| 2003 |
Jan
(63) |
Feb
(181) |
Mar
(498) |
Apr
(433) |
May
(39) |
Jun
(512) |
Jul
(276) |
Aug
(156) |
Sep
(101) |
Oct
(66) |
Nov
(24) |
Dec
(161) |
| 2004 |
Jan
(1) |
Feb
(377) |
Mar
(68) |
Apr
(26) |
May
(107) |
Jun
(333) |
Jul
(13) |
Aug
|
Sep
(76) |
Oct
(88) |
Nov
(170) |
Dec
(91) |
| 2005 |
Jan
(52) |
Feb
(239) |
Mar
(402) |
Apr
(15) |
May
(2) |
Jun
(1) |
Jul
(13) |
Aug
|
Sep
(71) |
Oct
(34) |
Nov
|
Dec
|
| 2006 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(7) |
Oct
(2) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Salve J. N. <sj...@us...> - 2005-03-17 13:22:35
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16599/pkg/base_box Modified Files: Changes package.ini Log Message: Update package versions Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/Changes,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Changes 14 Mar 2005 02:12:48 -0000 1.21 --- Changes 17 Mar 2005 13:22:14 -0000 1.22 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package base_box. + 2.21 Thu Mar 17 08:05:13 EST 2005 + + Move hardcoded box titles into .msg files. + Update Norwegian I18N messages. + 2.20 Sun Mar 13 21:09:20 EST 2005 Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/package.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** package.ini 14 Mar 2005 02:12:48 -0000 1.3 --- package.ini 17 Mar 2005 13:22:15 -0000 1.4 *************** *** 1,5 **** [package] name = base_box ! version = 2.20 author = Chris Winters <ch...@cw...> url = http://www.openinteract.org/ --- 1,5 ---- [package] name = base_box ! version = 2.21 author = Chris Winters <ch...@cw...> url = http://www.openinteract.org/ |
|
From: Salve J. N. <sj...@us...> - 2005-03-17 13:03:40
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_group/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12882/pkg/base_group/OpenInteract2/Action Modified Files: Group.pm Log Message: - Give correct error message when add user fails - Add a couple of Norwegian I18N messages Index: Group.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_group/OpenInteract2/Action/Group.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Group.pm 5 Dec 2004 08:51:19 -0000 1.10 --- Group.pm 17 Mar 2005 13:03:23 -0000 1.11 *************** *** 159,163 **** if ( $@ ) { $log->error( "Error adding users to group: $@" ); ! $self->add_error_key( 'base_group.error.failed_member_remove', $@ ); die $self->execute({ task => 'display_form' }), "\n"; } --- 159,163 ---- if ( $@ ) { $log->error( "Error adding users to group: $@" ); ! $self->add_error_key( 'base_group.error.failed_member_add', $@ ); die $self->execute({ task => 'display_form' }), "\n"; } |
|
From: Salve J. N. <sj...@us...> - 2005-03-17 13:03:40
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_group/msg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12882/pkg/base_group/msg Modified Files: base_group-messages-no.msg base_group-messages-en.msg Log Message: - Give correct error message when add user fails - Add a couple of Norwegian I18N messages Index: base_group-messages-no.msg =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_group/msg/base_group-messages-no.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** base_group-messages-no.msg 9 Nov 2004 12:29:21 -0000 1.1 --- base_group-messages-no.msg 17 Mar 2005 13:03:23 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + # Contact: Salve J. Nilsen <sa...@me...> base_group.detail.page_title = Detaljer for gruppe [_1] base_group.detail.edit_record = <a href="[_1]">Endre</a> denne oppførigen *************** *** 16,17 **** --- 17,23 ---- base_group.list.no_groups = For tiden er det ingen grupper registrert, som du \ har rettigheter til &sring; se på. + base_group.error.failed_member_fetch = Klarte ikke å hente medlemmer: [_1] + base_group.error.failed_member_remove = Klarte ikke å fjerne medlem: [_1] + base_group.error.failed_member_add = Klarte ikke å legge til medlem: [_1] + base_group.status.update_ok = Gruppemedlemsskap oppdatert: la til [_1]; fjernet [_2]. + Index: base_group-messages-en.msg =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_group/msg/base_group-messages-en.msg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** base_group-messages-en.msg 5 Dec 2004 08:51:19 -0000 1.3 --- base_group-messages-en.msg 17 Mar 2005 13:03:23 -0000 1.4 *************** *** 19,22 **** base_group.error.failed_member_fetch = Failed to retrieve all users: [_1] base_group.error.failed_member_remove = Failed to remove user members: [_1] ! base_group.error.failed_member_remove = Failed to add user members: [_1] ! base_group.status.update_ok = Group membership information updated: added [_1]; removed [_2]. \ No newline at end of file --- 19,22 ---- base_group.error.failed_member_fetch = Failed to retrieve all users: [_1] base_group.error.failed_member_remove = Failed to remove user members: [_1] ! base_group.error.failed_member_add = Failed to add user members: [_1] ! base_group.status.update_ok = Group membership information updated: added [_1]; removed [_2]. |
|
From: Salve J. N. <sj...@us...> - 2005-03-17 12:55:31
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user/msg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11523/pkg/base_user/msg Modified Files: base_user-messages-no.msg Log Message: Minor I18N fixes Index: base_user-messages-no.msg =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/msg/base_user-messages-no.msg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** base_user-messages-no.msg 12 Jan 2005 13:34:45 -0000 1.2 --- base_user-messages-no.msg 17 Mar 2005 12:54:57 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + # Contact: Salve J. Nilsen <sa...@me...> base_user.new_complete.page_title = Konto opprettet! base_user.new_complete.title = Epost Sendt *************** *** 73,83 **** base_user.user.password_mismatch = Passordene stemte ikke overens; Vennligst skriv de på nytt. base_user.user.password_changed = Passord er endret. ! #base_user.user.group_add_fail = Record created but group membership wrong. ! base_user.user.group_add_fail = FIXME er opprettet, men gruppemedlemskap er feil. base_user.user.group_add_ok = Brukeren er lagt til 'public' gruppen base_user.password.enter_one = Vennligst oppgi enten brukernavn eller epostadresse. ! #base_user.password.fetch_fail = Error fetching user objects with your information: [_1] ! base_user.password.fetch_fail = FIXME Kunne ikke finne brukere med med ønskede kriterier: [_1] base_user.password.no_user = Ingen brukere finnes med disse kriteriene. Prøv igjen. base_user.password.save_fail = Kunne ikke lagre nytt passord: [_1] --- 74,82 ---- base_user.user.password_mismatch = Passordene stemte ikke overens; Vennligst skriv de på nytt. base_user.user.password_changed = Passord er endret. ! base_user.user.group_add_fail = Bruker er opprettet, men innmelding i gruppe feilet. base_user.user.group_add_ok = Brukeren er lagt til 'public' gruppen base_user.password.enter_one = Vennligst oppgi enten brukernavn eller epostadresse. ! base_user.password.fetch_fail = Kunne ikke finne brukere med ønskede kriterier: [_1] base_user.password.no_user = Ingen brukere finnes med disse kriteriene. Prøv igjen. base_user.password.save_fail = Kunne ikke lagre nytt passord: [_1] |
|
From: Salve J. N. <sj...@us...> - 2005-03-17 12:52:38
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box/msg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10751/pkg/base_box/msg Modified Files: base_box-messages-en.msg base_box-messages-no.msg Log Message: - Move hardcoded box titles into .msg files, plus update these - Clean up Norwegian I18N messages Index: base_box-messages-en.msg =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/msg/base_box-messages-en.msg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** base_box-messages-en.msg 23 Feb 2004 04:48:10 -0000 1.2 --- base_box-messages-en.msg 17 Mar 2005 12:52:22 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- login_box.label.forgot = Forgot password? login_box.button.login = Login + login_box.title = Login object_modify_box.label.edit_security = Edit object security object_modify_box.label.edit_topics = Edit object topics *************** *** 22,30 **** you cannot edit its properties. object_modify_box.cannot_view = Cannot view actions. powered_by_box.summary = This website is powered by the following technologies: user_info_box.label.customize = Customize user_info_box.label.signout = Sign Out user_info_box.label.no_login = You are not logged in ! ! ! --- 23,31 ---- you cannot edit its properties. object_modify_box.cannot_view = Cannot view actions. + object_modify_box.title = Object info powered_by_box.summary = This website is powered by the following technologies: + powered_by_box.title = Powered By user_info_box.label.customize = Customize user_info_box.label.signout = Sign Out user_info_box.label.no_login = You are not logged in ! user_info_box.title = Your Info Index: base_box-messages-no.msg =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/msg/base_box-messages-no.msg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** base_box-messages-no.msg 12 Jan 2005 13:34:45 -0000 1.2 --- base_box-messages-no.msg 17 Mar 2005 12:52:22 -0000 1.3 *************** *** 1,8 **** # Messages for the 'base_box' package: Norwegian ! admin_tools_box.label.error_browser = <a href="[_1]">Feil-logg</a> ! admin_tools_box.label.group = Grupper (<a href="[_1]">Vis alle</a> | <a href="[_2]">Lag ny</a>) admin_tools_box.label.lookup = <a href="[_1]">Liste over tabeller</a> ! admin_tools_box.label.activity = <a href="[_1]">Aktivitetslogg </a> ! admin_tools_box.label.page = <a href="[_1]">Publisering</a> admin_tools_box.label.security = <a href="[_1]">Tilgangskontroll</a> admin_tools_box.label.template = Side-maler (<a href="[_1]">Vis alle</a> | <a href="[_2]">Lag ny</a>) --- 1,8 ---- # Messages for the 'base_box' package: Norwegian ! admin_tools_box.label.error_browser = <a href="[_1]">Feil-logg</a> ! admin_tools_box.label.group = Grupper (<a href="[_1]">Vis alle</a> | <a href="[_2]">Lag ny</a>) admin_tools_box.label.lookup = <a href="[_1]">Liste over tabeller</a> ! admin_tools_box.label.activity = <a href="[_1]">Aktivitetslogg</a> ! admin_tools_box.label.page = <a href="[_1]">Sideadministrasjon</a> admin_tools_box.label.security = <a href="[_1]">Tilgangskontroll</a> admin_tools_box.label.template = Side-maler (<a href="[_1]">Vis alle</a> | <a href="[_2]">Lag ny</a>) *************** *** 14,26 **** login_box.label.name = Brukernavn login_box.label.password = Passord ! login_box.label.remember = Husk pålogging login_box.label.forgot = Glemt passord? login_box.button.login = Logg inn login_box.title = Logg inn ! object_modify_box.label.edit_security = Endre sikkerhetsnivåer object_modify_box.label.edit_topics = Endre titler object_modify_box.summary = Ingen operasjoner tillatt. ! object_modify_box.not_entered = Siden dette objektet ikke enda er lagt til i systemet, \ ! kan du ikke endre på dets egenskaper. object_modify_box.cannot_view = Visning av operasjoner er ikke tillatt. object_modify_box.title = Objektinformasjon --- 14,26 ---- login_box.label.name = Brukernavn login_box.label.password = Passord ! login_box.label.remember = Ikke sp&osalsh;r om passord fra nå av login_box.label.forgot = Glemt passord? login_box.button.login = Logg inn login_box.title = Logg inn ! object_modify_box.label.edit_security = Endre sikkerhetsnivå object_modify_box.label.edit_topics = Endre titler object_modify_box.summary = Ingen operasjoner tillatt. ! object_modify_box.not_entered = Siden dette objektet ikke enda er lagt til \ ! i systemet, kan du ikke endre på dets egenskaper. object_modify_box.cannot_view = Visning av operasjoner er ikke tillatt. object_modify_box.title = Objektinformasjon |
|
From: Salve J. N. <sj...@us...> - 2005-03-17 12:52:37
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10751/pkg/base_box/conf Modified Files: action.ini Log Message: - Move hardcoded box titles into .msg files, plus update these - Clean up Norwegian I18N messages Index: action.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/conf/action.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** action.ini 28 Nov 2004 00:09:38 -0000 1.4 --- action.ini 17 Mar 2005 12:52:21 -0000 1.5 *************** *** 14,17 **** --- 14,18 ---- weight = 4 title = Object Info + title_key = object_modify_box.title is_secure = no url_none = yes *************** *** 21,25 **** template = base_box::login_box weight = 1 ! title = Login is_secure = no url_none = yes --- 22,26 ---- template = base_box::login_box weight = 1 ! title_key = login_box.title is_secure = no url_none = yes *************** *** 29,33 **** template = base_box::user_info_box weight = 1 ! title = Your Info is_secure = no url_none = yes --- 30,34 ---- template = base_box::user_info_box weight = 1 ! title_key = user_info_box.title is_secure = no url_none = yes *************** *** 37,41 **** template = base_box::admin_tools_box weight = 10 ! title = Admin Tools is_secure = no url_none = yes --- 38,42 ---- template = base_box::admin_tools_box weight = 10 ! title_key = admin_tools_box.title is_secure = no url_none = yes *************** *** 46,52 **** template = base_box::powered_by_box weight = 8 ! title = Powered By is_secure = no url_none = yes action_type = template_only ! cache_expire = 12h \ No newline at end of file --- 47,53 ---- template = base_box::powered_by_box weight = 8 ! title_key = powered_by_box.title is_secure = no url_none = yes action_type = template_only ! cache_expire = 12h |
|
From: Chris W. <la...@us...> - 2005-03-17 06:05:13
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2967 Modified Files: Package.pm Log Message: add more info to what files we're checking (better error) Index: Package.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Package.pm,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** Package.pm 13 Mar 2005 18:36:24 -0000 1.54 --- Package.pm 17 Mar 2005 06:05:03 -0000 1.55 *************** *** 258,262 **** @spops_files = map { catfile( $dir, $_ ) } @{ $base_files }; } ! $self->_check_file_validity( \@spops_files ); return \@spops_files } --- 258,262 ---- @spops_files = map { catfile( $dir, $_ ) } @{ $base_files }; } ! $self->_check_file_validity( 'SPOPS configuration', \@spops_files ); return \@spops_files } *************** *** 282,286 **** @action_files = map { catfile( $dir, $_ ) } @{ $base_files }; } ! $self->_check_file_validity( \@action_files ); return \@action_files; } --- 282,286 ---- @action_files = map { catfile( $dir, $_ ) } @{ $base_files }; } ! $self->_check_file_validity( 'action configuration', \@action_files ); return \@action_files; } *************** *** 297,309 **** my $dir = $self->directory; my @full_message_files = map { catfile( $dir, $_ ) } @{ $base_files }; ! $self->_check_file_validity( \@full_message_files ); return \@full_message_files; } sub _check_file_validity { ! my ( $self, $files ) = @_; foreach my $file ( @{ $files } ) { unless ( -f $file ) { ! oi_error "Package file returned '$file' is invalid."; } } --- 297,309 ---- my $dir = $self->directory; my @full_message_files = map { catfile( $dir, $_ ) } @{ $base_files }; ! $self->_check_file_validity( 'localization file', \@full_message_files ); return \@full_message_files; } sub _check_file_validity { ! my ( $self, $type, $files ) = @_; foreach my $file ( @{ $files } ) { unless ( -f $file ) { ! oi_error "Package $type returned '$file', an invalid file."; } } |
|
From: Chris W. <la...@us...> - 2005-03-17 06:04:20
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2900 Modified Files: Repository.pm Log Message: add method to get just the package info (name, version, directory) without actually reading the package Index: Repository.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Repository.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Repository.pm 6 Mar 2005 15:07:07 -0000 1.23 --- Repository.pm 17 Mar 2005 06:04:09 -0000 1.24 *************** *** 131,134 **** --- 131,149 ---- } + sub get_package_info { + my ( $self, $name ) = @_; + return undef unless ( $name ); + foreach my $pkg_info ( @{ $self->_package_info } ) { + if ( $pkg_info->{name} eq $name ) { + return { + name => $name, + version => $pkg_info->{version}, + directory => $pkg_info->{directory}, + }; + } + } + return undef; + } + sub fetch_all_packages { *************** *** 150,167 **** # } ! if ( my $old_package = $self->fetch_package( $package->name ) ) { ! eval { ! $self->remove_package( $old_package, { transient => 'yes' } ) ! }; ! if ( $@ ) { ! oi_error "Failed to add package '", $package->name, "' since ", ! "old version '", $old_package->version, "' was not ", ! "successfully removed: $@"; ! } } ! my %new_info = ( name => $package->name, ! version => $package->version, ! directory => $package->directory, ! installed => $package->installed_date || scalar localtime ); $self->_add_package_info( \%new_info ); unless ( $options->{transient} and $options->{transient} eq 'yes' ) { --- 165,178 ---- # } ! if ( my $old_info = $self->get_package_info( $package->name ) ) { ! $self->_remove_package_info( $old_info->{name}, { transient => 'yes' } ); ! $self->_remove_package_cache( $old_info->{name} ); } ! my %new_info = ( ! name => $package->name, ! version => $package->version, ! directory => $package->directory, ! installed => $package->installed_date || scalar localtime ! ); $self->_add_package_info( \%new_info ); unless ( $options->{transient} and $options->{transient} eq 'yes' ) { *************** *** 180,184 **** my ( $self, $package, $options ) = @_; return unless ( $package ); ! $self->_remove_package_info( $package->name ); unless ( $options->{transient} && 'yes' eq $options->{transient} ) { eval { $self->_save_repository }; --- 191,195 ---- my ( $self, $package, $options ) = @_; return unless ( $package ); ! $self->_remove_package_info( $package->{name} ); unless ( $options->{transient} && 'yes' eq $options->{transient} ) { eval { $self->_save_repository }; *************** *** 468,471 **** --- 479,487 ---- Returns: full path to the package directory + B<get_package_info( $package_name )> + + Returns a hashref with 'name', 'version' and 'directory' defined if + C<$package_name> in this repository. Otherwise returns C<undef>. + B<fetch_package( $package_name )> |
|
From: Chris W. <la...@us...> - 2005-03-17 06:03:09
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2677/Manage/Website Modified Files: Upgrade.pm Log Message: don't need to read packages when we're upgrading; and fix typo Index: Upgrade.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/Upgrade.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Upgrade.pm 8 Feb 2005 01:44:06 -0000 1.17 --- Upgrade.pm 17 Mar 2005 06:02:56 -0000 1.18 *************** *** 34,37 **** --- 34,42 ---- } + sub setup_task { + my ( $self ) = @_; + $self->_setup_context({ skip => 'read packages' }); + } + sub run_task { my ( $self ) = @_; *************** *** 50,54 **** my $brick = OpenInteract2::Brick->new( 'widgets' ); my $status = $brick->copy_all_resources_to( $website_dir ); ! $self->_set_file_copy_status( $status ); $self->notify_observers( progress => 'Widget copy complete' ); } --- 55,59 ---- my $brick = OpenInteract2::Brick->new( 'widgets' ); my $status = $brick->copy_all_resources_to( $website_dir ); ! $self->_set_copy_file_status( $status ); $self->notify_observers( progress => 'Widget copy complete' ); } |
|
From: Chris W. <la...@us...> - 2005-03-17 06:02:32
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2577/Manage/Website Modified Files: InstallPackage.pm Log Message: we don't need to read the packages if we're just finding name/version info from the repository... Index: InstallPackage.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/InstallPackage.pm,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** InstallPackage.pm 13 Mar 2005 18:38:22 -0000 1.18 --- InstallPackage.pm 17 Mar 2005 06:02:22 -0000 1.19 *************** *** 83,87 **** }); ! $self->_setup_context(); my $is_installed = $self->_check_package_exists( --- 83,87 ---- }); ! $self->_setup_context({ skip => 'read packages' }); my $is_installed = $self->_check_package_exists( *************** *** 135,139 **** # put this off so we don't load older versions... ! $self->_setup_context(); my $is_installed = $self->_check_package_exists( --- 135,139 ---- # put this off so we don't load older versions... ! $self->_setup_context({ skip => 'read packages' }); my $is_installed = $self->_check_package_exists( *************** *** 180,192 **** my ( $self, $name, $version, $status ) = @_; my $repository = CTX->repository; ! my $rep_package = $repository->fetch_package( $name ); ! if ( $rep_package && $rep_package->version == $version ) { ! $status->{is_ok} = 'yes'; $status->{package} = $name; $status->{version} = $version; ! $status->{message} = ! sprintf( 'Package %s-%s not upgraded, ' . ! 'this version already installed', ! $name, $version ); return 1; } --- 180,192 ---- my ( $self, $name, $version, $status ) = @_; my $repository = CTX->repository; ! my $info = $repository->get_package_info( $name ); ! if ( $info && $info->{version} == $version ) { ! $status->{is_ok} = 'yes'; $status->{package} = $name; $status->{version} = $version; ! $status->{message} = sprintf( ! 'Package %s-%s not upgraded, this version already installed', ! $name, $version ! ); return 1; } |
|
From: Chris W. <la...@us...> - 2005-03-17 06:01:29
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2396/ContentGenerator Modified Files: TemplateSource.pm Log Message: ensure Data::Dumper available when we need it Index: TemplateSource.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator/TemplateSource.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TemplateSource.pm 24 Jan 2005 17:13:31 -0000 1.13 --- TemplateSource.pm 17 Mar 2005 06:01:19 -0000 1.14 *************** *** 82,87 **** else { $log->error( "No template to process! Information given for ", ! "source:\n", Dumper( $template_source ) ); oi_error "No template to process!"; } --- 82,88 ---- else { + require Data::Dumper; $log->error( "No template to process! Information given for ", ! "source:\n", Data::Dumper->Dumper( $template_source ) ); oi_error "No template to process!"; } |
|
From: Chris W. <la...@us...> - 2005-03-17 06:00:49
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2269 Modified Files: InitializeContentGenerators.pm Log Message: TT2 won't be able to read plugin data if packages haven't been read in yet! Index: InitializeContentGenerators.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/InitializeContentGenerators.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InitializeContentGenerators.pm 24 Jan 2005 17:17:31 -0000 1.1 --- InitializeContentGenerators.pm 17 Mar 2005 06:00:39 -0000 1.2 *************** *** 16,19 **** --- 16,23 ---- } + sub get_dependencies { + return ( 'read packages' ); + } + sub execute { my ( $self, $ctx ) = @_; |
|
From: Chris W. <la...@us...> - 2005-03-17 06:00:37
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2177 Modified Files: InitializeObservers.pm Log Message: observers won't be able to observe actions if the actions haven't been read in yet! Index: InitializeObservers.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/InitializeObservers.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InitializeObservers.pm 24 Jan 2005 17:17:31 -0000 1.1 --- InitializeObservers.pm 17 Mar 2005 06:00:10 -0000 1.2 *************** *** 13,17 **** sub get_dependencies { ! return ( 'read packages' ); } --- 13,17 ---- sub get_dependencies { ! return ( 'initialize actions' ); } |
|
From: Chris W. <la...@us...> - 2005-03-17 02:30:47
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28785/doc/Manual Modified Files: Intro.pod Log Message: small updates Index: Intro.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Intro.pod,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Intro.pod 30 Nov 2004 00:18:47 -0000 1.13 --- Intro.pod 17 Mar 2005 02:30:34 -0000 1.14 *************** *** 65,69 **** For more information about these concepts see ! L<OpenInteract2::Manual::Architecture|OpenInteract2::Manual::Architecture>. =head2 Context --- 65,69 ---- For more information about these concepts see ! L<OpenInteract2::Manual::Architecture>. =head2 Context *************** *** 71,77 **** Holds all application configuration information and provides a central lookup mechanism. This is a singleton (there's only one in the system ! at any time) and can be imported from the ! L<OpenInteract2::Context|OpenInteract2::Context> class since it's used ! fairly often. =head2 Adapter --- 71,76 ---- Holds all application configuration information and provides a central lookup mechanism. This is a singleton (there's only one in the system ! at any time) and can be imported from the L<OpenInteract2::Context> ! class since it's used fairly often. =head2 Adapter *************** *** 81,102 **** translates parameters from the user, information about the request (hostname, URL, referer, cookies, etc.) and other data into the ! relevant L<OpenInteract2::Request|OpenInteract2::Request> subclass. Once the OpenInteract cycle is complete it translates OpenInteract data (content, headers, etc.) into a response to send back to the user ! via the relevant L<OpenInteract2::Response|OpenInteract2::Response> ! subclass. For an example see ! L<Apache::OpenInteract2|Apache::OpenInteract2>. =head2 Controller Once the adapter has created the request and response it hands off the ! processing to the ! L<OpenInteract2::Controller|OpenInteract2::Controller> object. This ! reads the URL and creates the relevant action object that will ! generate the content. It knows which action object to create through a ! URL-to-action mapping created at server startup. The controller places ! the generated content in a larger scope so you can control common ! graphical elements (sidebars, menus, etc.) from one place. =head2 Action --- 80,100 ---- translates parameters from the user, information about the request (hostname, URL, referer, cookies, etc.) and other data into the ! relevant L<OpenInteract2::Request> subclass. Once the OpenInteract cycle is complete it translates OpenInteract data (content, headers, etc.) into a response to send back to the user ! via the relevant L<OpenInteract2::Response> subclass. For an example ! see L<Apache::OpenInteract2>. =head2 Controller Once the adapter has created the request and response it hands off the ! processing to the L<OpenInteract2::Controller> object. This reads the ! URL and asks a set of small objects called action resolvers to create ! an B<Action> from the URL. Once that action is created it executes the ! action which generates the primary content for the request. The ! controller places that content in a larger content scope so you can ! control common graphical elements (sidebars, menus, etc.) from one ! place. =head2 Action *************** *** 104,113 **** Actions are the core of OpenInteract2. Each action provides a discrete set of functionality. What "discrete set" means is up to the ! developer, but typically this is a set of SCRUD (Search - CReate - ! Update - Delete) operations on a class of objects. Each action is represented by zero or more URLs, and each operation is ! specified by a task referenced in that URL. So if I created a 'news' ! action my URLs might look like: /news/search/ --- 102,111 ---- Actions are the core of OpenInteract2. Each action provides a discrete set of functionality. What "discrete set" means is up to the ! developer, but typically this is a set of CRUDS (Create - Remove - ! Update - Display - Search) operations on a class of objects. Each action is represented by zero or more URLs, and each operation is ! typically specified by a B<task> referenced in that URL. So if I ! created a 'news' action my URLs might look like: /news/search/ *************** *** 117,123 **** Every task returns some sort of content, generally by passing data to ! a Content Generator which marries it with a template. See ! L<OpenInteract2::Action|OpenInteract2::Action> for much more ! information. =head2 Content Generator --- 115,120 ---- Every task returns some sort of content, generally by passing data to ! a B<Content Generator> which marries it with a template. See ! L<OpenInteract2::Action> for much more information. =head2 Content Generator *************** *** 127,133 **** data off to a content generator. A content generator is a wrapper around some sort of templating system, such as the L<Template ! Toolkit|Template>, L<HTML::Template|HTML::Template> or ! L<Text::Template|Text::Template> or even your own homegrown ! system. (Admit it, you've written your own.) Each action is associated with a content generator. And you can even --- 124,129 ---- data off to a content generator. A content generator is a wrapper around some sort of templating system, such as the L<Template ! Toolkit|Template>, L<HTML::Template> or L<Text::Template> or even your ! own homegrown system. (Admit it, you've written your own.) Each action is associated with a content generator. And you can even *************** *** 139,146 **** These are the major configuration files at the server level. Each package has its own configuration files -- see ! L<OpenInteract2::Manual::Packages|OpenInteract2::Manual::Packages> for ! more information about packages, and ! L<OpenInteract2::Manual::QuickStart|OpenInteract2::Manual::QuickStart> ! for how to modify some of these files to get a server started quickly. B<server configuration> - C<conf/server.ini> --- 135,141 ---- These are the major configuration files at the server level. Each package has its own configuration files -- see ! L<OpenInteract2::Manual::Packages> for more information about ! packages, and L<OpenInteract2::Manual::QuickStart> for how to modify ! some of these files to get a server started quickly. B<server configuration> - C<conf/server.ini> *************** *** 158,164 **** determine the logging level for the whole server or discrete parts of it, which logfiles get written, when/if they're rolled over, etc. See ! L<OpenInteract2::Manual::Logging|OpenInteract2::Manual::Logging> for a ! quick intro to logging and read up about ! L<Log::Log4perl|Log::Log4perl> for details. B<interface configuration: Apache> - C<conf/httpd_modperl_solo.conf> --- 153,158 ---- determine the logging level for the whole server or discrete parts of it, which logfiles get written, when/if they're rolled over, etc. See ! L<OpenInteract2::Manual::Logging> for a quick intro to logging and ! read up about L<Log::Log4perl> for details. B<interface configuration: Apache> - C<conf/httpd_modperl_solo.conf> *************** *** 169,173 **** (see C<conf/httpd_static.conf> for a proxy configuration and C<conf/httpd_modperl.conf> for the corresponding proxied backend ! configuration). B<interface configuration: standalone> - C<conf/oi2_daemon.ini> --- 163,167 ---- (see C<conf/httpd_static.conf> for a proxy configuration and C<conf/httpd_modperl.conf> for the corresponding proxied backend ! configuration). See L<OpenInteract2::Manual::AdminApache> for more. B<interface configuration: standalone> - C<conf/oi2_daemon.ini> |
|
From: Chris W. <la...@us...> - 2005-03-17 02:29:25
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28544/doc/Manual Modified Files: Conversion.pod Log Message: some conversion updates, including package.ini Index: Conversion.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Conversion.pod,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Conversion.pod 28 Nov 2004 16:19:25 -0000 1.13 --- Conversion.pod 17 Mar 2005 02:29:13 -0000 1.14 *************** *** 106,121 **** =back ! There is no structural change necessary for these files to ! work. However, depending on your scenario you may wish to upgrade your ! package by a whole version number to indicate that it will only work ! with OI2. This also allows you to maintain two source trees for a ! particular package, just in case you need to support both of them. B<package.conf> ! The only structural change is that the 'template_blocks' directive has ! been removed from the package configuration. ! To change: =over 4 --- 106,123 ---- =back ! Except for C<package.conf> there is no structural change necessary for ! these files to work. However, depending on your scenario you may wish ! to upgrade your package by a whole version number to indicate that it ! will only work with OI2. This also allows you to maintain two source ! trees for a particular package, just in case you need to support both ! of them. B<package.conf> ! This has been replaced by C<package.ini>; the script ! C<scripts/translate_package_to_ini.pl> shipped with OI2 will do this ! for you. ! Additionally, you'll need to change: =over 4 *************** *** 142,146 **** You can also use the L<ExtUtils::Manifest|ExtUtils::Manifest> trick: ! [% INCLUDE examples/conversion_eu_manifest | indent 2 %] =head2 Configuration (conf/) --- 144,148 ---- You can also use the L<ExtUtils::Manifest|ExtUtils::Manifest> trick: ! $ perl -MExtUtils::Manifest -e 'ExtUtils::Manifest::mkmanifest()' =head2 Configuration (conf/) *************** *** 204,218 **** =head2 Documentation (doc/) ! Documentation is pretty much the same. The system documentation tool ! under C</SystemDoc/> will pick up all POD files in a package's C<doc/> ! directory. Instead of using an index (C<titles>) that always, always ! got out of sync, we instead just parse all the docs and grab the title ! out of it. Yes, it's more expensive, but how often are you browsing ! package docs? (And you have fast disk drives and/or an aggressively ! caching filesystem, right?) ! ! And because OI no longer has error handlers you can delete the ! C<ERRORS> section from your POD. (Packages generated with OI had this ! by default.) To change: --- 206,213 ---- =head2 Documentation (doc/) ! Documenation has moved to the C<OpenInteract2::App> subclass. And ! because OI no longer has error handlers you can delete the C<ERRORS> ! section from your POD. (Packages generated with OI had this by ! default.) To change: *************** *** 226,232 **** =item * ! C<package.pod> - If you have a file of this name, rename it to ! 'packagename'.pod -- e.g., 'gallery.pod' if you're modifying the ! 'gallery' package, etc. =back --- 221,226 ---- =item * ! C<package.pod> - Copy the content into ! C<OpenInteract2::App::YourPackage>. =back *************** *** 276,280 **** =head2 Template (template/) ! =head2 Examples (eg/) --- 270,274 ---- =head2 Template (template/) ! These should remain the same. =head2 Examples (eg/) *************** *** 311,320 **** --- 305,329 ---- =head2 Request vs. Context + In OpenInteract 1.x the omnipresent object was C<$R>. In OpenInteract + 2.x it's C<CTX>, imported from L<OpenInteract2::Context>. The main + difference is that we now have a clear separation of concerns -- the + context holds data that lives from request to request; per-request + data are held in the objects returned by the C<request()> and + C<response()> methods, represented by L<OpenInteract2::Request> and + L<OpenInteract2::Response> classes. + =head2 Logging + We now use the L<Log::Log4perl> package from CPAN -- see + L<OpenInteract2::Manual::Logging> for more information. + =head2 Libraries (OpenInteract/) + These get moved to C<OpenInteract2/> + =head2 Handlers (OpenInteract/Handler) + These get moved to C<OpenInteract2/Action>. + =head1 COPYRIGHT |
|
From: Chris W. <la...@us...> - 2005-03-17 02:28:16
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28348/doc/Manual Modified Files: Architecture.pod Log Message: update base config ref Index: Architecture.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Architecture.pod,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Architecture.pod 26 Feb 2005 05:06:33 -0000 1.12 --- Architecture.pod 17 Mar 2005 02:28:04 -0000 1.13 *************** *** 241,245 **** # Create the context... ! my $ctx = OpenInteract2::Context->create( $base_config ); # ...let the context know what type of adapter we are --- 241,245 ---- # Create the context... ! my $ctx = OpenInteract2::Context->create( $bootstrap ); # ...let the context know what type of adapter we are |
|
From: Chris W. <la...@us...> - 2005-03-17 02:25:13
|
Update of /cvsroot/openinteract/OpenInteract2/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27677/doc Modified Files: Manual.pod Log Message: cosmetic Index: Manual.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual.pod,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Manual.pod 28 Nov 2004 06:33:30 -0000 1.18 --- Manual.pod 17 Mar 2005 02:25:01 -0000 1.19 *************** *** 22,33 **** =item * ! L<OpenInteract2::Manual::Intro|OpenInteract2::Manual::Intro> ! An introduction to the capabilities and architecture of OpenInteract ! 2. =item * ! L<OpenInteract2::Manual::QuickStart|OpenInteract2::Manual::QuickStart> A quick start guide for setting up a website. --- 22,33 ---- =item * ! L<OpenInteract2::Manual::Intro> ! An introduction to the capabilities and architecture of OpenInteract2 ! -- a good starting point. =item * ! L<OpenInteract2::Manual::QuickStart> A quick start guide for setting up a website. *************** *** 35,39 **** =item * ! L<OpenInteract2::Manual::Tutorial|OpenInteract2::Manual::Tutorial> Create a new package and modify an existing one. Developers should --- 35,39 ---- =item * ! L<OpenInteract2::Manual::Tutorial> Create a new package and modify an existing one. Developers should *************** *** 42,46 **** =item * ! L<OpenInteract2::Manual::Conversion|OpenInteract2::Manual::Conversion> Read this if you're upgrading an existing OpenInteract 1.x site to --- 42,59 ---- =item * ! L<OpenInteract2::Manual::TutorialAdvanced> ! ! Add advanced features to an application. ! ! =item * ! ! L<OpenInteract2::Manual::Architecture> ! ! More in-depth discussion of the major areas of OpenInteract and a ! walk-through for a request. ! ! =item * ! ! L<OpenInteract2::Manual::Conversion> Read this if you're upgrading an existing OpenInteract 1.x site to *************** *** 50,54 **** =item * ! L<OpenInteract2::Manual::Changes|OpenInteract2::Manual::Changes> Listing of the changes between OI versions. The major architectural --- 63,67 ---- =item * ! L<OpenInteract2::Manual::Changes> Listing of the changes between OI versions. The major architectural *************** *** 57,68 **** =item * ! L<OpenInteract2::Manual::Architecture|OpenInteract2::Manual::Architecture> ! ! More in-depth discussion of the major areas of OpenInteract and a ! walk-through for a request. ! ! =item * ! ! L<OpenInteract2::Manual::Templates|OpenInteract2::Manual::Templates> Using templates, focusing on the Template Toolkit. --- 70,74 ---- =item * ! L<OpenInteract2::Manual::Templates> Using templates, focusing on the Template Toolkit. *************** *** 70,74 **** =item * ! L<OpenInteract2::Manual::Widgets|OpenInteract2::Manual::Widgets> Using template widgets in the Template Toolkit. --- 76,80 ---- =item * ! L<OpenInteract2::Manual::Widgets> Using template widgets in the Template Toolkit. *************** *** 76,80 **** =item * ! L<OpenInteract2::Manual::Packages|OpenInteract2::Manual::Packages> Learn about a package: how we create distributable OpenInteract2 --- 82,86 ---- =item * ! L<OpenInteract2::Manual::Packages> Learn about a package: how we create distributable OpenInteract2 *************** *** 83,87 **** =item * ! L<OpenInteract2::Manual::I18N|OpenInteract2::Manual::I18N> Internationalization and localization issues in OpenInteract2. --- 89,93 ---- =item * ! L<OpenInteract2::Manual::I18N> Internationalization and localization issues in OpenInteract2. *************** *** 89,93 **** =item * ! L<OpenInteract2::Manual::Caching|OpenInteract2::Manual::Caching> How to setup and use content caching. --- 95,99 ---- =item * ! L<OpenInteract2::Manual::Caching> How to setup and use content caching. *************** *** 95,99 **** =item * ! L<OpenInteract2::Manual::Logging|OpenInteract2::Manual::Logging> How to use and configure logging. --- 101,105 ---- =item * ! L<OpenInteract2::Manual::Logging> How to use and configure logging. *************** *** 101,105 **** =item * ! L<OpenInteract2::Manual::Authentication|OpenInteract2::Manual::Authentication> How to setup authentication and related actions. --- 107,111 ---- =item * ! L<OpenInteract2::Manual::Authentication> How to setup authentication and related actions. *************** *** 107,111 **** =item * ! L<OpenInteract2::Manual::Security|OpenInteract2::Manual::Security> How task and object security works and how you can change it. --- 113,117 ---- =item * ! L<OpenInteract2::Manual::Security> How task and object security works and how you can change it. *************** *** 113,117 **** =item * ! L<OpenInteract2::Manual::Management|OpenInteract2::Manual::Management> Managing OpenInteract2 using C<oi2_manage> and the --- 119,123 ---- =item * ! L<OpenInteract2::Manual::Management> Managing OpenInteract2 using C<oi2_manage> and the *************** *** 120,124 **** =item * ! L<OpenInteract2::Manual::AdminDatabase|OpenInteract2::Manual::AdminDatabase> Setup databases. --- 126,130 ---- =item * ! L<OpenInteract2::Manual::AdminDatabase> Setup databases. *************** *** 126,130 **** =item * ! L<OpenInteract2::Manual::AdminApache|OpenInteract2::Manual::AdminApache> Setup Apache/mod_perl. --- 132,136 ---- =item * ! L<OpenInteract2::Manual::AdminApache> Setup Apache/mod_perl. *************** *** 132,136 **** =item * ! L<OpenInteract2::Manual::Datasource|OpenInteract2::Manual::Datasource> How to setup and use datasources. --- 138,142 ---- =item * ! L<OpenInteract2::Manual::Datasource> How to setup and use datasources. *************** *** 138,142 **** =item * ! L<OpenInteract2::Manual::DataImport|OpenInteract2::Manual::DataImport> Importing data into OpenInteract datasources. --- 144,148 ---- =item * ! L<OpenInteract2::Manual::DataImport> Importing data into OpenInteract datasources. *************** *** 144,148 **** =item * ! L<OpenInteract2::Manual::SPOPS|OpenInteract2::Manual::SPOPS> How OpenInteract2 enhances SPOPS objects and makes them easier for you --- 150,154 ---- =item * ! L<OpenInteract2::Manual::SPOPS> How OpenInteract2 enhances SPOPS objects and makes them easier for you *************** *** 151,155 **** =item * ! L<OpenInteract2::Manual::SearchResults|OpenInteract2::Manual::SearchResults> Serializing and retrieving search results. --- 157,161 ---- =item * ! L<OpenInteract2::Manual::SearchResults> Serializing and retrieving search results. *************** *** 157,161 **** =item * ! L<OpenInteract2::Manual::LDAP|OpenInteract2::Manual::LDAP> How to setup and use LDAP support. --- 163,167 ---- =item * ! L<OpenInteract2::Manual::LDAP> How to setup and use LDAP support. |
|
From: Chris W. <la...@us...> - 2005-03-16 03:56:13
|
Update of /cvsroot/openinteract/OpenInteract2/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22044 Modified Files: oi2_manage Log Message: OIN-125: screen ugly package filenames Index: oi2_manage =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/script/oi2_manage,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** oi2_manage 17 Feb 2005 05:05:52 -0000 1.32 --- oi2_manage 16 Mar 2005 03:55:55 -0000 1.33 *************** *** 48,58 **** my $HELP_LIST = 'ope...@li...'; ! my ( $OPT_help, $OPT_debug, $OPT_man, $OPT_use_status, $OPT_task ); { my @opt_defs = OpenInteract2::Manage->all_parameters_long_options; ! push @opt_defs, 'help|?', 'debug+', 'man', 'status', 'task=s'; my %OPT = ( help => \$OPT_help, debug => \$OPT_debug, ! man => \$OPT_man, status => \$OPT_use_status, task => \$OPT_task ); GetOptions( \%OPT, @opt_defs ); --- 48,58 ---- my $HELP_LIST = 'ope...@li...'; ! my ( $OPT_help, $OPT_debug, $OPT_man, $OPT_verbose, $OPT_task ); { my @opt_defs = OpenInteract2::Manage->all_parameters_long_options; ! push @opt_defs, 'help|?', 'debug+', 'man', 'verbose', 'task=s'; my %OPT = ( help => \$OPT_help, debug => \$OPT_debug, ! man => \$OPT_man, status => \$OPT_verbose, task => \$OPT_task ); GetOptions( \%OPT, @opt_defs ); *************** *** 141,145 **** # delete our own entries... ! delete @OPT{ qw( help man status task ) }; # derefrence the debug entry --- 141,145 ---- # delete our own entries... ! delete @OPT{ qw( help man verbose task ) }; # derefrence the debug entry *************** *** 148,152 **** my $task = eval { OpenInteract2::Manage->new( $task_name, \%OPT ) }; if ( $@ ) { ! outl( "Task '$task_name' has not been recognized" ); out( "Error returned: $@" ); exit(1); --- 148,152 ---- my $task = eval { OpenInteract2::Manage->new( $task_name, \%OPT ) }; if ( $@ ) { ! outl( "Task '$task_name' not recognized" ); out( "Error returned: $@" ); exit(1); *************** *** 155,166 **** $log->debug( show_parameter_contents( $task ) ); ! if ( $OPT_use_status ) { $task->add_observer( \&status_observer ); $log->debug( "Added status observer" ); } ! else { ! $task->add_observer( \&progress_observer ); ! $log->debug( "Added normal progress observer" ); ! } eval { $task->execute }; if ( $@ ) { --- 155,164 ---- $log->debug( show_parameter_contents( $task ) ); ! if ( $OPT_verbose ) { $task->add_observer( \&status_observer ); $log->debug( "Added status observer" ); } ! $task->add_observer( \&progress_observer ); ! $log->debug( "Added normal progress observer" ); eval { $task->execute }; if ( $@ ) { *************** *** 189,193 **** foreach my $item_status ( @{ $action_status->{status} } ) { if ( $item_status->{is_ok} eq 'yes' ) { ! if ( $item_status->{filename} ) { warn " OK: $item_status->{filename}\n"; if ( $item_status->{message} ) { --- 187,192 ---- foreach my $item_status ( @{ $action_status->{status} } ) { if ( $item_status->{is_ok} eq 'yes' ) { ! # TODO: replace hack when we fix progress/summarization features ! if ( $item_status->{filename} and $item_status->{filename} !~ /^OIPKG/ ) { warn " OK: $item_status->{filename}\n"; if ( $item_status->{message} ) { *************** *** 203,207 **** if ( $item_status->{filename} ) { warn " FAILED: $item_status->{filename}\n", ! " $item_status->{message}\n"; } else { --- 202,206 ---- if ( $item_status->{filename} ) { warn " FAILED: $item_status->{filename}\n", ! " $item_status->{message}\n"; } else { *************** *** 235,242 **** \$ oi2_manage task_info --task=taskname -- information about a particular task, including parameters ! \$ oi2_manage create_website --website_dir=/path --source_dir=/path -- create a new website \$ oi2_manage list_actions --website_dir=/path -- list the actions in an existing website Learn more: --- 234,243 ---- \$ oi2_manage task_info --task=taskname -- information about a particular task, including parameters ! \$ oi2_manage create_website --website_dir=/path -- create a new website \$ oi2_manage list_actions --website_dir=/path -- list the actions in an existing website + \$ oi2_manage create_package --package=myapp + --create a new package Learn more: *************** *** 307,311 **** my ( $err ) = @_; my $out = "One or more parameters failed task checks. Task not executed.\n". ! "Here are the parameters that failed and the reason for each.\n\n"; my $failed = $err->parameter_fail || {}; while ( my ( $field, $fail ) = each %{ $failed } ) { --- 308,312 ---- my ( $err ) = @_; my $out = "One or more parameters failed task checks. Task not executed.\n". ! "Parameter failures:\n\n"; my $failed = $err->parameter_fail || {}; while ( my ( $field, $fail ) = each %{ $failed } ) { |
|
From: Chris W. <la...@us...> - 2005-03-15 12:42:50
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18339 Modified Files: Common.pm Log Message: OIN-97: instead of using a reversed hash iterate through the keys/values in the field mapping to find an alternate ID field Index: Common.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Action/Common.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Common.pm 13 Mar 2005 06:22:40 -0000 1.23 --- Common.pm 15 Mar 2005 12:42:38 -0000 1.24 *************** *** 155,171 **** # If it's not found using that ID field, see if we've got another # field mapped to the given ID field in the SPOPS object unless ( defined $id ) { my $object_class = $self->param( 'c_object_class' ); my $field_map = eval { $object_class->CONFIG->{field_map} } || {}; ! my %reverse_map = map { $field_map->{ $_ } => $_ } keys %{ $field_map }; ! $alt_id_field = $reverse_map{ $id_field } || $field_map->{ $id_field }; ! if ( $alt_id_field ) { $id = $self->param( $alt_id_field ) || $request->param( $alt_id_field ); ! $log->is_debug && ! $log->debug( "Using mapped ID field '$alt_id_field' ", ! "got ID value '$id'" ); ! $self->param( c_id_field => $alt_id_field ); } } --- 155,187 ---- # If it's not found using that ID field, see if we've got another # field mapped to the given ID field in the SPOPS object + # + # For example, in 'group' using LDAP you have: + # + # id_field = cn + # ... + # [group field_map] + # notes = description + # group_id = cn + # name = cn + + # If you pass in: + # /group/display/?group_id=groupname + # this will see that 'group_id' is mapped to 'cn' and find that + # field value and use it unless ( defined $id ) { my $object_class = $self->param( 'c_object_class' ); my $field_map = eval { $object_class->CONFIG->{field_map} } || {}; ! while ( my ( $alt_id_field, $mapped ) = each %{ $field_map } ) { ! next unless ( $mapped eq $id_field ); $id = $self->param( $alt_id_field ) || $request->param( $alt_id_field ); ! if ( $id ) { ! $log->is_debug && ! $log->debug( "Using mapped ID field '$alt_id_field' ", ! "got ID value '$id'" ); ! $self->param( c_id_field => $alt_id_field ); ! last; ! } } } |
|
From: Chris W. <la...@us...> - 2005-03-15 02:41:37
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2452 Modified Files: package.ini Changes Log Message: small fix so that we can create a new directory handler Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/package.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** package.ini 11 Mar 2005 05:37:31 -0000 1.3 --- package.ini 15 Mar 2005 02:41:26 -0000 1.4 *************** *** 1,5 **** [package] name = base_page ! version = 2.31 author = Chris Winters <ch...@cw...> url = http://www.openinteract.org/ --- 1,5 ---- [package] name = base_page ! version = 2.32 author = Chris Winters <ch...@cw...> url = http://www.openinteract.org/ Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/Changes,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Changes 11 Mar 2005 05:37:31 -0000 1.30 --- Changes 15 Mar 2005 02:41:26 -0000 1.31 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package base_page. + 2.32 Mon Mar 14 21:38:00 EST 2005 + + Small template fix so that 'Map a new directory handler' works + properly on 'page_directory_handler_list.tmpl'. + 2.31 Fri Mar 11 00:31:28 EST 2005 |
|
From: Chris W. <la...@us...> - 2005-03-15 02:41:37
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2452/template Modified Files: page_directory_handler_list.tmpl Log Message: small fix so that we can create a new directory handler Index: page_directory_handler_list.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/template/page_directory_handler_list.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** page_directory_handler_list.tmpl 9 Jun 2003 11:46:58 -0000 1.5 --- page_directory_handler_list.tmpl 15 Mar 2005 02:41:25 -0000 1.6 *************** *** 14,18 **** it.</p> ! [% PROCESS form_begin( ACTION = 'pagedirectory', TASK = 'display_form', method = 'POST' ) -%] --- 14,18 ---- it.</p> ! [% INCLUDE form_begin( ACTION = 'pagedirectory', TASK = 'display_form', method = 'POST' ) -%] *************** *** 35,39 **** [% END -%] ! [% PROCESS form_begin( ACTION = 'pagedirectory', TASK = 'display_add', method = 'GET' ) -%] --- 35,39 ---- [% END -%] ! [% INCLUDE form_begin( ACTION = 'pagedirectory', TASK = 'display_add', method = 'GET' ) -%] |
|
From: Chris W. <la...@us...> - 2005-03-15 02:36:28
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_security In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv847 Modified Files: package.ini Changes Log Message: ensure that the correct class/name gets displayed when we have an alias_class Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_security/package.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** package.ini 3 Mar 2005 15:18:33 -0000 1.3 --- package.ini 15 Mar 2005 02:36:13 -0000 1.4 *************** *** 1,5 **** [package] name = base_security ! version = 2.21 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ --- 1,5 ---- [package] name = base_security ! version = 2.22 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_security/Changes,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Changes 3 Mar 2005 15:18:32 -0000 1.21 --- Changes 15 Mar 2005 02:36:13 -0000 1.22 *************** *** 1,4 **** --- 1,8 ---- Revision history for OpenInteract package base_security. + 2.22 Mon Mar 14 21:30:48 EST 2005 + + Ensure we use 'alias_class' if it's available. + 2.21 Thu Mar 3 10:10:31 EST 2005 |
|
From: Chris W. <la...@us...> - 2005-03-15 02:36:24
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_security/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv847/OpenInteract2/Action Modified Files: Security.pm Log Message: ensure that the correct class/name gets displayed when we have an alias_class Index: Security.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_security/OpenInteract2/Action/Security.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Security.pm 5 Dec 2004 08:51:19 -0000 1.14 --- Security.pm 15 Mar 2005 02:36:12 -0000 1.15 *************** *** 49,53 **** if ( $type eq 'spops' ) { ! $item_class = $config->{ $key }{class}; next unless ( $item_class ); next if ( $visited->{ $item_class } ); --- 49,54 ---- if ( $type eq 'spops' ) { ! $item_class = $config->{ $key }{alias_class} ! || $config->{ $key }{class}; next unless ( $item_class ); next if ( $visited->{ $item_class } ); |
|
From: Chris W. <la...@us...> - 2005-03-15 02:09:30
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_error/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26810 Modified Files: Error.pm Log Message: remove fatal() call used when testing Index: Error.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_error/OpenInteract2/Action/Error.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Error.pm 25 Feb 2005 05:15:28 -0000 1.11 --- Error.pm 15 Mar 2005 02:09:18 -0000 1.12 *************** *** 22,26 **** $log ||= get_logger( LOG_ACTION ); $self->param_from_request( 'num_errors', 'num_days', 'num_months' ); - $log->fatal( "This is a test fatal message" ); my $num_errors = $self->param( 'num_errors' ) || 10; my $num_days = $self->param( 'num_days' ) || 14; --- 22,25 ---- |
|
From: Chris W. <la...@us...> - 2005-03-14 16:46:07
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2774 Modified Files: Tutorial.pod TutorialAdvanced.pod Log Message: OIN-152: replace package.conf references in tutorial Index: Tutorial.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Tutorial.pod,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Tutorial.pod 26 Feb 2005 05:04:50 -0000 1.27 --- Tutorial.pod 14 Mar 2005 16:45:56 -0000 1.28 *************** *** 96,100 **** book/OpenInteract2/SQLInstall book/OpenInteract2/SQLInstall/Book.pm ! book/package.conf book/MANIFEST.SKIP book/Changes --- 96,100 ---- book/OpenInteract2/SQLInstall book/OpenInteract2/SQLInstall/Book.pm ! book/package.ini book/MANIFEST.SKIP book/Changes *************** *** 106,110 **** You will normally need to edit/add the following: ! book/package.conf # Add name, version, author information book/MANIFEST # Add names of distribution files book/conf/spops.ini # Describe the objects your package uses --- 106,110 ---- You will normally need to edit/add the following: ! book/package.ini # Add name, version, author information book/MANIFEST # Add names of distribution files book/conf/spops.ini # Describe the objects your package uses *************** *** 258,265 **** The class we're using as a SQL installer is held in the ! C<book/package.conf> file. Peek into the file and you should see: ... ! sql_installer OpenInteract2::SQLInstall::Book ... --- 258,265 ---- The class we're using as a SQL installer is held in the ! C<book/package.ini> file. Peek into the file and you should see: ... ! sql_installer = OpenInteract2::SQLInstall::Book ... *************** *** 1062,1066 **** Before you go any further put your info in the relevant areas of ! C<book/package.conf> (next to 'author' and 'url'). =head2 Check your package --- 1062,1066 ---- Before you go any further put your info in the relevant areas of ! C<book/package.ini> (next to 'author' and 'url'). =head2 Check your package *************** *** 1087,1091 **** ACTION: Config required fields ! OK: package.conf ACTION: Config defined modules --- 1087,1091 ---- ACTION: Config required fields ! OK: package.ini ACTION: Config defined modules *************** *** 1121,1125 **** ACTION: Config required fields ! OK: package.conf ACTION: Config defined modules --- 1121,1125 ---- ACTION: Config required fields ! OK: package.ini ACTION: Config defined modules *************** *** 1268,1272 **** Now that we've modified the templates let's install the new ! package. First edit the C<book/package.conf> file to reflect the new version number and add an entry to the top of the 'Changes' file. Next, export it and install the distribution to your website --- 1268,1272 ---- Now that we've modified the templates let's install the new ! package. First edit the C<book/package.ini> file to reflect the new version number and add an entry to the top of the 'Changes' file. Next, export it and install the distribution to your website *************** *** 1420,1424 **** That's pretty simple. Let's package it up and install it to the site. (Remember to first edit C<book/Changes> and ! C<book/package.conf>.) $ oi2_manage package_all --- 1420,1424 ---- That's pretty simple. Let's package it up and install it to the site. (Remember to first edit C<book/Changes> and ! C<book/package.ini>.) $ oi2_manage package_all *************** *** 1562,1566 **** 39: } ! You know the drill: edit C<book/Changes> and C<book/package.conf>, bundle up the package and install it, then restart the server. --- 1562,1566 ---- 39: } ! You know the drill: edit C<book/Changes> and C<book/package.ini>, bundle up the package and install it, then restart the server. *************** *** 1651,1655 **** Right Thing. ! Now edit your C<book/package.conf> and C<book/Changes> files to reflect the updates, bundle the package up and install it: --- 1651,1655 ---- Right Thing. ! Now edit your C<book/package.ini> and C<book/Changes> files to reflect the updates, bundle the package up and install it: *************** *** 1820,1824 **** 6: OpenInteract2::Action::CommonUpdate ); ! Now edit your C<book/package.conf> and C<book/Changes> files to reflect the updates, bundle the package up and install it: --- 1820,1824 ---- 6: OpenInteract2::Action::CommonUpdate ); ! Now edit your C<book/package.ini> and C<book/Changes> files to reflect the updates, bundle the package up and install it: *************** *** 1911,1915 **** 6: <p align="right"><a href="[% add_url %]">Add</a> a new book</p> ! And do your normal C<book/package.conf> and C<book/Changes> editing, then put your new package in the website: --- 1911,1915 ---- 6: <p align="right"><a href="[% add_url %]">Add</a> a new book</p> ! And do your normal C<book/package.ini> and C<book/Changes> editing, then put your new package in the website: *************** *** 1962,1966 **** 4: PROCESS status_message %] ! Now the standard C<book/package.conf> and C<book/Changes> editing, and then upgrade the website package: --- 1962,1966 ---- 4: PROCESS status_message %] ! Now the standard C<book/package.ini> and C<book/Changes> editing, and then upgrade the website package: Index: TutorialAdvanced.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/TutorialAdvanced.pod,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TutorialAdvanced.pod 12 Mar 2005 21:16:40 -0000 1.7 --- TutorialAdvanced.pod 14 Mar 2005 16:45:56 -0000 1.8 *************** *** 136,140 **** Add these files to your C<MANIFEST>, modify your C<Changes> and ! C<package.conf> and update your site. You can install the SQL structures like this (assuming C<OPENINTERACT2> environment variable is set to your website): --- 136,140 ---- Add these files to your C<MANIFEST>, modify your C<Changes> and ! C<package.ini> and update your site. You can install the SQL structures like this (assuming C<OPENINTERACT2> environment variable is set to your website): |
4 messages has been excluded from this view by a project administrator.
