perfsonar-dev - [pS-dev] [GEANT/SA2/SA2T3-OPPD] r714 - in trunk: build build/perfSONAR build/perfSONAR-MA-Hades/etc build/perfSONAR-MP-LSToolreg build/perfSONAR-MP-OWAMP/etc build/rpm/0.53-1 build/rpm/SPECS lib lib/perfSONAR/Client
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/SA2T3-OPPD] r714 - in trunk: build build/perfSONAR build/perfSONAR-MA-Hades/etc build/perfSONAR-MP-LSToolreg build/perfSONAR-MP-OWAMP/etc build/rpm/0.53-1 build/rpm/SPECS lib lib/perfSONAR/Client
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/SA2T3-OPPD] r714 - in trunk: build build/perfSONAR build/perfSONAR-MA-Hades/etc build/perfSONAR-MP-LSToolreg build/perfSONAR-MP-OWAMP/etc build/rpm/0.53-1 build/rpm/SPECS lib lib/perfSONAR/Client
- Date: Wed, 29 Jun 2011 10:03:31 +0100
Author: dfn.calim
Date: 2011-06-29 10:03:31 +0100 (Wed, 29 Jun 2011)
New Revision: 714
Added:
trunk/build/perfSONAR-MP-LSToolreg/
trunk/build/rpm/0.53-1/perfsonar-oppd-mp-lstoolreg-0.53-1.noarch.rpm
trunk/build/rpm/0.53-1/perl-NMWG-0.03-1.noarch.rpm
trunk/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec
Removed:
trunk/build/perfSONAR-MP-LSToolreg/Build.PL.redhat
trunk/build/perfSONAR-MP-LSToolreg/t/
Modified:
trunk/build/perfSONAR-MA-Hades/etc/hades-status.conf
trunk/build/perfSONAR-MA-Hades/etc/hades.conf
trunk/build/perfSONAR-MP-LSToolreg/Build.PL
trunk/build/perfSONAR-MP-LSToolreg/MANIFEST
trunk/build/perfSONAR-MP-LSToolreg/README
trunk/build/perfSONAR-MP-OWAMP/etc/owamp.conf
trunk/build/perfSONAR/MANIFEST
trunk/build/rpm/0.53-1/perfsonar-oppd-0.53-1.noarch.rpm
trunk/build/rpm/0.53-1/perfsonar-oppd-ma-hades-0.53-1.noarch.rpm
trunk/build/rpm/0.53-1/perfsonar-oppd-mp-bwctl-0.53-1.noarch.rpm
trunk/build/rpm/0.53-1/perfsonar-oppd-mp-owamp-0.53-1.noarch.rpm
trunk/build/rpm/SPECS/oppd-MA-Hades.spec
trunk/build/rpm/SPECS/oppd-MDM.spec
trunk/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec
trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec
trunk/build/rpm/SPECS/perl-NMWG-MDM.spec
trunk/lib/NMWG.pm
trunk/lib/perfSONAR/Client/LS.pm
Log:
Addded new RPM package for LSToolreg and fix soem problems in configuration
Modified: trunk/build/perfSONAR/MANIFEST
===================================================================
--- trunk/build/perfSONAR/MANIFEST 2011-06-21 10:17:46 UTC (rev 713)
+++ trunk/build/perfSONAR/MANIFEST 2011-06-29 09:03:31 UTC (rev 714)
@@ -9,8 +9,8 @@
etc/LS_register.xml
etc/oppd-mdm.conf
etc/oppd.conf.example
+etc/oppd.init.redhat
etc/oppd.sysconfig.redhat
-etc/oppd.init.redhat
lib/perfSONAR.pm
lib/perfSONAR/Auth.pm
lib/perfSONAR/Client/LS.pm
@@ -19,6 +19,7 @@
lib/perfSONAR/Echo.pm
lib/perfSONAR/MA.pm
lib/perfSONAR/MP.pm
+lib/perfSONAR/Selftest.pm
lib/perfSONAR/SOAP.pm
lib/perfSONAR/SOAP/Fault.pm
lib/perfSONAR/SOAP/Fault_v1_1.pm
@@ -30,6 +31,7 @@
Makefile.PL
MANIFEST This list of files
META.yml
+prepare-oppd-debian.pl
README
t/00-load.t
t/perfSONAR-001-SOAP-Message.t
Modified: trunk/build/perfSONAR-MA-Hades/etc/hades-status.conf
===================================================================
--- trunk/build/perfSONAR-MA-Hades/etc/hades-status.conf 2011-06-21
10:17:46 UTC (rev 713)
+++ trunk/build/perfSONAR-MA-Hades/etc/hades-status.conf 2011-06-29
09:03:31 UTC (rev 714)
@@ -1 +1 @@
-link ../../../etc/oppd-hades-ma/oppd.d/hades-status.conf
\ No newline at end of file
+link ../../../etc/oppd.d.example/status.conf
\ No newline at end of file
Modified: trunk/build/perfSONAR-MA-Hades/etc/hades.conf
===================================================================
--- trunk/build/perfSONAR-MA-Hades/etc/hades.conf 2011-06-21 10:17:46
UTC (rev 713)
+++ trunk/build/perfSONAR-MA-Hades/etc/hades.conf 2011-06-29 09:03:31
UTC (rev 714)
@@ -1 +1 @@
-link ../../../etc/oppd-hades-ma/oppd.d/hades.conf
\ No newline at end of file
+link ../../../etc/oppd.d.example/hades.conf
\ No newline at end of file
Copied: trunk/build/perfSONAR-MP-LSToolreg (from rev 713,
trunk/build/perfSONAR-MP-OWAMP)
Modified: trunk/build/perfSONAR-MP-LSToolreg/Build.PL
===================================================================
--- trunk/build/perfSONAR-MP-OWAMP/Build.PL 2011-06-21 10:17:46 UTC (rev
713)
+++ trunk/build/perfSONAR-MP-LSToolreg/Build.PL 2011-06-29 09:03:31 UTC (rev
714)
@@ -3,22 +3,20 @@
use Module::Build;
my $builder = Module::Build->new(
- module_name => 'perfSONAR::MP::OWAMP',
- dist_name => 'perfsonar-oppd-mp-owamp',
+ module_name => 'perfSONAR::MP::LSToolreg',
+ dist_name => 'perfsonar-oppd-mp-lstoolreg',
license => 'apache',
dist_author => 'DFN-Labor
<>',
dist_version => '0.53',
- dist_abstract => 'OWAMP MP module for perl-perfSONAR',
+ dist_abstract => 'LSToolreg MP module for perl-perfSONAR',
build_requires => {
'Test::More' => 0,
},
requires => {
'perfSONAR' => 0.51,
- 'IPC::Run' => 0,
- 'IO::Tty' => '>= 1.02',
},
etc_files => {
- 'etc/owamp.conf' => 'etc/oppd.d/owamp.conf',
+ 'etc/lstoolreg.conf' => 'etc/oppd.d/lstoolreg.conf',
},
add_to_cleanup => [ 'perfSONAR-MP-BWCTL-*' ],
create_makefile_pl => 'small',
Deleted: trunk/build/perfSONAR-MP-LSToolreg/Build.PL.redhat
===================================================================
--- trunk/build/perfSONAR-MP-OWAMP/Build.PL.redhat 2011-06-21 10:17:46
UTC (rev 713)
+++ trunk/build/perfSONAR-MP-LSToolreg/Build.PL.redhat 2011-06-29 09:03:31
UTC (rev 714)
@@ -1,30 +0,0 @@
-use strict;
-use warnings;
-use Module::Build;
-
-my $builder = Module::Build->new(
- module_name => 'perfSONAR::MP::OWAMP',
- dist_name => 'perfsonar-oppd-mp-owamp',
- license => 'apache',
- dist_author => 'DFN-Labor
<>',
- dist_version => '0.54',
- dist_abstract => 'OWAMP MP module for perl-perfSONAR',
- build_requires => {
- 'Test::More' => 0,
- },
- requires => {
- 'perfSONAR' => 0.51,
- 'IPC::Run' => 0,
- 'IO::Tty' => '>= 1.02',
- },
- etc_files => {
- 'etc/owamp.conf' => 'etc/oppd.d/owamp.conf',
- },
- add_to_cleanup => [ 'perfSONAR-MP-BWCTL-*' ],
- create_makefile_pl => 'small',
-);
-
-$builder->install_path('etc' => '/etc');
-$builder->add_build_element('etc');
-$builder->install_base_relpaths('lib' => 'lib');
-$builder->create_build_script();
Modified: trunk/build/perfSONAR-MP-LSToolreg/MANIFEST
===================================================================
--- trunk/build/perfSONAR-MP-OWAMP/MANIFEST 2011-06-21 10:17:46 UTC (rev
713)
+++ trunk/build/perfSONAR-MP-LSToolreg/MANIFEST 2011-06-29 09:03:31 UTC (rev
714)
@@ -1,9 +1,8 @@
Build.PL
Changes
-etc/owamp.conf
-lib/perfSONAR/MP/OWAMP.pm
-MANIFEST This list of files
-README
-t/00-load.t
+etc/lstoolreg.conf
+lib/perfSONAR/MP/LSToolreg.pm
Makefile.PL
+MANIFEST This list of files
META.yml
+README
Modified: trunk/build/perfSONAR-MP-LSToolreg/README
===================================================================
--- trunk/build/perfSONAR-MP-OWAMP/README 2011-06-21 10:17:46 UTC (rev
713)
+++ trunk/build/perfSONAR-MP-LSToolreg/README 2011-06-29 09:03:31 UTC (rev
714)
@@ -1,7 +1,7 @@
-oppd-MP-BWCTL
+oppd-MP-LSToolre
-------------
-Version 0.51
+Version 0.53
The oppd BWCTL MP is a service plugin for oppd (open perl perfSONAR daemon).
It's purpose is to provide a perfSONAR interface to bwctl measurements.
Modified: trunk/build/perfSONAR-MP-OWAMP/etc/owamp.conf
===================================================================
--- trunk/build/perfSONAR-MP-OWAMP/etc/owamp.conf 2011-06-21 10:17:46
UTC (rev 713)
+++ trunk/build/perfSONAR-MP-OWAMP/etc/owamp.conf 2011-06-29 09:03:31
UTC (rev 714)
@@ -1 +1 @@
-link ../../../etc/oppd-mdm/oppd.d/owamp.conf
\ No newline at end of file
+link ../../../etc/oppd.d.example/owamp.conf
\ No newline at end of file
Modified: trunk/build/rpm/0.53-1/perfsonar-oppd-0.53-1.noarch.rpm
===================================================================
(Binary files differ)
Modified: trunk/build/rpm/0.53-1/perfsonar-oppd-ma-hades-0.53-1.noarch.rpm
===================================================================
(Binary files differ)
Modified: trunk/build/rpm/0.53-1/perfsonar-oppd-mp-bwctl-0.53-1.noarch.rpm
===================================================================
(Binary files differ)
Added: trunk/build/rpm/0.53-1/perfsonar-oppd-mp-lstoolreg-0.53-1.noarch.rpm
===================================================================
(Binary files differ)
Property changes on:
trunk/build/rpm/0.53-1/perfsonar-oppd-mp-lstoolreg-0.53-1.noarch.rpm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/build/rpm/0.53-1/perfsonar-oppd-mp-owamp-0.53-1.noarch.rpm
===================================================================
(Binary files differ)
Added: trunk/build/rpm/0.53-1/perl-NMWG-0.03-1.noarch.rpm
===================================================================
(Binary files differ)
Property changes on: trunk/build/rpm/0.53-1/perl-NMWG-0.03-1.noarch.rpm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/build/rpm/SPECS/oppd-MA-Hades.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MA-Hades.spec 2011-06-21 10:17:46 UTC (rev
713)
+++ trunk/build/rpm/SPECS/oppd-MA-Hades.spec 2011-06-29 09:03:31 UTC (rev
714)
@@ -12,7 +12,7 @@
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}
-n)
BuildArch: noarch
-Requires: perfsonar-oppd >= 0.54
+Requires: perfsonar-oppd >= 0.53
Requires: hades-server
#Obsoletes: oppd-mp-bwctl.noarch <= 0.51
Modified: trunk/build/rpm/SPECS/oppd-MDM.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MDM.spec 2011-06-21 10:17:46 UTC (rev 713)
+++ trunk/build/rpm/SPECS/oppd-MDM.spec 2011-06-29 09:03:31 UTC (rev 714)
@@ -37,7 +37,7 @@
Requires: perl(Log::Dispatch::Screen)
Requires: perl(Log::Dispatch::Syslog) >= 0.16
Requires: perl(LWP::UserAgent)
-Requires: perl(NMWG) >= 0.02
+Requires: perl(NMWG) >= 0.03
Requires: perl(NMWG::Message)
Requires: perl(URI)
Requires: perl(XML::LibXML)
Modified: trunk/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec 2011-06-21 10:17:46
UTC (rev 713)
+++ trunk/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec 2011-06-29 09:03:31
UTC (rev 714)
@@ -17,7 +17,7 @@
#BuildRequires: perl(perfSONAR) >= 0.4
Requires: perl(IO::Tty) >= 1.02
Requires: perl(IPC::Run)
-Requires: perfsonar-oppd >= 0.54
+Requires: perfsonar-oppd >= 0.53
Requires: bwctl-client
Obsoletes: oppd-mp-bwctl.noarch <= 0.51
Copied: trunk/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec (from rev 713,
trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec)
===================================================================
--- trunk/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec
(rev 0)
+++ trunk/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec 2011-06-29 09:03:31
UTC (rev 714)
@@ -0,0 +1,70 @@
+%define install_base /usr/lib/perfsonar/services/oppd
+
+Name: perfsonar-oppd-mp-lstoolreg
+Version: 0.53
+Release: 1
+Summary: perfSONAR::MP::LSToolreg 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
+Requires: perfsonar-oppd >= 0.53
+
+%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
+/sbin/service oppd start > /dev/null 2>&1
+
+%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}/*
+%config /etc/oppd.d/lstoolreg.conf
+
+%changelog
+* Tue Jun 20 2011 Hakan Calim
+- This new module added to versioon 0.53
Modified: trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec 2011-06-21 10:17:46
UTC (rev 713)
+++ trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec 2011-06-29 09:03:31
UTC (rev 714)
@@ -17,7 +17,7 @@
#BuildRequires: perl(perfSONAR) >= 0.4
Requires: perl(IO::Tty) >= 1.02
Requires: perl(IPC::Run)
-Requires: perfsonar-oppd >= 0.54
+Requires: perfsonar-oppd >= 0.53
Requires: owamp-client
Obsoletes: oppd-mp-bwctl.noarch <= 0.51
Modified: trunk/build/rpm/SPECS/perl-NMWG-MDM.spec
===================================================================
--- trunk/build/rpm/SPECS/perl-NMWG-MDM.spec 2011-06-21 10:17:46 UTC (rev
713)
+++ trunk/build/rpm/SPECS/perl-NMWG-MDM.spec 2011-06-29 09:03:31 UTC (rev
714)
@@ -1,8 +1,8 @@
%define install_base /usr/lib/perfsonar/services/oppd/
Name: perl-NMWG
-Version: 0.02
-Release: 2
+Version: 0.03
+Release: 1
Summary: NMWG Perl module
License: BSD
Group: Development/Libraries
Modified: trunk/lib/NMWG.pm
===================================================================
--- trunk/lib/NMWG.pm 2011-06-21 10:17:46 UTC (rev 713)
+++ trunk/lib/NMWG.pm 2011-06-29 09:03:31 UTC (rev 714)
@@ -31,11 +31,11 @@
=head1 VERSION
-Version 0.02
+Version 0.03
=cut
-our $VERSION = '0.02';
+our $VERSION = '0.03';
=head1 SYNOPSIS
Modified: trunk/lib/perfSONAR/Client/LS.pm
===================================================================
--- trunk/lib/perfSONAR/Client/LS.pm 2011-06-21 10:17:46 UTC (rev 713)
+++ trunk/lib/perfSONAR/Client/LS.pm 2011-06-29 09:03:31 UTC (rev 714)
@@ -58,8 +58,8 @@
$keepalive_template = "$FindBin::RealBin/../etc/LS_keepalive.xml";
} else {
$register_template = "/etc/oppd.d/LS_register.xml";
- $deregister_template = "/etc/oppd/LS_deregister.xml";
- $keepalive_template = "/etc/oppd/LS_keepalive.xml";
+ $deregister_template = "/etc/oppd.d/LS_deregister.xml";
+ $keepalive_template = "/etc/oppd.d/LS_keepalive.xml";
}
my $psservice = "http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
- [pS-dev] [GEANT/SA2/SA2T3-OPPD] r714 - in trunk: build build/perfSONAR build/perfSONAR-MA-Hades/etc build/perfSONAR-MP-LSToolreg build/perfSONAR-MP-OWAMP/etc build/rpm/0.53-1 build/rpm/SPECS lib lib/perfSONAR/Client, svn-noreply, 06/29/2011
Archive powered by MHonArc 2.6.16.