Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r5227 - in branches/GEANT2-JAVA-SQL-MA-STABLE: conf doc packaging packaging/deb packaging/rpm

Subject: perfsonar development work

List archive

perfsonar: r5227 - in branches/GEANT2-JAVA-SQL-MA-STABLE: conf doc packaging packaging/deb packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r5227 - in branches/GEANT2-JAVA-SQL-MA-STABLE: conf doc packaging packaging/deb packaging/rpm
  • Date: Thu, 16 Jul 2009 08:35:45 -0400
Author: pikusa
Date: 2009-07-16 08:35:44 -0400 (Thu, 16 Jul 2009)
New Revision: 5227

Added:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbupdate.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/changelog-update.sh
Removed:
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Collaboration.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_centos_5.2.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_debian_4.0.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_fedora_10.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_ubuntu_8.10.txt

branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.3.pdf
Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/conffiles
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
Log:
Code freezing. Branch synchronized with trunk to release
perfsonar-java-sql-ma-2.2-1

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2009-07-14 07:04:24 UTC (rev 5226)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2009-07-16 12:35:44 UTC (rev 5227)
@@ -95,7 +95,7 @@
throughput FLOAT (16,4) NULL,
jitter FLOAT (16,4) NULL,
loss VARCHAR(15) NULL,
- numBytes INT NULL,
+ numBytes NUMERIC(40) NULL,
numBytesUnits VARCHAR(15) NULL,
interv VARCHAR(30) NULL,
time INT NOT NULL,

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbupdate.sql
(from rev 5226, trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbupdate.sql)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
2009-07-14 07:04:24 UTC (rev 5226)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
2009-07-16 12:35:44 UTC (rev 5227)
@@ -110,7 +110,7 @@
throughput double precision null,
jitter double precision null,
loss varchar(15) null,
- numBytes integer null,
+ numBytes NUMERIC(40) null,
numBytesUnits varchar(15) null,
interv varchar(30) null,
time integer not null,

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2009-07-14
07:04:24 UTC (rev 5226)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2009-07-16
12:35:44 UTC (rev 5227)
@@ -1,5 +1,18 @@
-Relational Database MA
+2009 Jul 07 Version 2.2
+ - Removed installation text guides
+ - Removed Web Admin Guide in pdf file. Up-to-date Admin Guide is available
on https://anonsvn.internet2.edu/svn/perfsonar/trunk/perfsonar-doc/manuals/
+ - Package name changed from geant2-java-sql-ma to perfsonar-java-sql-ma

+
+2009 May 25 Version 2.1.1-5
+ - New: sql scripts creating db schema in MySql and PostgresSQL added to
conf directory
+ - New: sql script added updating MySql db schema from last stable version
to current
+ - Change: Web Admin Guide document updated (v 1.5)
+
+2009 May 04 Vertion 2.1.1-2
+
+ - Fixed Bug #755: In perfsonar_iperf sql table column numBytes changed from
INT to NUMERIC(40)
+
2009-02-10 Version 2.1.1
- New: support for iperf/nmwg metadata and data
- Change: xquery statements ("fetch all") for utilization, discards and
errors metadata elements updated

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Collaboration.txt

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_centos_5.2.txt

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_debian_4.0.txt

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_fedora_10.txt

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_ubuntu_8.10.txt

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.3.pdf

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/changelog-update.sh
(from rev 5226, trunk/geant2-java-sql-ma/packaging/changelog-update.sh)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2009-07-14
07:04:24 UTC (rev 5226)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2009-07-16
12:35:44 UTC (rev 5227)
@@ -1,3 +1,25 @@
+perfsonar-java-sql-ma (2.2) stable; urgency=low
+
+ * Removed installation text guides
+ * Removed Web Admin Guide in pdf file. Up-to-date Admin Guide is available
on https://anonsvn.internet2.edu/svn/perfsonar/trunk/perfsonar-doc/manuals/
+ * Package name changed from geant2-java-sql-ma to perfsonar-java-sql-ma
+
+ -- Piotr Pikusa
<>
Tue, 07 Jul 2009 13:00:00 +0200
+
+geant2-java-sql-ma (2.1.1-5) stable; urgency=low
+
+ * New: sql scripts creating db schema in MySql and PostgresSQL added to
conf directory
+ * New: sql script added updating MySql db schema from last stable version
to current
+ * Change: Web Admin Guide document updated (v 1.5)
+
+ -- Piotr Pikusa
<>
Mon, 25 May 2009 14:00:00 +0200
+
+geant2-java-sql-ma (2.1.1-2) stable; urgency=low
+
+ * Fixed Bug #755: In perfsonar_iperf sql table column numBytes changed
from INT to NUMERIC(40)
+
+ -- Piotr Pikusa
<>
Mon, 4 May 2009 10:00:00 +0200
+
geant2-java-sql-ma (2.1.1-1) stable; urgency=low

* New: support for iperf/nmwg metadata and data

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/conffiles
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/conffiles 2009-07-14
07:04:24 UTC (rev 5226)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/conffiles 2009-07-16
12:35:44 UTC (rev 5227)
@@ -9,6 +9,9 @@

/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml

/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/wizard.properties

/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/wizardproperties.dtd
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/mysql-sqlma-dbremove.sql
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/mysql-sqlma-dbsetup.sql
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/mysql-sqlma-dbupdate.sql

/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml

/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-utilization.xml

/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml
@@ -27,3 +30,5 @@

/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-clmp-ping.xml
/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/web.xml
/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/server-config.wsdd
+
+

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2009-07-14 07:04:24 UTC (rev 5226)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2009-07-16 12:35:44 UTC (rev 5227)
@@ -1,22 +1,27 @@

-%define prefix /usr/lib/perfsonar/services/%{name}
+%define oldname geant2-java-sql-ma
+%define prefix /usr/lib/perfsonar/services/%{oldname}

-Name: geant2-java-sql-ma
-Version: 2.1.1
+Name: perfsonar-java-sql-ma
+Version: 2.2
License: Modified BSD
Release: 1
Summary: perfSONAR Relational Database Service
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Group: Network/Web service
-packager: Roman Lapacz
<>
+packager: Piotr Pikusa
<>
URL: http://www.perfsonar.org
Requires: tomcat5-exist
BuildArch: noarch
-BuildRequires: maven2
+#BuildRequires: maven2

+Obsoletes: geant2-java-sql-ma
+Conflicts: geant2-java-sql-ma


+
+
%description
perfSONAR Relational Database Service

@@ -39,9 +44,9 @@
# make the directory
rm -rf $RPM_BUILD_ROOT
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{oldname}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}/schema
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
@@ -51,11 +56,11 @@

# copy the service content to the tomcat webapps directory
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
- %{__cp} -a %{name}/* ${RPM_BUILD_ROOT}%{prefix}
+ %{__cp} -a %{oldname}/* ${RPM_BUILD_ROOT}%{prefix}
popd

pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
- %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
+ %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}
popd

pushd ${RPM_BUILD_DIR}/%{name}-%{version}
@@ -67,12 +72,13 @@

%post
## make symlink for easy access to conf
-%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{name}
-%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
-%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
-%{__ln_s} -f %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{name}
-%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
-%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.sql
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{oldname}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{oldname}

## restart tomcat
/sbin/service tomcat5 restart
@@ -82,11 +88,12 @@
%preun
## remove symlink
if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/service.properties ]; then
- %{__rm} -rf %{_sysconfdir}/%{name}/*.properties || true
- %{__rm} -rf %{_sysconfdir}/%{name}/objects.config || true
- %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
- %{__rm} -rf %{_var}/log/%{name} || true
- %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+ %{__rm} -rf %{_sysconfdir}/%{oldname}/*.properties || true
+ %{__rm} -rf %{_sysconfdir}/%{oldname}/objects.config || true
+ %{__rm} -rf %{_sysconfdir}/%{oldname}/*.xml || true
+ %{__rm} -rf %{_sysconfdir}/%{oldname}/*.sql || true
+ %{__rm} -rf %{_var}/log/%{oldname} || true
+ %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{oldname} || true
fi


@@ -109,13 +116,26 @@
%attr(640,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%attr(640,tomcat,tomcat) %config(noreplace) %{prefix}/WEB-INF/classes/*.xml
%{prefix}
-%{_sysconfdir}/%{name}
-/usr/share/doc/%{name}
-/usr/share/doc/%{name}/schema
+%{_sysconfdir}/%{oldname}
+/usr/share/doc/%{oldname}
+/usr/share/doc/%{oldname}/schema



%changelog
+* Tue Jul 07 2009 Piotr Pikusa
<>
2.2
+- Removed installation text guides
+- Removed Web Admin Guide in pdf file. Up-to-date Admin Guide is available
on https://anonsvn.internet2.edu/svn/perfsonar/trunk/perfsonar-doc/manuals/
+- Package name changed from geant2-java-sql-ma to perfsonar-java-sql-ma
+
+* Mon May 25 2009 Piotr Pikusa
<>
2.1.1-5
+- New: sql scripts creating db schema in MySql and PostgresSQL added to conf
directory
+- New: sql script added updating MySql db schema from last stable version to
current
+- Change: Web Admin Guide document updated (v 1.5)
+
+* Mon May 04 2009 Piotr Pikusa
<>
2.1.1-4
+- Fixed Bug #755: In perfsonar_iperf sql table field numBytes changed from
INT to NUMERIC(40)
+
* Wed Feb 11 2009 Roman Lapacz
<>
2.1.1-1
- New: support for iperf/nmwg metadata and data
- Change: xquery statements ("fetch all") for utilization, discards and
errors metadata elements updated


  • perfsonar: r5227 - in branches/GEANT2-JAVA-SQL-MA-STABLE: conf doc packaging packaging/deb packaging/rpm, svnlog, 07/16/2009

Archive powered by MHonArc 2.6.16.

Top of Page