morciuch    2003/08/12 07:48:34

  Modified:    src/java/org/apache/jetspeed/services/resources
                        JetspeedResourceService.java
  Log:
  Removed logging service dependency in the resources service - was causing double 
init of the resource service (see Bugzilla bug# 19906).
  
  This is the final patch in the logging migration task. Many thanks to Harald Ommang 
for his hard work on this one!
  
  Revision  Changes    Path
  1.6       +4 -12     
jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/JetspeedResourceService.java
  
  Index: JetspeedResourceService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/JetspeedResourceService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JetspeedResourceService.java      23 Jul 2003 19:50:23 -0000      1.5
  +++ JetspeedResourceService.java      12 Aug 2003 14:48:34 -0000      1.6
  @@ -70,10 +70,6 @@
   // Commons classes
   import org.apache.commons.configuration.Configuration;
   
  -// Jetspeed classes
  -import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
  -import org.apache.jetspeed.services.logging.JetspeedLogger;
  -
   /**
    * <p>This service subclasses <code>TurbineResourceService</code> and
    * provides functionality for overriding properties in default resource
  @@ -123,11 +119,6 @@
   extends TurbineResourceService
   {
       /**
  -     * Static initialization of the logger for this class
  -     */    
  -    private static final JetspeedLogger logger = 
JetspeedLogFactoryService.getLogger(JetspeedResourceService.class.getName());
  -    
  -    /**
        * The purpose of this method is to get the configuration resource
        * with the given name as a boolean value.
        *
  @@ -292,7 +283,8 @@
           }
           catch (Exception e)
           {
  -            logger.error("Exception", e);
  +            System.err.println("Exception in init of JetspeedResourceService" + 
e.getMessage());
  +            e.printStackTrace();
           }
   
           return (ResourceService) res;
  @@ -333,7 +325,7 @@
           super.init(config);
           
           System.out.println("Jetspeed Services: Starting servlet: [" + appName +"]");
  -
  +        
           try
           {
               propsDir = System.getProperty("jetspeed.conf.dir", null);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to