perfsonar development work

Author: michael.bischoff
Date: 2008-07-21 10:36:51 -0400 (Mon, 21 Jul 2008)
New Revision: 4262

Modified:
   trunk/perfsonar_base/ant/const.properties
   trunk/perfsonar_base/doc/ChangeLog.txt
   trunk/perfsonar_base/pom.xml
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
Log:
Changed version number, Fixed authentication failing with WAR 
deployments/having a relative path for SAX-parser-config-file.

Modified: trunk/perfsonar_base/ant/const.properties
===================================================================
--- trunk/perfsonar_base/ant/const.properties   2008-07-21 14:23:36 UTC (rev 
4261)
+++ trunk/perfsonar_base/ant/const.properties   2008-07-21 14:36:51 UTC (rev 
4262)
@@ -13,4 +13,4 @@
 # name of jar file to be created
 jarfilename=perfsonar-base
 # version of the product (will be included in the final name of jar file)
-version=1.0.20080717
+version=1.0.20080721

Modified: trunk/perfsonar_base/doc/ChangeLog.txt
===================================================================
--- trunk/perfsonar_base/doc/ChangeLog.txt      2008-07-21 14:23:36 UTC (rev 
4261)
+++ trunk/perfsonar_base/doc/ChangeLog.txt      2008-07-21 14:36:51 UTC (rev 
4262)
@@ -1,5 +1,12 @@
 perfSONAR Base
 
+2008-06-30 v1.0.20080721
+- New: reporting of processing time and msg id in log
+- Change: improved/extended Ls components
+- Change: changed SAX parser config file routine in authentication component 
+          so that it uses the same lookup mechanism as the rest of the base.
+- Fix: avoiding creating too many ineffective sessions with exist. 
+
 2008-06-30 v1.0.20080630
 - New: parsing from String to DOM document
 - New: support for new message type CompleteMetadataStoreRequest

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml        2008-07-21 14:23:36 UTC (rev 4261)
+++ trunk/perfsonar_base/pom.xml        2008-07-21 14:36:51 UTC (rev 4262)
@@ -7,7 +7,7 @@
        <artifactId>perfsonar-base</artifactId>
        <packaging>jar</packaging>
        <name>Perfsonar Base package</name>
-       <version>1.0.20080630</version>
+       <version>1.0.20080721</version>
        <description>
                The perfSONAR base provides a number of common, shared 
classes which can be used by 
                MA, MP and Clients. 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
     2008-07-21 14:23:36 UTC (rev 4261)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
     2008-07-21 14:36:51 UTC (rev 4262)
@@ -1,5 +1,6 @@
 package org.perfsonar.service.base.authn;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.StringWriter;
 import java.net.URL;
@@ -58,7 +59,7 @@
                }
                try {
                        asPoint=config.getProperty(AS_POINT_PARAM);
-                       saxParser=config.getProperty(SAX_PARSER_CONFIG);
+                       saxParser=attemptSaxParserConfigLookup();
                } catch (Exception e) {
                        String m = "AADispatchSOAPProtocol: Can't obtain 
required parameters ";
                        logger.error(m);
@@ -179,4 +180,24 @@
                return resp;
        }
 
+       private String attemptSaxParserConfigLookup() throws 
PerfSONARException {
+               String saxConfig;
+               
+               try {
+                       saxConfig = config.getProperty(SAX_PARSER_CONFIG);
+               } catch (PerfSONARException e) {
+                       logger.error("Sax parser config could not be found. 
(service.sax_parser.config not specified.)");
+                       throw e;
+               }
+               
+               File file = AuxiliaryComponentManager.lookupFile(saxConfig);
+               if(file!=null) {
+                       return file.getAbsolutePath();
+               }
+               logger.error("Sax parser config could not be found. (lookup 
failed for: "+saxConfig+" )");
+               throw new PerfSONARException(
+                       "error.common.no_configuration",
+                       "specified service.sax_parser.config not found"
+               );
+       }
 }