perfsonar-dev - perfsonar: r4299 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc samples/requests
Subject: perfsonar development work
List archive
perfsonar: r4299 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc samples/requests
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4299 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc samples/requests
- Date: Fri, 25 Jul 2008 07:20:20 -0400
Author: roman
Date: 2008-07-25 07:20:19 -0400 (Fri, 25 Jul 2008)
New Revision: 4299
Added:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_clmp-ping.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-Ping-1.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/log4j.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.syslog.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
Log:
merged with the trunk (-r 4247:4297)
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-07-25 11:10:10 UTC (rev 4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-07-25 11:20:19 UTC (rev 4299)
@@ -45,7 +45,7 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.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"/>
@@ -288,7 +288,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.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-07-25 11:10:10 UTC (rev 4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-07-25 11:20:19 UTC (rev 4299)
@@ -54,7 +54,7 @@
<artifact:dependencies>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080630"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080721"/>
<dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.4b"/>
<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-07-25 11:10:10 UTC (rev 4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-07-25 11:20:19 UTC (rev 4299)
@@ -80,7 +80,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.20080630/perfsonar-base-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.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/conf/log4j.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties 2008-07-25
11:10:10 UTC (rev 4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties 2008-07-25
11:20:19 UTC (rev 4299)
@@ -5,12 +5,6 @@
-
-# Group=Logging
-# Description=The location of the log directory.
-logDir=/var/lib/tomcat5.5/logs
-
-
##
## All log levels in one log file.
## By default debug level is switched off (commented).
@@ -61,7 +55,7 @@
# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/var/lib/tomcat5.5/logs/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/geant2-java-sql-ma/perfsonar_debug.log
# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -89,7 +83,7 @@
# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/var/lib/tomcat5.5/logs/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/geant2-java-sql-ma/perfsonar_info.log
# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -117,7 +111,7 @@
# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/var/lib/tomcat5.5/logs/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/geant2-java-sql-ma/perfsonar_warn.log
# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -145,7 +139,7 @@
# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/var/lib/tomcat5.5/logs/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/geant2-java-sql-ma/perfsonar_error.log
# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -173,7 +167,7 @@
# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/var/lib/tomcat5.5/logs/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/geant2-java-sql-ma/perfsonar_fatal.log
# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -201,7 +195,7 @@
# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/var/lib/tomcat5.5/logs/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/geant2-java-sql-ma/perfsonar.log
# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -227,7 +221,7 @@
# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/lib/tomcat5.5/logs/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/geant2-java-sql-ma/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
#log4j.rootLogger=DEBUG, rootAppender
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.syslog.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.syslog.properties
2008-07-25 11:10:10 UTC (rev 4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.syslog.properties
2008-07-25 11:20:19 UTC (rev 4299)
@@ -54,7 +54,7 @@
# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/var/lib/tomcat5.5/logs/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/geant2-java-sql-ma/perfsonar_debug.log
# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -82,7 +82,7 @@
# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/var/lib/tomcat5.5/logs/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/geant2-java-sql-ma/perfsonar_info.log
# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -110,7 +110,7 @@
# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/var/lib/tomcat5.5/logs/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/geant2-java-sql-ma/perfsonar_warn.log
# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -138,7 +138,7 @@
# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/var/lib/tomcat5.5/logs/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/geant2-java-sql-ma/perfsonar_error.log
# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -166,7 +166,7 @@
# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/var/lib/tomcat5.5/logs/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/geant2-java-sql-ma/perfsonar_fatal.log
# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -194,7 +194,7 @@
# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/var/lib/tomcat5.5/logs/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/geant2-java-sql-ma/perfsonar.log
# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -240,7 +240,7 @@
# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/lib/tomcat5.5/logs/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/geant2-java-sql-ma/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
#log4j.rootLogger=DEBUG, rootAppender
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-07-25
11:10:10 UTC (rev 4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-07-25
11:20:19 UTC (rev 4299)
@@ -33,15 +33,15 @@
# Group=Internal
# Description=The path to the file objects.config, including the NMWG
parser's configuration settings. The parser reads the request or metadata
configuration files, and creates internally used objects that represent these
files.
-service.sax_parser.config=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/objects.config
+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.
-service.log.log4j.config=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/etc/geant2-java-sql-ma/log4j.properties
# Group=Internal
# Description=The path to the metadata configuration file, including the
file's name.
-service.ma.conf_file=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml
+service.ma.conf_file=/etc/geant2-java-sql-ma/sql-database_TEST.xml
Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_clmp-ping.xml
(from rev 4297, trunk/geant2-java-sql-ma/conf/sql-database_clmp-ping.xml)
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties 2008-07-25
11:10:10 UTC (rev 4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties 2008-07-25
11:20:19 UTC (rev 4299)
@@ -63,9 +63,9 @@
</property>
<property>
- <entry key="service.ma.conf_file"
required="true">/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml</entry>
+ <entry key="service.ma.conf_file"
required="true">/etc/geant2-java-sql-ma/sql-database_TEST.xml</entry>
<Comment>Enter the full path of the metadata configuration
file:</Comment>
-
<ProposedValue>/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml</ProposedValue>
+
<ProposedValue>/etc/geant2-java-sql-ma/sql-database_TEST.xml</ProposedValue>
<Group order="7">eXist</Group>
</property>
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-07-25
11:10:10 UTC (rev 4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-07-25
11:20:19 UTC (rev 4299)
@@ -1,15 +1,19 @@
Relational Database MA
-2008-07-09
+2008-07-23 Version 2.1
+- 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.
- New: MeasurementArchiveStoreRequest switched off by default
- 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: eXist default port is 8180
+- Change: use of pSbase v1.0.20080721
- Change: new format of log messages
- Change: obsolete authRealm removed from metadata configuration file
+- Fixed Bug #508: error in the SQL setup file
2008-04-16 Version 2.0
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-07-25 11:10:10 UTC (rev
4298)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-07-25 11:20:19 UTC (rev
4299)
@@ -128,7 +128,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20080630</version>
+ <version>1.0.20080721</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>
Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-Ping-1.xml
(from rev 4297,
trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-Ping-1.xml)
- perfsonar: r4299 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc samples/requests, svnlog, 07/25/2008
Archive powered by MHonArc 2.6.16.