Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4583 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf packaging/deb

Subject: perfsonar development work

List archive

perfsonar: r4583 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf packaging/deb


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4583 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf packaging/deb
  • Date: Thu, 2 Oct 2008 07:32:35 -0400
Author: roman
Date: 2008-10-02 07:32:32 -0400 (Thu, 02 Oct 2008)
New Revision: 4583

Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm
Log:
merged with the trunk



Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties 2008-10-02
11:24:41 UTC (rev 4582)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties 2008-10-02
11:32:32 UTC (rev 4583)
@@ -55,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/log/geant2-java-rrd-ma/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/perfsonar_debug.log

# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -83,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/log/geant2-java-rrd-ma/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/perfsonar_info.log

# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -111,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/log/geant2-java-rrd-ma/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/perfsonar_warn.log

# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -139,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/log/geant2-java-rrd-ma/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/perfsonar_error.log

# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -167,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/log/geant2-java-rrd-ma/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/perfsonar_fatal.log

# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -195,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/log/geant2-java-rrd-ma/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/perfsonar.log

# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -221,7 +221,7 @@

# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/log/geant2-java-rrd-ma/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/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-RRD-MA-STABLE/conf/log4j.syslog.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
2008-10-02 11:24:41 UTC (rev 4582)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
2008-10-02 11:32:32 UTC (rev 4583)
@@ -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/log/geant2-java-rrd-ma/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/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/log/geant2-java-rrd-ma/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/geant2-java-rrd-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/log/geant2-java-rrd-ma/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/geant2-java-rrd-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/log/geant2-java-rrd-ma/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/geant2-java-rrd-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/log/geant2-java-rrd-ma/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/geant2-java-rrd-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/log/geant2-java-rrd-ma/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/geant2-java-rrd-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/log/geant2-java-rrd-ma/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/log/geant2-java-rrd-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-RRD-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties 2008-10-02
11:24:41 UTC (rev 4582)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties 2008-10-02
11:32:32 UTC (rev 4583)
@@ -31,15 +31,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=/etc/geant2-java-rrd-ma/objects.config
+service.sax_parser.config=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/objects.config

# Group=Internal
# 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-rrd-ma/log4j.properties
+service.log.log4j.config=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/log4j.properties

# Group=Internal
# Description=The path to the metadata configuration file, including the
file's name.
-service.ma.conf_file=/etc/geant2-java-rrd-ma/rrd-database_TEST.xml
+service.ma.conf_file=/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml



@@ -168,4 +168,4 @@

# Group=Store
# Description=The directory where new rrd files are stored.
-service.ma.rrd.xmldb.db_store.data_dir=/home/perfsonar
+service.ma.rrd.xmldb.db_store.data_dir=/var/run/geant2-java-rrd-ma

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties 2008-10-02
11:24:41 UTC (rev 4582)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties 2008-10-02
11:32:32 UTC (rev 4583)
@@ -65,9 +65,9 @@
</property>

<property>
- <entry key="service.ma.conf_file"
required="true">/etc/geant2-java-rrd-ma/rrd-database_TEST.xml</entry>
+ <entry key="service.ma.conf_file"
required="true">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</entry>
<Comment>Enter the full path of the metadata configuration
file:</Comment>
-
<ProposedValue>/etc/geant2-java-rrd-ma/rrd-database_TEST.xml</ProposedValue>
+
<ProposedValue>/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</ProposedValue>
<Group order="6">eXist</Group>
</property>


Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs 2008-10-02
11:24:41 UTC (rev 4582)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs 2008-10-02
11:32:32 UTC (rev 4583)
@@ -1 +1,2 @@
-/usr/lib/perfsonar/services/geant2-java-rrd-ma
\ No newline at end of file
+/usr/lib/perfsonar/services/geant2-java-rrd-ma
+/var/run/geant2-java-rrd-ma

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst 2008-10-02
11:24:41 UTC (rev 4582)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst 2008-10-02
11:32:32 UTC (rev 4583)
@@ -28,26 +28,30 @@
then
rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- ln -s $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME
|| true
+ ln -sf $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME
|| true
if [ -h /etc/$SERVICENAME ]
then
rm /etc/$SERVICENAME
fi
- ln -s $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true

if [ -h /var/log/$SERVICENAME ]
then
rm /var/log/$SERVICENAME
fi
- ln -s /var/log/tomcat5.5 /var/log/$SERVICENAME || true
+ mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME ||
true

if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
rm /usr/share/doc/$SERVICENAME/spec
fi
- ln -s $SERVICEPATH/$SERVICENAME/WEB-INF/doc
/usr/share/doc/$SERVICENAME/spec || true
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc
/usr/share/doc/$SERVICENAME/spec || true

chown -R tomcat55
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
+ chown tomcat55 /var/run/$SERVICENAME
+ chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
/etc/init.d/geant2-tomcat5.5 restart
;;


Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm 2008-10-02
11:24:41 UTC (rev 4582)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm 2008-10-02
11:32:32 UTC (rev 4583)
@@ -20,6 +20,7 @@


SERVICENAME="geant2-java-rrd-ma"
+SERVICEPATH="/usr/lib/perfsonar/services"


case "$1" in
@@ -28,14 +29,18 @@
then
rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
+
if [ -h /etc/$SERVICENAME ]
then
rm /etc/$SERVICENAME
fi
+
if [ -h /var/log/$SERVICENAME ]
then
rm /var/log/$SERVICENAME
fi
+ rm -fr $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
rm /usr/share/doc/$SERVICENAME/spec


  • perfsonar: r4583 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf packaging/deb, svnlog, 10/02/2008

Archive powered by MHonArc 2.6.16.

Top of Page