Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4406 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc samples samples/responses

Subject: perfsonar development work

List archive

perfsonar: r4406 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc samples samples/responses


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4406 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc samples samples/responses
  • Date: Thu, 28 Aug 2008 05:58:48 -0400
Author: roman
Date: 2008-08-28 05:58:47 -0400 (Thu, 28 Aug 2008)
New Revision: 4406

Added:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/responses/
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/responses/EchoResponse.xml
Removed:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/responses/EchoResponse.xml
Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbremove.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
Log:
merged with the trunk (-r 4385:4405)



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-08-28 09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-08-28 09:58:47 UTC (rev 4406)
@@ -46,7 +46,7 @@
depends="copy-dep-base-service-jars">

<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

@@ -289,7 +289,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>

<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-08-28 09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-08-28 09:58:47 UTC (rev 4406)
@@ -55,7 +55,7 @@
<artifact:dependencies>

<dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080822"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.1b"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.1"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-08-28 09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-08-28 09:58:47 UTC (rev 4406)
@@ -6,7 +6,7 @@

$Id$
project: perfSONAR
- date: 2008/04/01
+ date: 2008/04/09
author: romradz

</description>
@@ -81,7 +81,7 @@
<!-- copy jar files -->
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
2008-08-28 09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
2008-08-28 09:58:47 UTC (rev 4406)
@@ -763,8 +763,8 @@
margin-top: 15px;
background-color:#ECECFC;
width:100%;
- border-spacing: 1px 0px;
- width:100%;
+ border-spacing: 1px 0px;
+
}

#ifaces_table td{
@@ -786,7 +786,7 @@

.execute_button_stitching {
display: block;
- margin-top: 0px;
+ margin: 0px;
width: 120px;
height: 28px;
float: left;

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-08-28
09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-08-28
09:58:47 UTC (rev 4406)
@@ -106,10 +106,8 @@
</p>
<p>
<span class="navtex"><a href="Wizard"
target="main">Service</a></span>
-<!--
<br>
<a href="testdepl.jsp"
target="main">Test</a>
--->
</p>
</td>
</tr>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2008-08-28 09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2008-08-28 09:58:47 UTC (rev 4406)
@@ -241,3 +241,10 @@
INTO interdomain_link (id, status_oper, time)
VALUES ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');

+
+
+# insert statements for testing perfsonar_links table
+
+INSERT
+ INTO perfsonar_links (id, status_oper, time)
+ VALUES ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbremove.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbremove.sql
2008-08-28 09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbremove.sql
2008-08-28 09:58:47 UTC (rev 4406)
@@ -27,7 +27,9 @@

drop table interdomain_link;

+drop table perfsonar_links;

+
-- root (postgres) user

\c perfsonar_ma postgres

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
2008-08-28 09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
2008-08-28 09:58:47 UTC (rev 4406)
@@ -92,6 +92,17 @@
comments varchar(255)
);

+create table
+ perfsonar_links
+ (id varchar(255) not null,
+ time timestamp default now(),
+ status_oper varchar(255) default 'unknown',
+ status_admin varchar(255) default 'unknown',
+ alarm_id_set varchar(255),
+ comments varchar(255)
+ );
+
+
-- insert statements for testing perfsonar_utilization table

insert

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-08-28
09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-08-28
09:58:47 UTC (rev 4406)
@@ -36,7 +36,7 @@
service.sax_parser.config=/etc/geant2-java-sql-ma/objects.config

# Group=Internal
-# Description=The path to the log4j configuration file, including the file's
name.
+# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
service.log.log4j.config=/etc/geant2-java-sql-ma/log4j.properties

# Group=Internal

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-08-28
09:51:25 UTC (rev 4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-08-28
09:58:47 UTC (rev 4406)
@@ -1,7 +1,8 @@
Relational Database MA

-2008-07-23 Version 2.1
+2008-08-25 Version 2.1

+- New: ibatisConfig parameters set up in eventType config file for L2 status
(no need to put such parameter in store request)
- New: Available as deb package
- New: if 'timeValue' attribute in datum element of store request is missing
then the current time is used
- New: EchoRequest message allows now checking: if eXist database is running
and the count the content of metadata configuration file. It is also possible
to request a self-test including all above.
@@ -9,8 +10,12 @@
- New: support for CompleteMetadataStoreRequest message type which replaces
metadata configuration content
- New: CompleteMetadataStoreRequest switched off by default
- New: parameter keyword introduced in metadata block to indicate
project/organisation name
+- Change: eventType Path.Status used by default in metadata configuration
file
+- Change: ibatisConfig parameter in L2 CompleteMetadataStoreRequest in link
metadata is optional
+- Change: use of WebAdmin v0.9b
+- Change: obe database table is now used for domain and interdomain links
- Change: eXist default port is 8180
-- Change: use of pSbase v1.0.20080721
+- Change: use of pSbase v1.0.20080822
- Change: new format of log messages
- Change: obsolete authRealm removed from metadata configuration file
- Fixed Bug #508: error in the SQL setup file

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-08-28 09:51:25 UTC (rev
4405)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-08-28 09:58:47 UTC (rev
4406)
@@ -133,7 +133,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9b</version>
+ <version>0.9.1b</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/samples/responses (from rev 4405,
trunk/geant2-java-sql-ma/samples/responses)

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/samples/responses/EchoResponse.xml

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/samples/responses/EchoResponse.xml
(from rev 4405, trunk/geant2-java-sql-ma/samples/responses/EchoResponse.xml)


  • perfsonar: r4406 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc samples samples/responses, svnlog, 08/28/2008

Archive powered by MHonArc 2.6.16.

Top of Page