cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: cocoon-2.2/src/java/org/apache/cocoon Cocoon.java
Date Fri, 24 Oct 2003 13:00:16 GMT
vgritsenko    2003/10/24 06:00:16

  Modified:    src/java/org/apache/cocoon Cocoon.java
               src/java/org/apache/cocoon Cocoon.java
  Log:
  this.getLogger() -> getLogger()
  
  Revision  Changes    Path
  1.19      +12 -11    cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Cocoon.java	15 Oct 2003 20:01:59 -0000	1.18
  +++ Cocoon.java	24 Oct 2003 13:00:16 -0000	1.19
  @@ -294,13 +294,15 @@
           // first check for deprecated property to be compatible:
           String parser = System.getProperty(Constants.DEPRECATED_PARSER_PROPERTY, Constants.DEFAULT_PARSER);
           if ( !Constants.DEFAULT_PARSER.equals( parser ) ) {
  -            this.getLogger().warn("Deprecated property " +Constants.DEPRECATED_PARSER_PROPERTY+
" is used. Please use "+Constants.PARSER_PROPERTY+" instead.");
  +            getLogger().warn("Deprecated property " +
  +                             Constants.DEPRECATED_PARSER_PROPERTY + " is used. Please use
" +
  +                             Constants.PARSER_PROPERTY + " instead.");
               if ( "org.apache.cocoon.components.parser.XercesParser".equals(parser) ) {
                   parser = XercesParser.class.getName();
               } else {
  -                this.getLogger().warn("Unknown value for deprecated property: " +
  -                                      Constants.DEPRECATED_PARSER_PROPERTY + ", value:
" + parser +
  -                                      ". If you experience problems during startup, check
the parser configuration section of the documentation.");
  +                getLogger().warn("Unknown value for deprecated property: " +
  +                                 Constants.DEPRECATED_PARSER_PROPERTY + ", value: " + parser
+
  +                                 ". If you experience problems during startup, check the
parser configuration section of the documentation.");
               }
           } else {
               parser = System.getProperty(Constants.PARSER_PROPERTY, Constants.DEFAULT_PARSER);
  @@ -520,7 +522,6 @@
           }
           
           this.context = null;
  -        
           this.disposed = true;
       }
   
  @@ -640,7 +641,7 @@
                                                   this);
           try {
               boolean result;
  -            if (this.getLogger().isDebugEnabled()) {
  +            if (getLogger().isDebugEnabled()) {
                   ++activeRequestCount;
                   this.debug(environment, false);
               }
  @@ -667,12 +668,12 @@
           } finally {
               CocoonComponentManager.leaveEnvironment();
               CocoonComponentManager.endProcessing(environment, key);
  -            if (this.getLogger().isDebugEnabled()) {
  +            if (getLogger().isDebugEnabled()) {
                   --activeRequestCount;
               }
               
               // TODO (CZ): This is only for testing - remove it later on
  -            CocoonComponentManager.checkEnvironment(this.getLogger());
  +            CocoonComponentManager.checkEnvironment(getLogger());
           }
       }
   
  @@ -688,7 +689,7 @@
           }
   
           try {
  -            if (this.getLogger().isDebugEnabled()) {
  +            if (getLogger().isDebugEnabled()) {
                   ++activeRequestCount;
                   this.debug(environment, true);
               }
  @@ -706,7 +707,7 @@
               }
   
           } finally {
  -            if (this.getLogger().isDebugEnabled()) {
  +            if (getLogger().isDebugEnabled()) {
                   --activeRequestCount;
               }
           }
  
  
  
  1.26      +10 -8     cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Cocoon.java	20 Oct 2003 08:15:27 -0000	1.25
  +++ Cocoon.java	24 Oct 2003 13:00:16 -0000	1.26
  @@ -143,7 +143,7 @@
           try {
               this.environmentHelper = new EnvironmentHelper(
                            (String) this.context.get(Constants.CONTEXT_ROOT_URL));
  -            ContainerUtil.enableLogging(this.environmentHelper, this.getLogger());
  +            ContainerUtil.enableLogging(this.environmentHelper, getLogger());
               ContainerUtil.service(this.environmentHelper, this.serviceManager);
           } catch (ContextException e) {
               throw new ServiceException("Unable to get context root url from context.",
e);
  @@ -262,7 +262,9 @@
        * @param environment an <code>Environment</code> value
        */
       protected void debug(Environment environment, boolean internal) {
  -        if ( ! getLogger().isDebugEnabled() ) return;
  +        if (!getLogger().isDebugEnabled()) {
  +            return;
  +        }
   
           Map objectModel = environment.getObjectModel();
           Request request = ObjectModelHelper.getRequest(objectModel);
  @@ -374,7 +376,7 @@
           EnvironmentHelper.enterProcessor(this);
           try {
               boolean result;
  -            if (this.getLogger().isDebugEnabled()) {
  +            if (getLogger().isDebugEnabled()) {
                   ++activeRequestCount;
                   this.debug(environment, false);
               }
  @@ -399,12 +401,12 @@
               EnvironmentHelper.leaveProcessor();
   //            CocoonComponentManager.leaveEnvironment();
   //            CocoonComponentManager.endProcessing(environment, key);
  -            if (this.getLogger().isDebugEnabled()) {
  +            if (getLogger().isDebugEnabled()) {
                   --activeRequestCount;
               }
   
               // TODO (CZ): This is only for testing - remove it later on
  -//            CocoonComponentManager.checkEnvironment(this.getLogger());
  +//            CocoonComponentManager.checkEnvironment(getLogger());
           }
       }
   
  @@ -420,7 +422,7 @@
           }
   
           try {
  -            if (this.getLogger().isDebugEnabled()) {
  +            if (getLogger().isDebugEnabled()) {
                   ++activeRequestCount;
                   this.debug(environment, true);
               }
  @@ -435,7 +437,7 @@
               }
   
           } finally {
  -            if (this.getLogger().isDebugEnabled()) {
  +            if (getLogger().isDebugEnabled()) {
                   --activeRequestCount;
               }
           }
  
  
  

Mime
View raw message