Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4585 - in trunk/geant2-java-sql-ma: conf packaging/deb packaging/rpm

Subject: perfsonar development work

List archive

perfsonar: r4585 - in trunk/geant2-java-sql-ma: conf packaging/deb packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4585 - in trunk/geant2-java-sql-ma: conf packaging/deb packaging/rpm
  • Date: Thu, 2 Oct 2008 08:29:59 -0400
Author: roman
Date: 2008-10-02 08:29:56 -0400 (Thu, 02 Oct 2008)
New Revision: 4585

Added:
trunk/geant2-java-sql-ma/packaging/deb/dirs
Modified:
trunk/geant2-java-sql-ma/conf/log4j.properties
trunk/geant2-java-sql-ma/conf/log4j.syslog.properties
trunk/geant2-java-sql-ma/conf/service.properties
trunk/geant2-java-sql-ma/packaging/deb/postinst
trunk/geant2-java-sql-ma/packaging/deb/postrm
trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
Log:


Modified: trunk/geant2-java-sql-ma/conf/log4j.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/log4j.properties 2008-10-02 12:03:41
UTC (rev 4584)
+++ trunk/geant2-java-sql-ma/conf/log4j.properties 2008-10-02 12:29:56
UTC (rev 4585)
@@ -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-sql-ma/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-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: trunk/geant2-java-sql-ma/conf/log4j.syslog.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/log4j.syslog.properties 2008-10-02
12:03:41 UTC (rev 4584)
+++ trunk/geant2-java-sql-ma/conf/log4j.syslog.properties 2008-10-02
12:29:56 UTC (rev 4585)
@@ -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-sql-ma/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/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-sql-ma/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/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-sql-ma/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/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-sql-ma/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/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-sql-ma/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/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-sql-ma/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/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: trunk/geant2-java-sql-ma/conf/service.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/service.properties 2008-10-02 12:03:41
UTC (rev 4584)
+++ trunk/geant2-java-sql-ma/conf/service.properties 2008-10-02 12:29:56
UTC (rev 4585)
@@ -32,15 +32,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-sql-ma/objects.config
+service.sax_parser.config=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/log4j.properties
+service.log.log4j.config=/usr/lib/perfsonar/services/geant2-java-sql-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-sql-ma/sql-database_TEST.xml
+service.ma.conf_file=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml




Added: trunk/geant2-java-sql-ma/packaging/deb/dirs

Modified: trunk/geant2-java-sql-ma/packaging/deb/postinst
===================================================================
--- trunk/geant2-java-sql-ma/packaging/deb/postinst 2008-10-02 12:03:41
UTC (rev 4584)
+++ trunk/geant2-java-sql-ma/packaging/deb/postinst 2008-10-02 12:29:56
UTC (rev 4585)
@@ -28,28 +28,31 @@
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 -R tomcat55
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
+ chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
/etc/init.d/tomcat5.5 restart
;;


Modified: trunk/geant2-java-sql-ma/packaging/deb/postrm
===================================================================
--- trunk/geant2-java-sql-ma/packaging/deb/postrm 2008-10-02 12:03:41
UTC (rev 4584)
+++ trunk/geant2-java-sql-ma/packaging/deb/postrm 2008-10-02 12:29:56
UTC (rev 4585)
@@ -20,6 +20,7 @@


SERVICENAME="geant2-java-sql-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

Modified: trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
2008-10-02 12:03:41 UTC (rev 4584)
+++ trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
2008-10-02 12:29:56 UTC (rev 4585)
@@ -46,6 +46,7 @@
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/log


# copy the service content to the tomcat webapps directory
@@ -70,7 +71,7 @@
%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
%{__ln_s} %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{name}
-%{__ln_s} %{_var}/log/tomcat5 %{_var}/log/%{name}
+%{__ln_s} %{prefix}/WEB-INF/log %{_var}/log/%{name}
%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}

## restart tomcat
@@ -100,6 +101,7 @@

%files
%defattr(0644,root,tomcat,0755)
+%attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
%attr(640,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%attr(640,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%attr(640,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml


  • perfsonar: r4585 - in trunk/geant2-java-sql-ma: conf packaging/deb packaging/rpm, svnlog, 10/02/2008

Archive powered by MHonArc 2.6.16.

Top of Page