logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From psm...@apache.org
Subject svn commit: r531720 - in /logging/sandbox/juli-to-log4j-bridge: ./ src/ src/main/ src/main/config/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/logging/ src/main/java/org/apache/logging/julibridge/ src/main/resou...
Date Tue, 24 Apr 2007 04:54:03 GMT
Author: psmith
Date: Mon Apr 23 21:54:01 2007
New Revision: 531720

URL: http://svn.apache.org/viewvc?view=rev&rev=531720
Log:
Initial import of a java.util.logging (Juli?) bridge
that allows a user to filter LogRecords straight
into a correspondingly named log4j Logger.

This project obviously requires JDK 1.4+.

I'm currently not handling LocationInfo stuff, will have to get
to that next.

The Maven pom.xml is probably b0rk3n since I pretty much copied
and pasted it from another log4j project and tried to tidy it up,
but it does seem to work ok..

Added:
    logging/sandbox/juli-to-log4j-bridge/LICENSE
    logging/sandbox/juli-to-log4j-bridge/NOTICE
    logging/sandbox/juli-to-log4j-bridge/README.txt
    logging/sandbox/juli-to-log4j-bridge/pom.xml
    logging/sandbox/juli-to-log4j-bridge/src/
    logging/sandbox/juli-to-log4j-bridge/src/main/
    logging/sandbox/juli-to-log4j-bridge/src/main/config/
    logging/sandbox/juli-to-log4j-bridge/src/main/java/
    logging/sandbox/juli-to-log4j-bridge/src/main/java/org/
    logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/
    logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/
    logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/
    logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliBridgeFilter.java
    logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLevelConverter.java
    logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jBridge.java
    logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jEventConverter.java
    logging/sandbox/juli-to-log4j-bridge/src/main/resources/
    logging/sandbox/juli-to-log4j-bridge/src/test/
    logging/sandbox/juli-to-log4j-bridge/src/test/java/
    logging/sandbox/juli-to-log4j-bridge/src/test/java/org/
    logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/
    logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/
    logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/
    logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/JuliLog4jBridgeTest.java
    logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/MockAppender.java
    logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/TestLogPosting.java
    logging/sandbox/juli-to-log4j-bridge/src/test/resources/

Added: logging/sandbox/juli-to-log4j-bridge/LICENSE
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/LICENSE?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/LICENSE (added)
+++ logging/sandbox/juli-to-log4j-bridge/LICENSE Mon Apr 23 21:54:01 2007
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 1999-2005 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.

Added: logging/sandbox/juli-to-log4j-bridge/NOTICE
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/NOTICE?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/NOTICE (added)
+++ logging/sandbox/juli-to-log4j-bridge/NOTICE Mon Apr 23 21:54:01 2007
@@ -0,0 +1,5 @@
+Apache log4j 1.3 component model
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

Added: logging/sandbox/juli-to-log4j-bridge/README.txt
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/README.txt?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/README.txt (added)
+++ logging/sandbox/juli-to-log4j-bridge/README.txt Mon Apr 23 21:54:01 2007
@@ -0,0 +1,22 @@
+Requirements: JDK 1.4+, and log4j 1.2.15
+
+Bridging support between the java.util.logging framework and log4j.
+
+Key classes:
+
+	* org.apache.logging.julibridge.JuliLog4jBridge - main entry point to configure a bridge
+
+
+Examples:
+
+	JuliLog4jBridge.bridgeJuliLogger("foo");
+
+	This bridges all events posted to the 'foo' logger into log4j's Logger called 'foo'.
+
+	NOTE: this does NOT automatically bridge child Loggers.  Currenty one must bridge each Logger
you require.
+
+TODO
+	* LocationInfo is not working at this time
+	* Create an automatic bridge, non-daemon thread that polls the juli Logger
+	  hierarchy and automatically bridges them. 
+	* Tidy up of the Maven pom.xml - it's quite copy/pasted
\ No newline at end of file

Added: logging/sandbox/juli-to-log4j-bridge/pom.xml
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/pom.xml?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/pom.xml (added)
+++ logging/sandbox/juli-to-log4j-bridge/pom.xml Mon Apr 23 21:54:01 2007
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.logging</groupId>
+  <artifactId>apache-juli-log4j-bridge</artifactId>
+  <version>0.1.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.15</version>
+    </dependency>
+  </dependencies>
+  
+  <description>Bridge JDK 1.4+ java.util.Logging to Apache log4j</description>
+  <url>http://logging.apache.org/log4j</url>
+<issueManagement>
+  <system>Bugzilla</system>
+  <url>http://issues.apache.org/bugzilla</url>
+</issueManagement>
+<inceptionYear>2007</inceptionYear>
+<mailingLists>
+	<mailingList>
+		<name>log4j-user</name>
+		<subscribe>log4j-user-subscribe@logging.apache.org</subscribe>
+		<unsubscribe>log4j-user-unsubscribe@logging.apache.org</unsubscribe>
+		<post>log4j-user@logging.apache.org</post>
+		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
+		<otherArchives>
+			<otherArchive>http://marc.theaimsgroup.com/?l=log4j-user&amp;r=1&amp;w=2</otherArchive>
+		    <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.user</otherArchive>
+		</otherArchives>
+	</mailingList>
+	<mailingList>
+		<name>log4j-dev</name>
+		<subscribe>log4j-dev-subscribe@logging.apache.org</subscribe>
+		<unsubscribe>log4j-dev-unsubscribe@logging.apache.org</unsubscribe>
+		<post>log4j-dev@logging.apache.org</post>
+		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive>
+		<otherArchives>
+		    <otherArchive>http://marc.theaimsgroup.com/?l=log4j-dev&amp;r=1&amp;w=2</otherArchive>
+		    <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
+		</otherArchives>
+	</mailingList>
+</mailingLists>
+<developers>
+   <developer>
+   	   <id>mwomack</id>
+   	   <name>Mark Womack</name>
+   	   <email>mwomack@apache.org</email>
+   	</developer>
+   <developer>
+   	   <id>carnold</id>
+   	   <name>Curt Arnold</name>
+   	   <email>carnold@apache.org</email>
+   	</developer>
+   <developer>
+   	   <id>sdeboy</id>
+   	   <name>Scott Deboy</name>
+   	   <email>sdeboy@apache.org</email>
+   	</developer>
+   <developer>
+   	   <id>psmith</id>
+   	   <name>Paul Smith</name>
+   	   <email>psmith@apache.org</email>
+   	</developer>
+   	<!--  TODO: Many more need to be here -->
+</developers>
+<licenses>
+	<license>
+		<name>Apache License, Version 2.0</name>
+		<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+		<distribution>repo</distribution>
+	</license>
+</licenses>
+<scm>
+	<connection>scm:svn:http://svn.apache.org/repos/asf/logging/sandbox/juli-log4j-bridge</connection>
+	<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/sandbox/juli-log4j-bridge</developerConnection>
+	<url>http://svn.apache.org/viewcvs.cgi/logging/sandbox/juli-logging-bridge</url>
+</scm>
+<organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+</organization>
+<build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.12</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+</build>
+  
+</project>
+

Added: logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliBridgeFilter.java
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliBridgeFilter.java?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliBridgeFilter.java
(added)
+++ logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliBridgeFilter.java
Mon Apr 23 21:54:01 2007
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.logging.julibridge;
+
+import java.util.logging.Filter;
+import java.util.logging.LogRecord;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggingEvent;
+
+/**
+ * {@link Filter} implementation that posts any {@link LogRecord} received
+ * to a specified {@link Logger}, using the {@link JuliLevelConverter} class
+ * to map to a {@link Level}.
+ * 
+ * Once a {@link LogRecord} is received, it is 'appended' to all Appenders.
+ * 
+ * @author psmith
+ *
+ */
+public class JuliBridgeFilter implements Filter{
+
+    private final Logger loggerToPostTo;
+    private final JuliLog4jEventConverter converter;
+    
+    public JuliBridgeFilter(Logger loggerToPostTo, JuliLog4jEventConverter converter) {
+        this.loggerToPostTo = loggerToPostTo;
+        this.converter = converter;
+    }
+    
+
+    public boolean isLoggable(LogRecord record) {
+        LoggingEvent event = converter.convert(record);
+        loggerToPostTo.callAppenders(event);
+        return false;
+    }
+
+}

Added: logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLevelConverter.java
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLevelConverter.java?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLevelConverter.java
(added)
+++ logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLevelConverter.java
Mon Apr 23 21:54:01 2007
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.logging.julibridge;
+
+import org.apache.log4j.Level;
+
+/**
+ * Implementations make a decision on how to convert a java.util.logging.Level 
+ * instance into a log4j equivalent.
+ * 
+ * @author psmith
+ *
+ */
+public interface JuliLevelConverter {
+
+    /**
+     * Convertes a java.util.logging.Level class into an appropriate
+     * log4j Level, based on whatever policy you want.
+     * 
+     * 
+     * @param juliLevel
+     * @return
+     */
+    public Level convertJuliLevel(java.util.logging.Level juliLevel);
+}

Added: logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jBridge.java
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jBridge.java?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jBridge.java
(added)
+++ logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jBridge.java
Mon Apr 23 21:54:01 2007
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.logging.julibridge;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggerRepository;
+
+/**
+ * Helper class that creates bridge filters between java.util.logging.Loggers
+ * and an equivalent log4j Logger.
+ * 
+ * @author psmith
+ *
+ */
+public class JuliLog4jBridge {
+
+    private static final Logger LOG = Logger.getLogger(JuliLog4jBridge.class);
+
+//    TODO create a Timer that automatically bridges logger names as they arrive.
+    
+    
+    /**
+     * Convenience method that gathers the default LoggerRepository and uses a 
+     * default Level Converter implemenation.
+     * 
+     * @param juliLoggerName
+     */
+    public static void bridgeJuliLogger(String juliLoggerName) {
+        bridgeJuliLogger(juliLoggerName, LogManager.getLoggerRepository(), JuliLog4jEventConverter.DEFAULT_LEVEL_CONVERTER);
+    }
+
+    
+    public static void bridgeJuliLogger(String juliLoggerName, LoggerRepository repository)
{
+        bridgeJuliLogger(juliLoggerName, repository, JuliLog4jEventConverter.DEFAULT_LEVEL_CONVERTER);
+    }
+    
+    /**
+     * Creates a bridge between the named java.util.logging Logger name,
+     * and an equivalent inside the log4j LoggerRepository, using
+     * the provided level converter class.
+     * 
+     * If the juli Logger already has a configured Filter, then it is replaced 
+     * by this bridge, and a WARN level event is triggered on the JuliLog4jBridge own Logger
+     * 
+     * @param juliLoggerName
+     * @param repository
+     */
+    public static void bridgeJuliLogger(String juliLoggerName, LoggerRepository repository,
JuliLevelConverter levelConverter) {
+        Logger log4jLogger = repository.getLogger(juliLoggerName);
+        java.util.logging.Logger juliLogger = java.util.logging.Logger.getLogger(juliLoggerName);
+
+        if(juliLogger.getFilter()!=null) {
+            LOG.warn("The '" + juliLoggerName + "' java.util.logging.Logger already has a
filter class set, and is being replaced with a log4j-bridge impl: " + juliLogger.getFilter().toString());
+        }
+        juliLogger.setFilter(new JuliBridgeFilter(log4jLogger, new JuliLog4jEventConverter(repository,
levelConverter)));
+    }
+}

Added: logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jEventConverter.java
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jEventConverter.java?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jEventConverter.java
(added)
+++ logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julibridge/JuliLog4jEventConverter.java
Mon Apr 23 21:54:01 2007
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.logging.julibridge;
+
+import java.util.logging.LogRecord;
+
+import org.apache.log4j.Category;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
+import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.LoggingEvent;
+
+
+/**
+ * 
+ * Converter class that can convert a {@link LogRecord} instance
+ * into a log4j {@link LoggingEvent}.
+ * 
+ * @author psmith
+ *
+ */
+public class JuliLog4jEventConverter {
+
+    /**
+     * A default implementation of a converter that converts:
+     * 
+     * <li> FINEST -> TRACE</li>
+     * <li> FINER, FINE -> DEBUG</li>
+     * <li> INFO -> INFO</li>
+     * <li> WARNING -> WARN</li>
+     * <li> SEVERE -> ERROR</li>
+     * <li> ALL -> ALL</li>
+     * <li> OFF -> OFF</li>
+     * 
+     * Anything else is defaulted to DEBUG
+     */
+    private static final class DefaultLevelConverter implements JuliLevelConverter {
+
+        public Level convertJuliLevel(java.util.logging.Level juliLevel) {
+
+            if (juliLevel.equals(java.util.logging.Level.FINEST)) {
+                return Level.TRACE;
+            } else if (juliLevel.equals(java.util.logging.Level.FINER)) {
+                return Level.DEBUG;
+            } else if (juliLevel.equals(java.util.logging.Level.FINE)) {
+                return Level.DEBUG;
+            } else if (juliLevel.equals(java.util.logging.Level.INFO)) {
+                return Level.INFO;
+            } else if (juliLevel.equals(java.util.logging.Level.WARNING)) {
+                return Level.WARN;
+            } else if (juliLevel.equals(java.util.logging.Level.SEVERE)) {
+                return Level.ERROR;
+            } else if (juliLevel.equals(java.util.logging.Level.ALL)) {
+                return Level.ALL;
+            } else if (juliLevel.equals(java.util.logging.Level.OFF)) {
+                return Level.OFF;
+            }
+            return Level.DEBUG;
+
+        }
+    }
+
+    private final LoggerRepository repository;
+    private final JuliLevelConverter levelConverter;
+
+    public static final JuliLevelConverter DEFAULT_LEVEL_CONVERTER = new DefaultLevelConverter();
+
+    /**
+     * Creates a default converter implementation that uses the default {@link LoggerRepository},
ad the default
+     * {@link JuliLevelConverter}
+     */
+    public JuliLog4jEventConverter() {
+        this(LogManager.getLoggerRepository());
+    }
+
+    public JuliLog4jEventConverter(LoggerRepository repository) {
+        this(repository, DEFAULT_LEVEL_CONVERTER);
+    }
+
+    public JuliLog4jEventConverter(LoggerRepository repository, JuliLevelConverter levelConverter)
{
+        this.repository = repository;
+        this.levelConverter = levelConverter;
+    }
+
+    /**
+     * Converts a {@link LogRecord} class into a {@link LoggingEvent} instance mapping the
loggernames
+     * identically.
+     * 
+     * @param record to convert
+     * @return converted {@link LoggingEvent}
+     */
+    public LoggingEvent convert(LogRecord record) {
+        String loggerName = record.getLoggerName();
+        Logger logger = repository.getLogger(loggerName);
+        LoggingEvent event = new ConvertedLoggingEvent(loggerName, logger, record.getMillis(),
+                levelConverter.convertJuliLevel(record.getLevel()), record.getMessage(),
record
+                        .getThrown()
+
+        );
+
+        // TODO LocationInfo
+
+        return event;
+    }
+
+    /**
+     * This class is unfortunately required because not all LoggingEvent 
+     * properties can be modified in log4j 1.2.
+     * 
+     */
+    private static class ConvertedLoggingEvent extends LoggingEvent {
+
+        // private LocationInfo locationInfo = null;
+        public ConvertedLoggingEvent(String fqnOfCategoryClass, Category logger, long timeStamp,
+                Priority level, Object message, Throwable throwable
+
+        ) {
+            super(fqnOfCategoryClass, logger, timeStamp, level, message, throwable);
+
+        }
+        //
+        // public LocationInfo getLocationInformation() {
+        //            
+        // if(locationInfo == null) {
+        // locationInfo = new LocationInfo(this.fqnOfCategoryClass, )
+        // }
+        // }
+
+    }
+
+}

Added: logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/JuliLog4jBridgeTest.java
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/JuliLog4jBridgeTest.java?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/JuliLog4jBridgeTest.java
(added)
+++ logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/JuliLog4jBridgeTest.java
Mon Apr 23 21:54:01 2007
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.logging.julibridge;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggingEvent;
+
+import junit.framework.TestCase;
+
+public class JuliLog4jBridgeTest extends TestCase {
+
+    protected void setUp() throws Exception {
+        LogManager.resetConfiguration();
+        java.util.logging.LogManager.getLogManager().reset();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testBridgeJuliLogger() {
+        MockAppender mockAppender = new MockAppender();
+        Logger.getRootLogger().addAppender(mockAppender);
+        
+        java.util.logging.Logger juliLogger = java.util.logging.Logger.getLogger("foo");
+        juliLogger.warning("boo");
+        
+        assertEquals("Shouldn't expect a bridged event", 0, mockAppender.observedLoggingEvents.size());
+        JuliLog4jBridge.bridgeJuliLogger("foo");
+     
+        juliLogger.warning("boo2");
+        
+        assertEquals(1, mockAppender.observedLoggingEvents.size());
+        assertEquals("boo2", ((LoggingEvent)mockAppender.observedLoggingEvents.get(0)).getMessage());
+        
+      
+        
+    }
+
+}

Added: logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/MockAppender.java
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/MockAppender.java?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/MockAppender.java
(added)
+++ logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/MockAppender.java
Mon Apr 23 21:54:01 2007
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.logging.julibridge;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Appender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.spi.ErrorHandler;
+import org.apache.log4j.spi.Filter;
+import org.apache.log4j.spi.LoggingEvent;
+
+public class MockAppender implements Appender {
+    
+    public List observedLoggingEvents = new ArrayList();
+    
+    public void addFilter(Filter newFilter) {
+
+    }
+
+    public void clearFilters() {
+    }
+
+    public void close() {
+    }
+
+    public void doAppend(LoggingEvent event) {
+        observedLoggingEvents.add(event);
+    }
+
+    public ErrorHandler getErrorHandler() {
+        return null;
+    }
+
+    public Filter getFilter() {
+        return null;
+    }
+
+    public Layout getLayout() {
+        return null;
+    }
+
+    public String getName() {
+        return null;
+    }
+
+    public boolean requiresLayout() {
+        return false;
+    }
+
+    public void setErrorHandler(ErrorHandler errorHandler) {
+
+    }
+
+    public void setLayout(Layout layout) {
+    }
+
+    public void setName(String name) {
+        // TODO Auto-generated method stub
+
+    }
+
+}
\ No newline at end of file

Added: logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/TestLogPosting.java
URL: http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/TestLogPosting.java?view=auto&rev=531720
==============================================================================
--- logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/TestLogPosting.java
(added)
+++ logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julibridge/TestLogPosting.java
Mon Apr 23 21:54:01 2007
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.logging.julibridge;
+
+
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggingEvent;
+
+import junit.framework.TestCase;
+
+public class TestLogPosting extends TestCase {
+
+    private Logger log;
+    private java.util.logging.Logger juliLog;
+    private MockAppender testAppender;
+    
+    public void setUp() {
+        LogManager.resetConfiguration();
+        java.util.logging.LogManager.getLogManager().reset();
+    
+        log = Logger.getLogger("foo");
+        juliLog = java.util.logging.Logger.getLogger("foo");
+        
+        testAppender = new MockAppender();
+        log.addAppender(testAppender);
+    }
+    
+    public void testBasicObservedEvent() {
+        juliLog.setFilter(new JuliBridgeFilter(log, new JuliLog4jEventConverter()));
+        String expectedMessage = "foo";
+        
+        juliLog.warning(expectedMessage);
+        
+        assertEquals("Should have observed 1 and only 1 event", 1, testAppender.observedLoggingEvents.size());
+        LoggingEvent observedEvent = (LoggingEvent) testAppender.observedLoggingEvents.get(0);
+        assertEquals(Level.WARN, observedEvent.getLevel());
+        assertEquals(expectedMessage, observedEvent.getMessage());
+        assertNull(observedEvent.getThrowableInformation());
+        
+    }
+    
+    
+}



---------------------------------------------------------------------
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