logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ceki Gulcu <c...@apache.org>
Subject cvs commit: logging-log4j/src/java/org/apache/log4j/joran JoranConfigurator.java
Date Sat, 03 Apr 2004 16:54:58 GMT

ceki        2004/04/03 08:49:14

   Modified:    src/java/org/apache/joran Interpreter.java
   Added:       src/java/org/apache/log4j/joran JoranConfigurator.java
   Log:

   Finally added JoranConfigurator

   Revision  Changes    Path
   1.5       +1 
-1      logging-log4j/src/java/org/apache/joran/Interpreter.java

   Index: Interpreter.java
   ===================================================================
   RCS file: 
/home/cvs/logging-log4j/src/java/org/apache/joran/Interpreter.java,v
   retrieving revision 1.4
   retrieving revision 1.5
   diff -u -r1.4 -r1.5
   --- Interpreter.java  3 Apr 2004 15:16:10 -0000       1.4
   +++ Interpreter.java  3 Apr 2004 16:49:14 -0000       1.5
   @@ -84,7 +84,7 @@
       */
      Stack actionListStack;

   -  Interpreter(RuleStore rs) {
   +  public Interpreter(RuleStore rs) {
        ruleStore = rs;
        ec = new ExecutionContext(this);
        implicitActions = new ArrayList(3);



   1.1 
logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java

   Index: JoranConfigurator.java
   ===================================================================
   /*
    * Copyright 1999,2004 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
    *
    *      http://www.apache.org/licenses/LICENSE-2.0
    *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */

   /*
    * Copyright 1999,2004 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
    *
    *      http://www.apache.org/licenses/LICENSE-2.0
    *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
   /*
    * Copyright 1999,2004 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
    *
    *      http://www.apache.org/licenses/LICENSE-2.0
    *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
   /*
    * Copyright 1999,2004 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
    *
    *      http://www.apache.org/licenses/LICENSE-2.0
    *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
   /*
    * Copyright 1999,2004 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
    *
    *      http://www.apache.org/licenses/LICENSE-2.0
    *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
   package org.apache.log4j.joran;

   import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.Interpreter;
   import org.apache.joran.Pattern;
   import org.apache.joran.RuleStore;
   import org.apache.joran.action.ParamAction;
   import org.apache.joran.helper.SimpleRuleStore;

   import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.joran.action.ActionConst;
   import org.apache.log4j.joran.action.AppenderAction;
   import org.apache.log4j.joran.action.AppenderRefAction;
   import org.apache.log4j.joran.action.ConversionRuleAction;
   import org.apache.log4j.joran.action.LayoutAction;
   import org.apache.log4j.joran.action.LevelAction;
   import org.apache.log4j.joran.action.LoggerAction;
   import org.apache.log4j.joran.action.RootLoggerAction;
   import org.apache.log4j.spi.Configurator;
   import org.apache.log4j.spi.LoggerRepository;

   import org.xml.sax.SAXException;

   import java.io.IOException;
   import java.io.InputStream;

   import java.net.URL;

   import java.util.HashMap;

   import javax.xml.parsers.ParserConfigurationException;
   import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.SAXParserFactory;


   /**
    * @author ceki
    *
    * To change the template for this generated type comment go to
    * Window>Preferences>Java>Code Generation>Code and Comments
    */
   public class JoranConfigurator implements Configurator {
     Interpreter joranInterpreter;

     public JoranConfigurator() {
       selfInitialize();
     }

     public void doConfigure(URL url, LoggerRepository repository) {
       ExecutionContext ec = joranInterpreter.getExecutionContext();
       ec.pushObject(repository);

       String errMsg;

       try {
         InputStream in = url.openStream();
         doConfigure(in, repository);
         in.close();
       } catch (IOException ioe) {
         errMsg = "Could not open [" + url + "].";
         LogLog.error(errMsg, ioe);
         ec.addError(new ErrorItem(errMsg, null, ioe));
       }
     }

     protected void selfInitialize() {
       RuleStore rs = new SimpleRuleStore();
       rs.addRule(new Pattern("log4j:configuration/logger"), new 
LoggerAction());
       rs.addRule(
         new Pattern("log4j:configuration/logger/level"), new LevelAction());
       rs.addRule(
         new Pattern("log4j:configuration/root"), new RootLoggerAction());
       rs.addRule(
         new Pattern("log4j:configuration/root/level"), new LevelAction());
       rs.addRule(
         new Pattern("log4j:configuration/logger/appender-ref"),
         new AppenderRefAction());
       rs.addRule(
         new Pattern("log4j:configuration/root/appender-ref"),
         new AppenderRefAction());
       rs.addRule(
         new Pattern("log4j:configuration/appender"), new AppenderAction());
       rs.addRule(
         new Pattern("log4j:configuration/appender/layout"), new 
LayoutAction());
       rs.addRule(
         new Pattern("log4j:configuration/appender/layout/conversionRule"),
         new ConversionRuleAction());

       rs.addRule(new Pattern("*/param"), new ParamAction());

       Interpreter jp = new Interpreter(rs);
       ExecutionContext ec = jp.getExecutionContext();

       HashMap omap = ec.getObjectMap();
       omap.put(ActionConst.APPENDER_BAG, new HashMap());
     }

     public void doConfigure(InputStream in, LoggerRepository repository) {
       ExecutionContext ec = joranInterpreter.getExecutionContext();

       ec.pushObject(repository);

       String errMsg;

       try {
         SAXParserFactory spf = SAXParserFactory.newInstance();
         SAXParser saxParser = spf.newSAXParser();
         saxParser.parse("file:input/joran/parser2.xml", joranInterpreter);
       } catch (SAXException e) {
         // all exceptions should have been recorded already.
       } catch (ParserConfigurationException pce) {
         errMsg = "Parser configuration error occured";
         LogLog.error(errMsg, pce);
         ec.addError(new ErrorItem(errMsg, null, pce));
       } catch (IOException ie) {
         errMsg = "I/O error occured while parsing xml file";
         ec.addError(
           new ErrorItem("Parser configuration error occured", null, ie));
       }
     }
   }







---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Mime
View raw message