[Unicore-cvs-commits] unigrids/core/unicoregs/src/com/fujitsu/unigrids/services/resourcemgmt IWSResource.java,1.8,1.9 ResourceManager.java,1.9,1.10 ResourcePropertiesManager.java,1.12,1.13 ResourcePropertySchemaChecker.java,1.10,1.11 ResourceProvider.java,1.9,1.10

[Donal K. F. <dk...@us...>]

Update of /cvsroot/unicore/unigrids/core/unicoregs/src/com/fujitsu/unigrids/services/resourcemgmt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17650/src/com/fujitsu/unigrids/services/resourcemgmt

Modified Files:
	IWSResource.java ResourceManager.java 
	ResourcePropertiesManager.java 
	ResourcePropertySchemaChecker.java ResourceProvider.java 
Log Message:
Systematize the server-side logging and handling of system properties


Index: ResourcePropertiesManager.java
===================================================================
RCS file: /cvsroot/unicore/unigrids/core/unicoregs/src/com/fujitsu/unigrids/services/resourcemgmt/ResourcePropertiesManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ResourcePropertiesManager.java	1 Mar 2006 16:32:27 -0000	1.12
--- ResourcePropertiesManager.java	2 Mar 2006 15:39:50 -0000	1.13
***************
*** 8,23 ****
  import java.net.MalformedURLException;
  import java.net.URL;
! import java.util.Calendar;
! import java.util.Collections;
! import java.util.Hashtable;
! import java.util.Iterator;
! import java.util.List;
! import java.util.Map;
! import java.util.Vector;
! import java.util.logging.Level;
  
  import javax.xml.namespace.QName;
  
  import org.apache.axis.message.addressing.EndpointReferenceType;
  import org.oasis.wsrf.resourceproperties.InvalidModificationFaultType;
  import org.oasis.wsrf.resourceproperties.InvalidResourcePropertyQNameFaultType;
--- 8,18 ----
  import java.net.MalformedURLException;
  import java.net.URL;
! import java.util.*;
  
  import javax.xml.namespace.QName;
  
  import org.apache.axis.message.addressing.EndpointReferenceType;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  import org.oasis.wsrf.resourceproperties.InvalidModificationFaultType;
  import org.oasis.wsrf.resourceproperties.InvalidResourcePropertyQNameFaultType;
***************
*** 36,41 ****
   */
  public class ResourcePropertiesManager extends WSResource implements IResourcePropertiesManager {
!     private static java.util.logging.Logger logger =
! 	java.util.logging.Logger.getLogger(ResourcePropertiesManager.class.getName());
  
      //repository for resouce properties
--- 31,35 ----
   */
  public class ResourcePropertiesManager extends WSResource implements IResourcePropertiesManager {
!     private static Log logger = LogFactory.getLog(ResourcePropertiesManager.class);
  
      //repository for resouce properties
***************
*** 57,61 ****
  	} catch (InvalidModificationFaultType imfault) {
  	    imfault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.WARNING, "Invalid Modification fault", imfault);
  	}
      }
--- 51,55 ----
  	} catch (InvalidModificationFaultType imfault) {
  	    imfault.setTimestamp(Calendar.getInstance());
! 	    logger.warn("Invalid Modification fault", imfault);
  	}
      }
***************
*** 68,72 ****
  	} catch (InvalidModificationFaultType imfault) {
  	    imfault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.WARNING, "Invalid Modification fault", imfault);
  	}
      }
--- 62,66 ----
  	} catch (InvalidModificationFaultType imfault) {
  	    imfault.setTimestamp(Calendar.getInstance());
! 	    logger.warn("Invalid Modification fault", imfault);
  	}
      }
***************
*** 84,88 ****
  	    return new URL("file", null, -1, rp_schema_file.toString());
  	} catch (MalformedURLException e) {
! 	    logger.log(Level.SEVERE, "problem constructing local url to RP document schema", e);
  	    return null;
  	}
--- 78,82 ----
  	    return new URL("file", null, -1, rp_schema_file.toString());
  	} catch (MalformedURLException e) {
! 	    logger.error("problem constructing local url to RP document schema", e);
  	    return null;
  	}
***************
*** 97,106 ****
  	    } catch (InvalidResourcePropertyQNameFaultType irpqnfault) {
  		irpqnfault.setTimestamp(Calendar.getInstance());
! 		logger.log(Level.WARNING, "check the resource property qname again", irpqnfault);
  	    }   // Can't happen			
  	} else {
  	    InvalidModificationFaultType imfault = new InvalidModificationFaultType();
  	    imfault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE, "can not register the resource property, please check the content.", imfault);
  	    throw imfault;
  	}
--- 91,100 ----
  	    } catch (InvalidResourcePropertyQNameFaultType irpqnfault) {
  		irpqnfault.setTimestamp(Calendar.getInstance());
! 		logger.warn("check the resource property qname again", irpqnfault);
  	    }   // Can't happen			
  	} else {
  	    InvalidModificationFaultType imfault = new InvalidModificationFaultType();
  	    imfault.setTimestamp(Calendar.getInstance());
! 	    logger.warn("can not register the resource property, please check the content.", imfault);
  	    throw imfault;
  	}
***************
*** 114,118 ****
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp.getName());
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE, "the resource property qname has not been registered.",fault);
  	    throw fault;
  	} else {
--- 108,112 ----
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp.getName());
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.error("the resource property qname has not been registered.",fault);
  	    throw fault;
  	} else {
***************
*** 126,130 ****
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp_name);
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE, "the resource property qname has not been registered.",fault);
  	    throw fault;
  	} else {
--- 120,124 ----
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp_name);
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.error("the resource property qname has not been registered.", fault);
  	    throw fault;
  	} else {
***************
*** 140,144 ****
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp.getName());
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE, "the resource property qname has not been registered.",fault);
  	    throw fault;
  	}
--- 134,138 ----
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp.getName());
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.error("the resource property qname has not been registered.", fault);
  	    throw fault;
  	}
***************
*** 169,173 ****
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp_name);
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE, "the resource property qname has not been registered.",fault);
  	    throw fault;
  	}
--- 163,167 ----
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp_name);
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.error("the resource property qname has not been registered.", fault);
  	    throw fault;
  	}
***************
*** 194,198 ****
  		fault.setFaultDetailString("Resource Property name not recognised: "+names[i]);
  		fault.setTimestamp(Calendar.getInstance());
! 		logger.log(Level.SEVERE, "the resource property qname has not been registered.",fault);
  		throw fault;
  	    }
--- 188,192 ----
  		fault.setFaultDetailString("Resource Property name not recognised: "+names[i]);
  		fault.setTimestamp(Calendar.getInstance());
! 		logger.error("the resource property qname has not been registered.", fault);
  		throw fault;
  	    }
***************
*** 213,220 ****
  	    } catch (InvalidModificationFaultType imfault) {
  		imfault.setTimestamp(Calendar.getInstance());
! 		logger.log(Level.WARNING, "Modification is invalid.",imfault);
  	    } catch (InvalidResourcePropertyQNameFaultType irpqnfault) {
  		irpqnfault.setTimestamp(Calendar.getInstance());
! 		logger.log(Level.SEVERE, "the resource property qname has not been registered.",irpqnfault);
  	    }
  	}
--- 207,214 ----
  	    } catch (InvalidModificationFaultType imfault) {
  		imfault.setTimestamp(Calendar.getInstance());
! 		logger.warn("Modification is invalid.", imfault);
  	    } catch (InvalidResourcePropertyQNameFaultType irpqnfault) {
  		irpqnfault.setTimestamp(Calendar.getInstance());
! 		logger.error("the resource property qname has not been registered.", irpqnfault);
  	    }
  	}
***************
*** 241,245 ****
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp_name);
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE, "the resource property qname has not been registered.",fault);
  	    throw fault;
  	}
--- 235,239 ----
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp_name);
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.error("the resource property qname has not been registered.", fault);
  	    throw fault;
  	}
***************
*** 286,295 ****
      }
  
!     public boolean isReadOnly (QName rp_qname) throws InvalidResourcePropertyQNameFaultType {
  	if (!resource_properties.containsKey(rp_qname)) {
  	    InvalidResourcePropertyQNameFaultType fault = new InvalidResourcePropertyQNameFaultType();
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp_qname);
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE, "the resource property qname has not been registered.",fault);
  	    throw fault;
  	}
--- 280,289 ----
      }
  
!     public boolean isReadOnly(QName rp_qname) throws InvalidResourcePropertyQNameFaultType {
  	if (!resource_properties.containsKey(rp_qname)) {
  	    InvalidResourcePropertyQNameFaultType fault = new InvalidResourcePropertyQNameFaultType();
  	    fault.setFaultDetailString("Resource Property name not recognised: "+rp_qname);
  	    fault.setTimestamp(Calendar.getInstance());
! 	    logger.error("the resource property qname has not been registered.", fault);
  	    throw fault;
  	}

Index: ResourceManager.java
===================================================================
RCS file: /cvsroot/unicore/unigrids/core/unicoregs/src/com/fujitsu/unigrids/services/resourcemgmt/ResourceManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ResourceManager.java	1 Mar 2006 16:32:27 -0000	1.9
--- ResourceManager.java	2 Mar 2006 15:39:50 -0000	1.10
***************
*** 6,11 ****
  
  import java.util.*;
- import java.util.logging.Level;
- import java.util.logging.Logger;
  
  import org.apache.axis.components.uuid.SimpleUUIDGen;
--- 6,9 ----
***************
*** 13,16 ****
--- 11,16 ----
  import org.apache.axis.message.addressing.EndpointReferenceType;
  import org.apache.axis.message.addressing.ReferenceParametersType;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  import org.oasis.wsrf.resource.ResourceUnknownFaultType;
  import org.oasis.wsrf.resourceproperties.InvalidResourcePropertyQNameFaultType;
***************
*** 42,46 ****
  
      private static ResourceManager resourceManager;
!     private static Logger logger = Logger.getLogger(ResourceManager.class.getName());
  
      private static boolean initialized = false;
--- 42,46 ----
  
      private static ResourceManager resourceManager;
!     private static Log logger = LogFactory.getLog(ResourceManager.class);
  
      private static boolean initialized = false;
***************
*** 129,133 ****
  	    ResourceUnknownFaultType ruf = new ResourceUnknownFaultType();
  	    ruf.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE,"Can not find the resource", ruf);
  	    throw ruf;
  	}
--- 129,133 ----
  	    ResourceUnknownFaultType ruf = new ResourceUnknownFaultType();
  	    ruf.setTimestamp(Calendar.getInstance());
! 	    logger.error("can not find the resource", ruf);
  	    throw ruf;
  	}
***************
*** 140,146 ****
  	    removeDependency(epr);//throws faults within this method
  	}catch(ResourceUnknownFaultType ruf){
! 	    ruf.printStackTrace();
  	}catch(InvalidResourcePropertyQNameFaultType irpqf){
! 	    irpqf.printStackTrace();
  	}
      }
--- 140,146 ----
  	    removeDependency(epr);//throws faults within this method
  	}catch(ResourceUnknownFaultType ruf){
! 	    logger.trace("unknown dependency?", ruf);
  	}catch(InvalidResourcePropertyQNameFaultType irpqf){
! 	    logger.trace("bad resource property name", irpqf);
  	}
      }
***************
*** 158,162 ****
  	    ResourceUnknownFaultType ruf = new ResourceUnknownFaultType ();
  	    ruf.setTimestamp(Calendar.getInstance());
! 	    logger.log(Level.SEVERE,"Can not find the parent resource EPR. please check again.", ruf);
  	    throw ruf;
  	}
--- 158,162 ----
  	    ResourceUnknownFaultType ruf = new ResourceUnknownFaultType ();
  	    ruf.setTimestamp(Calendar.getInstance());
! 	    logger.error("can not find the parent resource EPR. please check again.", ruf);
  	    throw ruf;
  	}
***************
*** 183,187 ****
  	    }catch(InvalidResourcePropertyQNameFaultType fault){
  		fault.setTimestamp(Calendar.getInstance());
! 		logger.log(Level.SEVERE,"The child qname from parent epr is invalid.", fault);
  		throw fault;
  	    }        
--- 183,187 ----
  	    }catch(InvalidResourcePropertyQNameFaultType fault){
  		fault.setTimestamp(Calendar.getInstance());
! 		logger.error("child qname from parent epr is invalid", fault);
  		throw fault;
  	    }        

Index: ResourceProvider.java
===================================================================
RCS file: /cvsroot/unicore/unigrids/core/unicoregs/src/com/fujitsu/unigrids/services/resourcemgmt/ResourceProvider.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ResourceProvider.java	1 Mar 2006 16:32:27 -0000	1.9
--- ResourceProvider.java	2 Mar 2006 15:39:50 -0000	1.10
***************
*** 6,11 ****
  
  import java.util.Calendar;
- import java.util.logging.Level;
- import java.util.logging.Logger;
  
  import javax.xml.rpc.holders.IntHolder;
--- 6,9 ----
***************
*** 17,20 ****
--- 15,20 ----
  import org.apache.axis.message.addressing.ReferenceParametersType;
  import org.apache.axis.providers.java.RPCProvider;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  import org.oasis.wsrf.resource.ResourceUnknownFaultType;
  
***************
*** 38,42 ****
  
  public class ResourceProvider extends RPCProvider {
!     private static Logger logger = Logger.getLogger(ResourceProvider.class.getName());
  
      public Object getServiceObject(MessageContext msgContext, Handler service, String clsName, IntHolder scopeHolder)
--- 38,42 ----
  
  public class ResourceProvider extends RPCProvider {
!     private static Log logger = LogFactory.getLog(ResourceProvider.class);
  
      public Object getServiceObject(MessageContext msgContext, Handler service, String clsName, IntHolder scopeHolder)
***************
*** 59,63 ****
              } catch (ResourceUnknownFaultType fault){
                  fault.setTimestamp(Calendar.getInstance());
!                 logger.log(Level.SEVERE, "Can not find resource from the resource manager", fault);
                  throw fault;
              }
--- 59,63 ----
              } catch (ResourceUnknownFaultType fault){
                  fault.setTimestamp(Calendar.getInstance());
!                 logger.info("Can not find resource from the resource manager", fault);
                  throw fault;
              }

Index: IWSResource.java
===================================================================
RCS file: /cvsroot/unicore/unigrids/core/unicoregs/src/com/fujitsu/unigrids/services/resourcemgmt/IWSResource.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** IWSResource.java	27 Feb 2006 15:48:19 -0000	1.8
--- IWSResource.java	2 Mar 2006 15:39:50 -0000	1.9
***************
*** 11,15 ****
  
  /**
!  * @author Vivian Li 			Fujitsu Laboratories of Europe
   * @author David Snelling 	Fujitsu Laboratories of Europe
   * 
--- 11,15 ----
  
  /**
!  * @author Vivian Li 		Fujitsu Laboratories of Europe
   * @author David Snelling 	Fujitsu Laboratories of Europe
   * 

Index: ResourcePropertySchemaChecker.java
===================================================================
RCS file: /cvsroot/unicore/unigrids/core/unicoregs/src/com/fujitsu/unigrids/services/resourcemgmt/ResourcePropertySchemaChecker.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ResourcePropertySchemaChecker.java	1 Mar 2006 16:32:27 -0000	1.10
--- ResourcePropertySchemaChecker.java	2 Mar 2006 15:39:50 -0000	1.11
***************
*** 17,20 ****
--- 17,22 ----
  import org.apache.axis.message.SOAPBodyElement;
  import org.apache.axis.utils.DOM2Writer;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  import org.w3c.dom.Document;
  import org.w3c.dom.Node;
***************
*** 35,38 ****
--- 37,41 ----
      private static final String minOcrs		= "minOccurs";
      private static final String maxOcrs 	= "maxOccurs";
+     private static final Log log = LogFactory.getLog(ResourcePropertySchemaChecker.class);
  
      private URL schemaFile;
***************
*** 88,100 ****
  	    builder = factory.newDocumentBuilder();	
  	} catch (ParserConfigurationException e){
! 	    e.printStackTrace();
  	}
  
  	try{
! 	    schemaDoc = builder.parse(this.schemaFile.toString());
  	}catch (SAXException saxe) {
! 	    saxe.printStackTrace();
  	}catch (IOException ioe){
! 	    ioe.printStackTrace();
  	}
  
--- 91,103 ----
  	    builder = factory.newDocumentBuilder();	
  	} catch (ParserConfigurationException e){
! 	    log.fatal("bad DOM parser configuration", e);
  	}
  
  	try{
! 	    schemaDoc = builder.parse(schemaFile.toString());
  	}catch (SAXException saxe) {
! 	    log.error("bad schema document", saxe);
  	}catch (IOException ioe){
! 	    log.error("bad schema document", ioe);
  	}