perfsonar development work

Author: dfn.calim
Date: 2010-11-10 09:24:45 +0000 (Wed, 10 Nov 2010)
New Revision: 659

Added:
   branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/
   
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/etc/owamp.conf
   
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/MP/OWAMP.pm
Removed:
   branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/DEBIAN/
   branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/MANIFEST
   
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/etc/oppd-bwctl.conf.example
   
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/BWCTL.pm
   
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/MP/BWCTL.pm
   
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/oppd-MP-BWCTL-MDM.spec
   
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/perfsonar-oppd-mp-bwctl.spec
   
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/prepare-bwctl-mp-debian.pl
Modified:
   branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/Build.PL
Log:
Build files for OWAMP MP

Copied: branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP (from 
rev 658, branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL)


Property changes on: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/Build.PL
===================================================================
--- branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/Build.PL   
  2010-10-20 13:59:42 UTC (rev 658)
+++ branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/Build.PL   
  2010-11-10 09:24:45 UTC (rev 659)
@@ -3,12 +3,12 @@
 use Module::Build;
 
 my $builder = Module::Build->new(
-    module_name         => 'perfSONAR::MP::BWCTL',
-    dist_name           => 'perfsonar-oppd-mp-bwctl',
+    module_name         => 'perfSONAR::MP::OWAMP',
+    dist_name           => 'perfsonar-oppd-mp-owamp',
     license             => 'apache',
     dist_author         => 'DFN-Labor 
<>',
-    dist_version_from   => 'lib/perfSONAR.pm',
-    dist_abstract       => 'BWCTL MP module for perl-perfSONAR',
+    dist_version_from   => 'lib/perfSONAR/MP/OWAMP.pm',
+    dist_abstract       => 'OWAMP MP module for perl-perfSONAR',
     build_requires => {
         'Test::More' => 0,
     },
@@ -18,7 +18,7 @@
         'IO::Tty'    => '>= 1.02',
     },
     etc_files => {
-        'etc/oppd-bwctl.conf.example' => 'etc/oppd.d/oppd-bwctl.conf',
+        'etc/owamp.conf' => 'etc/oppd.d/owamp.conf',
     },
     add_to_cleanup      => [ 'perfSONAR-MP-BWCTL-*' ],
     create_makefile_pl => 'small',

Deleted: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/MANIFEST
===================================================================
--- branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/MANIFEST   
  2010-10-20 13:59:42 UTC (rev 658)
+++ branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/MANIFEST   
  2010-11-10 09:24:45 UTC (rev 659)
@@ -1,13 +0,0 @@
-Build.PL
-Changes
-MANIFEST
-README
-lib/perfSONAR/MP/BWCTL.pm
-lib/perfSONAR/BWCTL.pm
-etc/oppd-bwctl.conf.example
-t/00-load.t
-t/perfSONAR-BWCTL-001.t
-t/perfSONAR-MP-001.t
-t/perfSONAR-MP-BWCTL-001.t
-Makefile.PL
-META.yml

Deleted: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/etc/oppd-bwctl.conf.example
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
  2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/etc/oppd-bwctl.conf.example
  2010-11-10 09:24:45 UTC (rev 659)
@@ -1 +0,0 @@
-link ../../../etc/oppd-egee/oppd.d/bwctl.conf
\ No newline at end of file

Added: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/etc/owamp.conf
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/etc/owamp.conf 
                              (rev 0)
+++ 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/etc/owamp.conf 
      2010-11-10 09:24:45 UTC (rev 659)
@@ -0,0 +1 @@
+link ../../../etc/oppd-mdm/oppd.d/owamp.conf
\ No newline at end of file


Property changes on: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/etc/owamp.conf
___________________________________________________________________
Name: svn:special
   + *

Deleted: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/BWCTL.pm
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/lib/perfSONAR/BWCTL.pm
       2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/BWCTL.pm
       2010-11-10 09:24:45 UTC (rev 659)
@@ -1 +0,0 @@
-link ../../../../lib/perfSONAR/BWCTL.pm
\ No newline at end of file

Deleted: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/MP/BWCTL.pm
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/lib/perfSONAR/MP/BWCTL.pm
    2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/MP/BWCTL.pm
    2010-11-10 09:24:45 UTC (rev 659)
@@ -1 +0,0 @@
-link ../../../../../lib/perfSONAR/MP/BWCTL.pm
\ No newline at end of file

Added: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/MP/OWAMP.pm
                            (rev 0)
+++ 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/MP/OWAMP.pm
    2010-11-10 09:24:45 UTC (rev 659)
@@ -0,0 +1 @@
+link ../../../../../lib/perfSONAR/MP/OWAMP.pm
\ No newline at end of file


Property changes on: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/lib/perfSONAR/MP/OWAMP.pm
___________________________________________________________________
Name: svn:special
   + *

Deleted: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/oppd-MP-BWCTL-MDM.spec
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/oppd-MP-BWCTL-MDM.spec
       2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/oppd-MP-BWCTL-MDM.spec
       2010-11-10 09:24:45 UTC (rev 659)
@@ -1,117 +0,0 @@
-%define install_base /usr/lib/perfsonar/services/oppd
-
-Name:           perfsonar-oppd-mp-bwctl
-Version:        0.51
-Release:        1
-Summary:        perfSONAR::MP::BWCTL Perl module
-License:        BSD
-Group:          Development/Libraries
-URL:            http://search.cpan.org/dist/perfSONAR-MP-BWCTL/
-#Source0:        
http://www.cpan.org/modules/by-module/perfSONAR/perfSONAR-MP-BWCTL-%{version}.tar.gz
-Source0:       %{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} 
-n)
-BuildArch:      noarch
-#BuildRequires:  perl(IO::Tty) >= 1.02
-#BuildRequires:  perl(IPC::Run)
-#BuildRequires:  perl(Module::Build)
-#BuildRequires:  perl(perfSONAR) >= 0.4
-Requires:       perl(IO::Tty) >= 1.02
-Requires:       perl(IPC::Run)
-Requires:       perl(perfSONAR) >= 0.51
-#Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo 
$version))
-Obsoletes:      oppd
-Obsoletes:      oppd-mp-bwctl
-
-%description
-The README is used to introduce the module and provide instructions on how
-to install the module, any machine dependencies it may have (for example C
-compilers and installed libraries) and any other information that should be
-provided before the module is installed.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-%{__perl} Build.PL install_base=%install_base
-./Build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
-
-%check
-#./Build test
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-ln -s %install_base/etc/oppd-bwctl.conf /etc/oppd-bwctl.conf
-echo "include oppd-bwctl.conf" >> /etc/oppd.conf
-
-%preun
-if [ "$1" = 0 ] ; then
-/sbin/service oppd stop > /dev/null 2>&1
-sed -e s/"include oppd-bwctl.conf"// -i /etc/oppd.conf
-fi
-exit 0
-
-%postun
-if [ "$1" -ge 1 ]; then
-/sbin/service oppd condrestart > /dev/null 2>&1
-fi
-exit 0
-
-
-%files
-%defattr(-,perfsonar,perfsonar,-)
-%doc Changes README
-#%{perl_vendorlib}/*
-#%{_mandir}/man3/*
-%{install_base}/*
-
-%changelog
-* Thu Jul 02 2009 Verena Venus
-- Changed Release to 1 added obsoletes
-  for old oppd packages
-* Wed May 06 2009 Verena Venus
-- Changed Release to 0.rc2.MDM_3.1.1
-* Mon Mar 09 2009 Verena Venus
-- Changed Release to 0.rc1.MDM_3.1.1
-* Mon Feb 23 2009 Verena Venus
-- Changed Release to MDM_3.1.1
-- Changed Version to 0.51
-- added %post, %preun
-* Mon Nov 03 2008 Verena Venus
-- Changed Release to MDM_3.1
-* Tue Oct 28 2008 Verena Venus
-- Changed Release to RC7
-* Wed Oct 01 2008 Verena Venus
-- Changed Release to RC6
-- Changed install_base from /opt/perfsonar/services
-  to /usr/lib/perfsonar/services
-* Tue Sep 16 2008 Verena Venus
-- Changed Release to RC5.MDM_perfSONAR_3_1.fc7
-* Tue Jul 29 2008 Verena Venus
-- Changed Name to oppd
-- Changed Release to RC4
-- Changed Version to 0.5
-* Mon Jul 14 2008 Verena Venus
-- Changed Release to RC2.MDM_perfSONAR_3_1.fc7
-* Wed May 28 2008 Verena Venus
-- Changed Release to MDM_perfSONAR_3_1.fc7
-- Changed Version to 0.41
-* Tue Apr 15 2008 Verena Venus
-- Changed Release to RC5.MDM_perfSONAR_3.fc7
-* Mon Apr 14 2008 Verena Venus
-- changed install_base from /home/perfsonar/webapps
-  to /opt/perfsonar/services
-* Wed Mar 12 2008 Verena Venus
-- Changed Release to RC4.MDM_perfSONAR_3.fc7
-- Changed %defattr from root to perfsonar user
-* Wed Jan 16 2008 DFN-Labor 0.4-1
-- Specfile autogenerated by cpanspec 1.73.

Deleted: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/perfsonar-oppd-mp-bwctl.spec
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/perfsonar-oppd-mp-bwctl.spec
 2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/perfsonar-oppd-mp-bwctl.spec
 2010-11-10 09:24:45 UTC (rev 659)
@@ -1,88 +0,0 @@
-Name:           perfsonar-oppd-mp-bwctl
-Version:        0.51
-Release:        2egee
-Summary:        perfSONAR::MP::BWCTL Perl module
-License:        Apache
-Group:          Development/Libraries
-URL:            http://search.cpan.org/dist/perfSONAR-MP-BWCTL/
-#Source0:        
http://www.cpan.org/modules/by-module/perfSONAR/perfSONAR-MP-BWCTL-%{version}.tar.gz
-Source0:       %{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} 
-n)
-BuildArch:      noarch
-#BuildRequires:  perl(IO::Tty) >= 1.02
-#BuildRequires:  perl(IPC::Run)
-#BuildRequires:  perl(Module::Build)
-#BuildRequires:  perl(perfSONAR) >= 0.4
-Requires:       perl(IO::Tty) >= 1.02
-Requires:       perl(IPC::Run)
-Requires:       perl(perfSONAR) >= 0.51
-Requires:       perfsonar-oppd >= 0.51
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo 
$version))
-
-%description
-The README is used to introduce the module and provide instructions on how
-to install the module, any machine dependencies it may have (for example C
-compilers and installed libraries) and any other information that should be
-provided before the module is installed.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-%{__perl} Build.PL installdirs=vendor
-./Build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
-
-%check
-#./Build test
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-#%pre
-#if test -e /etc/oppd.d/oppd-bwctl.conf.removed ; then
-#mv /etc/oppd.d/oppd-bwctl.conf.removed /etc/oppd.d/oppd-bwctl.conf
-#fi
-
-%post
-#ln -s %install_base/etc/oppd-bwctl.conf /etc/oppd-bwctl.conf
-#echo "include oppd-bwctl.conf" >> /etc/oppd.conf
-chown perfsonar:perfsonar /etc/oppd.d/oppd-bwctl.conf
-
-%preun
-if [ "$1" = 0 ] ; then
-/sbin/service oppd stop > /dev/null 2>&1
-mv /etc/oppd.d/oppd-bwctl.conf /etc/oppd.d/oppd-bwctl.conf.removed
-fi
-exit 0
-
-%postun
-if [ "$1" -ge 1 ]; then
-/sbin/service oppd condrestart > /dev/null 2>&1
-fi
-exit 0
-
-
-%files
-%defattr(-,perfsonar,perfsonar,-)
-%doc Changes README
-%{perl_vendorlib}/*
-#%{_mandir}/man3/*
-#%{install_base}/*
-%config(noreplace) /etc/oppd.d/oppd-bwctl.conf
-
-%changelog
-* Thu Oct 29 2009 DFN Labor
-- updated release tag
-* Tue Jun 23 2009 Verena Venus
-- derived Version from MDM spec, changed install path to vendor
-- changed release to 0.beta
-* Wed Jan 16 2008 DFN-Labor 0.4-1
-- Specfile autogenerated by cpanspec 1.73.

Deleted: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/prepare-bwctl-mp-debian.pl
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/prepare-bwctl-mp-debian.pl
   2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-OWAMP/prepare-bwctl-mp-debian.pl
   2010-11-10 09:24:45 UTC (rev 659)
@@ -1,47 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use File::Path;
-
-my $mp_version = "0.5"; #version of bwctl mp
-my $package_path = "oppd-mp-bwctl-$mp_version";
-my $install_path = "usr/lib/perfsonar/services/oppd/lib/perfSONAR";
-
-
-`rm -rf $package_path`;
-mkpath("$package_path");
-`tar zcvfh lib.tgz lib/* --exclude .svn`;
-`mv lib.tgz $package_path`;
-
-
-chdir("$package_path");
-`tar zxvf lib.tgz`;
-`rm -rf lib.tgz`;
-
-mkpath("usr/share/doc/oppd-mp-bwctl");
-mkpath("$install_path");
-mkpath("$install_path/MP");
-
-`mv lib/perfSONAR/* $install_path`;
-#`mv lib/perfSONAR/MP/* $install_path/MP`;
-
-`cp -R ../DEBIAN .`;
-`mv DEBIAN/changelog.Debian.gz DEBIAN/copyright 
usr/share/doc/oppd-mp-bwctl/`;
-`rm -rf DEBIAN/.svn`;
-
-`rm -rf lib/`;
-
-=cut
-opendir(DIR, ".") || die "cannot open directory . $!\n";
-my @files = grep !/^\./, readdir DIR;
-foreach my $file (@files){
-  next if (-d $file);
-  `mv $file usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/`;
-}
-=cut
-
-chdir("..");
-`rm -rf $package_path-debian.tgz`;
-`tar zcvf $package_path-debian.tgz $package_path`;