From 67da854fb6023766b9f1537897fc8ec66531b4b3 Mon Sep 17 00:00:00 2001
From: "renater.salaun" <renater.salaun@047e039d-479c-447e-8a29-aa6bf4a09bab>
Date: Thu, 12 Mar 2015 12:36:56 +0000
Subject: [PATCH] Fixed copyright notice and added a reference to RENATER and
european communty program Renamed documentation files according to new
service name
git-svn-id: https://svn.geant.net/GEANT/edugain_testidp_account_manager/trunk@105 047e039d-479c-447e-8a29-aa6bf4a09bab
---
bin/account-manager-client.pl | 8 +++-
bin/account-manager-web.pl | 5 ++-
... => edugain_access_check_architecture.pdf} | Bin
lib/IdPAccountManager/AuthenticationToken.pm | 9 ++++-
lib/IdPAccountManager/SAMLMetadata.pm | 8 +++-
lib/IdPAccountManager/ServiceProvider.pm | 8 +++-
lib/IdPAccountManager/TestAccount.pm | 8 +++-
lib/IdPAccountManager/TestAccount.pm.ORIG | 36 ------------------
lib/IdPAccountManager/Tools.pm | 8 +++-
9 files changed, 46 insertions(+), 44 deletions(-)
rename doc/{edugain_test_idp_architecture.pdf => edugain_access_check_architecture.pdf} (100%)
delete mode 100644 lib/IdPAccountManager/TestAccount.pm.ORIG
diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index 5c8dab9..38694e2 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -1,5 +1,9 @@
#!/usr/bin/perl
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
## 18/07/2014, Olivier Salaün
## Command-line client for the Test IdP Account Manager
@@ -335,4 +339,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
=head1 LICENSE
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index 8e3cbb8..25c4440 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -1,7 +1,8 @@
#!/usr/bin/perl
-## Copyright (c) 2015 RENATER on behalf of the GÉANT project
-
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
## 15/09/2014, Olivier Salaün
## Web interface for the eduGAIN Access Check Account Manager
diff --git a/doc/edugain_test_idp_architecture.pdf b/doc/edugain_access_check_architecture.pdf
similarity index 100%
rename from doc/edugain_test_idp_architecture.pdf
rename to doc/edugain_access_check_architecture.pdf
diff --git a/lib/IdPAccountManager/AuthenticationToken.pm b/lib/IdPAccountManager/AuthenticationToken.pm
index 948af9e..f64cbd5 100644
--- a/lib/IdPAccountManager/AuthenticationToken.pm
+++ b/lib/IdPAccountManager/AuthenticationToken.pm
@@ -1,5 +1,10 @@
package IdPAccountManager::AuthenticationToken;
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
+
use strict;
use IdPAccountManager::Data::Authenticationtoken;
@@ -232,4 +237,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
=head1 LICENSE
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/lib/IdPAccountManager/SAMLMetadata.pm b/lib/IdPAccountManager/SAMLMetadata.pm
index 9901fdd..64c48b7 100644
--- a/lib/IdPAccountManager/SAMLMetadata.pm
+++ b/lib/IdPAccountManager/SAMLMetadata.pm
@@ -1,5 +1,9 @@
package IdPAccountManager::SAMLMetadata;
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
use strict;
use IdPAccountManager::Tools;
@@ -380,4 +384,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
=head1 LICENSE
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/lib/IdPAccountManager/ServiceProvider.pm b/lib/IdPAccountManager/ServiceProvider.pm
index e6c2883..6d07563 100644
--- a/lib/IdPAccountManager/ServiceProvider.pm
+++ b/lib/IdPAccountManager/ServiceProvider.pm
@@ -1,6 +1,10 @@
package IdPAccountManager::ServiceProvider;
use base 'IdPAccountManager::Data::Serviceprovider';
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
use strict;
use IdPAccountManager::Data::Serviceprovider;
@@ -97,4 +101,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
=head1 LICENSE
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/lib/IdPAccountManager/TestAccount.pm b/lib/IdPAccountManager/TestAccount.pm
index e325c51..b87f5a0 100644
--- a/lib/IdPAccountManager/TestAccount.pm
+++ b/lib/IdPAccountManager/TestAccount.pm
@@ -1,5 +1,9 @@
package IdPAccountManager::TestAccount;
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
use strict;
use IdPAccountManager::Data::Testaccount;
@@ -245,4 +249,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
=head1 LICENSE
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/lib/IdPAccountManager/TestAccount.pm.ORIG b/lib/IdPAccountManager/TestAccount.pm.ORIG
deleted file mode 100644
index de034a5..0000000
--- a/lib/IdPAccountManager/TestAccount.pm.ORIG
+++ /dev/null
@@ -1,36 +0,0 @@
-package IdPAccountManager::TestAccount;
-
-use Moose;
-use Moose::Util::TypeConstraints;
-
-subtype 'entityid',
- as 'Str',
- where { /^(urn:|http(s)?\:\/\/)/ },
- message { "$_ is not a valide entityid"};
-
-has 'account_profile' => (is => 'ro',
- isa => 'Str',
- required => 1);
-has 'sp_entityid' => (is => 'rw',
- isa => 'entityid',
- required => 1,
- );
-
-#before 'new' => sub { print "about to call new\n"; };
-
-1; # Magic true value required at end of module
-__END__
-
-=head1 NAME
-
-IdPAccountManager::TestAccount - Manage test user accounts for the Test Identity Provider
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-=head1 SUBROUTINES/METHODS
-
-=head1 AUTHOR
-
-Olivier Salaün (olivier.salaun@renater.fr)
diff --git a/lib/IdPAccountManager/Tools.pm b/lib/IdPAccountManager/Tools.pm
index 46f308e..a661d3a 100644
--- a/lib/IdPAccountManager/Tools.pm
+++ b/lib/IdPAccountManager/Tools.pm
@@ -1,5 +1,9 @@
package IdPAccountManager::Tools;
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
use Template;
# load Template::Stash to make method tables visible
@@ -336,4 +340,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
=head1 LICENSE
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
--
GitLab