perfsonar development work

Author: psnc.pikusa
Date: 2010-11-02 15:09:18 +0000 (Tue, 02 Nov 2010)
New Revision: 5786

Modified:
   trunk/geant2-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
   trunk/geant2-java-sql-ma/conf/log4j.properties
   trunk/geant2-java-sql-ma/packaging/deb/changelog
   trunk/geant2-java-sql-ma/packaging/deb/postinst
Log:
Updated for MDM 3.3 v 2.3.1


Modified: trunk/geant2-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
===================================================================
--- trunk/geant2-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd   
2010-10-25 11:22:29 UTC (rev 5785)
+++ trunk/geant2-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd   
2010-11-02 15:09:18 UTC (rev 5786)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployment xmlns="http://xml.apache.org/axis/wsdd/"; 
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
  <globalConfiguration>
-  <parameter name="sendMultiRefs" value="true"/>
-  <parameter name="disablePrettyXML" value="true"/>
   <parameter name="adminPassword" value="admin"/>
+  <parameter name="enableNamespacePrefixOptimization" value="false"/>
   <parameter name="dotNetSoapEncFix" value="true"/>
-  <parameter name="enableNamespacePrefixOptimization" value="false"/>
+  <parameter name="disablePrettyXML" value="true"/>
+  <parameter name="attachments.implementation" 
value="org.apache.axis.attachments.AttachmentsImpl"/>
+  <parameter name="sendXsiTypes" value="true"/>
+  <parameter name="sendMultiRefs" value="true"/>
   <parameter name="sendXMLDeclaration" value="true"/>
-  <parameter name="sendXsiTypes" value="true"/>
-  <parameter name="attachments.implementation" 
value="org.apache.axis.attachments.AttachmentsImpl"/>
   <requestFlow>
    <handler type="java:org.apache.axis.handlers.JWSHandler">
     <parameter name="scope" value="session"/>
@@ -19,9 +19,14 @@
    </handler>
   </requestFlow>
  </globalConfiguration>
+ <handler name="URLMapper" 
type="java:org.apache.axis.handlers.http.URLMapper"/>
  <handler name="LocalResponder" 
type="java:org.apache.axis.transport.local.LocalResponder"/>
- <handler name="URLMapper" 
type="java:org.apache.axis.handlers.http.URLMapper"/>
  <handler name="Authenticate" 
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <service name="MeasurementArchiveService" provider="java:MSG" 
style="message" use="literal">
+  <parameter name="allowedMethods" value="acceptCall"/>
+  <parameter name="className" 
value="org.perfsonar.service.base.web.RequestHandler"/>
+  <namespace>http://perfsonar.org/services/measurementArchive</namespace>
+ </service>
  <service name="AdminService" provider="java:MSG">
   <parameter name="allowedMethods" value="AdminService"/>
   <parameter name="enableRemoteAdmin" value="false"/>
@@ -32,11 +37,6 @@
   <parameter name="allowedMethods" value="getVersion"/>
   <parameter name="className" value="org.apache.axis.Version"/>
  </service>
- <service name="MeasurementArchiveService" provider="java:MSG" 
style="message" use="literal">
-  <parameter name="allowedMethods" value="acceptCall"/>
-  <parameter name="className" 
value="org.perfsonar.service.base.web.RequestHandler"/>
-  <namespace>http://perfsonar.org/services/measurementArchive</namespace>
- </service>
  <transport name="http">
   <requestFlow>
    <handler type="URLMapper"/>

Modified: trunk/geant2-java-sql-ma/conf/log4j.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/log4j.properties      2010-10-25 11:22:29 
UTC (rev 5785)
+++ trunk/geant2-java-sql-ma/conf/log4j.properties      2010-11-02 15:09:18 
UTC (rev 5786)
@@ -1,229 +1,13 @@
-
 ## $Id$
 ## project : perfSONAR
 ## author: romradz
 
 
+log4j.rootLogger=INFO, psRootAppender
 
-##
-## All log levels in one log file.
-## By default debug level is switched off (commented).
-##
-
-# Group=Log levels
-# Description=Assigns debug log messages to the specified log appender.
-#log4j.logger.sonar-debug=DEBUG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns info log messages to the specified log appender.
-log4j.logger.sonar-info=INFO, psRootAppender
-
-# Group=Log levels
-# Description=Assigns warn log messages to the specified log appender.
-log4j.logger.sonar-warn=WARN, psRootAppender
-
-# Group=Log levels
-# Description=Assigns error log messages to the specified log appender.
-log4j.logger.sonar-error=ERROR, psRootAppender
-
-# Group=Log levels
-# Description=Assigns fatal log messages to the specified log appender.
-log4j.logger.sonar-fatal=FATAL, psRootAppender
-
-
-
-##
-## Uncomment this block (and comment the one above)
-## if you want to have log levels in separate log files
-##
-## this section is only for developer tests
-##
-#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
-#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
-#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
-#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
-#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
-
-
-
-
-######################################### DEBUG 
#######################################
-
-# Group=Debug message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.debugAppender.MaxBackupIndex=11
-
-# Group=Debug message logging
-# Description=The path to the log file, including the log file's name.
-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.
-log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Debug message logging
-# Description=The log message format.
-log4j.appender.debugAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Debug message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.debugAppender.MaxFileSize=500KB
-
-# Group=Debug message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### INFO 
########################################
-
-# Group=Info message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.infoAppender.MaxBackupIndex=11
-
-# Group=Info message logging
-# Description=The path to the log file, including the log file's name.
-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.
-log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Info message logging
-# Description=The log message format.
-log4j.appender.infoAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Info message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.infoAppender.MaxFileSize=500KB
-
-# Group=Info message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### WARN 
########################################
-
-# Group=Warn message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.warnAppender.MaxBackupIndex=11
-
-# Group=Warn message logging
-# Description=The path to the log file, including the log file's name.
-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.
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Warn message logging
-# Description=The log message format.
-log4j.appender.warnAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Warn message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.warnAppender.MaxFileSize=500KB
-
-# Group=Warn message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ERROR 
#######################################
-
-# Group=Error message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.errorAppender.MaxBackupIndex=11
-
-# Group=Error message logging
-# Description=The path to the log file, including the log file's name.
-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.
-log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Error message logging
-# Description=The log message format.
-log4j.appender.errorAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Error message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.errorAppender.MaxFileSize=500KB
-
-# Group=Error message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### FATAL 
#######################################
-
-# Group=Fatal message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.fatalAppender.MaxBackupIndex=11
-
-# Group=Fatal message logging
-# Description=The path to the log file, including the log file's name.
-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.
-log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Fatal message logging
-# Description=The log message format.
-log4j.appender.fatalAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Fatal message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.fatalAppender.MaxFileSize=500KB
-
-# Group=Fatal message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ALL 
#########################################
-
-# Group=All message logging
-# Description=The maximum number of backup log files to create.
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
 log4j.appender.psRootAppender.MaxBackupIndex=11
-
-# Group=All message logging
-# Description=The path to the log file, including the log file's name.
-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.
+log4j.appender.psRootAppender.File=/var/log/geant2-java-sql-ma/perfsonar.log
 log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=All message logging
-# Description=The log message format.
-log4j.appender.psRootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=All message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.psRootAppender.MaxFileSize=500KB
-
-# Group=All message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ROOT 
#########################################
-
-# this section is only for developer's tests
-
-# ROOT
-#log4j.appender.rootAppender.MaxBackupIndex=11
-#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
-#log4j.appender.rootAppender.MaxFileSize=500KB
-#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.psRootAppender.MaxFileSize=2000KB

Modified: trunk/geant2-java-sql-ma/packaging/deb/changelog
===================================================================
--- trunk/geant2-java-sql-ma/packaging/deb/changelog    2010-10-25 11:22:29 
UTC (rev 5785)
+++ trunk/geant2-java-sql-ma/packaging/deb/changelog    2010-11-02 15:09:18 
UTC (rev 5786)
@@ -1,5 +1,12 @@
-perfsonar-java-sql-ma (2.2.1) stable; urgency=low
+perfsonar-java-sql-ma (2.3-1) stable; urgency=low
 
+  * Change: SQL MA Admin function is off in Web Admin
+  * Change: eXist database link in Web Admin provides now to exist 
application web interface
+
+ -- Piotr Pikusa 
<>
  Fri, 22 Oct 2010 13:00:00 +0200
+
+perfsonar-java-sql-ma (2.3-0rc1) stable; urgency=low
+
   * Changed dependencies. Removed tomcat5.5-exist. Included tomcat5.5, exist 
and java6-runtime
 
  -- Piotr Pikusa 
<>
  Tue, 24 Aug 2010 13:00:00 +0200

Modified: trunk/geant2-java-sql-ma/packaging/deb/postinst
===================================================================
--- trunk/geant2-java-sql-ma/packaging/deb/postinst     2010-10-25 11:22:29 
UTC (rev 5785)
+++ trunk/geant2-java-sql-ma/packaging/deb/postinst     2010-11-02 15:09:18 
UTC (rev 5786)
@@ -53,11 +53,11 @@
     chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
     chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
 
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/usr/share/tomcat5.5/common/endorsed/
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/usr/share/tomcat5.5/common/endorsed/
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xercesImpl-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xercesImpl-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/usr/share/tomcat5.5/common/endorsed/
 
 
     /etc/init.d/tomcat5.5 restart