qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From philharveyonl...@apache.org
Subject svn commit: r1501734 - in /qpid/proton/trunk: proton-j/ proton-j/proton-api/ proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/ proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/ proton-j/proton-api/src/test/java/org/apach...
Date Wed, 10 Jul 2013 11:47:15 GMT
Author: philharveyonline
Date: Wed Jul 10 11:47:15 2013
New Revision: 1501734

URL: http://svn.apache.org/r1501734
Log:
PROTON-343: moved JUL and SLF4J loggers to proton-logging module, and made StdOutCategoryLogger
the default (and adding configurability to it).

Added:
    qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/StdOutCategoryLoggerTest.java
    qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/test/
    qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/test/ProtonTestCase.java
    qpid/proton/trunk/proton-j/proton-logging/
    qpid/proton/trunk/proton-j/proton-logging/LICENSE
    qpid/proton/trunk/proton-j/proton-logging/pom.xml
      - copied, changed from r1501318, qpid/proton/trunk/proton-j/proton-api/pom.xml
    qpid/proton/trunk/proton-j/proton-logging/src/
    qpid/proton/trunk/proton-j/proton-logging/src/main/
    qpid/proton/trunk/proton-j/proton-logging/src/main/java/
    qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/
    qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/
    qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/
    qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/
    qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/
    qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/JULCategoryLogger.java
      - copied, changed from r1501318, qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java
    qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/SLF4JCategoryLogger.java
Modified:
    qpid/proton/trunk/proton-j/pom.xml
    qpid/proton/trunk/proton-j/proton-api/pom.xml
    qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/CategoryLoggerDiscovery.java
    qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java
    qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java
    qpid/proton/trunk/tests/java/org/apache/qpid/proton/systemtests/logging/LoggingCustomisationTest.java

Modified: qpid/proton/trunk/proton-j/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/pom.xml?rev=1501734&r1=1501733&r2=1501734&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/pom.xml (original)
+++ qpid/proton/trunk/proton-j/pom.xml Wed Jul 10 11:47:15 2013
@@ -44,6 +44,7 @@
 
   <modules>
     <module>proton-api</module>
+    <module>proton-logging</module>
     <module>proton</module>
     <module>contrib/proton-jms</module>
     <module>contrib/proton-hawtdispatch</module>

Modified: qpid/proton/trunk/proton-j/proton-api/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/pom.xml?rev=1501734&r1=1501733&r2=1501734&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/pom.xml (original)
+++ qpid/proton/trunk/proton-j/proton-api/pom.xml Wed Jul 10 11:47:15 2013
@@ -28,15 +28,4 @@
   <scm>
     <url>http://svn.apache.org/viewvc/qpid/proton/</url>
   </scm>
-
-  <dependencies>
-    <dependency>
-      <!-- used to build SLF4JCategoryLogger, but marked 'optional' so application code
does
-           not require it (unless it explicitly chooses to use the SLF4JCategoryLogger) -->
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.5</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
 </project>

Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/CategoryLoggerDiscovery.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/CategoryLoggerDiscovery.java?rev=1501734&r1=1501733&r2=1501734&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/CategoryLoggerDiscovery.java
(original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/CategoryLoggerDiscovery.java
Wed Jul 10 11:47:15 2013
@@ -34,45 +34,50 @@ class CategoryLoggerDiscovery
     private static final ProtonCategoryLogger DEFAULT_LOGGER;
     static
     {
-        String loggerType = System.getProperty(PROTON_DEFAULT_CATEGORY_LOGGER_PROP, PROTON_CATEGORY_LOGGER_JUL);
-        if(PROTON_CATEGORY_LOGGER_JUL.equals(loggerType))
+        String loggerType = System.getProperty(PROTON_DEFAULT_CATEGORY_LOGGER_PROP, PROTON_CATEGORY_LOGGER_STDOUT);
+        if(PROTON_CATEGORY_LOGGER_STDOUT.equals(loggerType))
         {
-            DEFAULT_LOGGER = new JULCategoryLogger();
+            DEFAULT_LOGGER = new StdOutCategoryLogger();
         }
-        else if(PROTON_CATEGORY_LOGGER_SLF4J.equals(loggerType))
+        else if(PROTON_CATEGORY_LOGGER_JUL.equals(loggerType))
         {
-            throw new UnsupportedOperationException("TODO reinstate SLF4JCategoryLogger");
+            DEFAULT_LOGGER = createLogger("org.apache.qpid.proton.logging.JULCategoryLogger");
         }
-        else if(PROTON_CATEGORY_LOGGER_STDOUT.equals(loggerType))
+        else if(PROTON_CATEGORY_LOGGER_SLF4J.equals(loggerType))
         {
-            DEFAULT_LOGGER = new StdOutCategoryLogger();
+            DEFAULT_LOGGER = createLogger("org.apache.qpid.proton.logging.SLF4JCategoryLogger");
         }
         else
         {
-            try
-            {
-                Class<?> clazz = Class.forName(loggerType);
-                if(!ProtonCategoryLogger.class.isAssignableFrom(clazz))
-                {
-                    throw new IllegalArgumentException("Provided class name must be a " +
-                                                       ProtonCategoryLogger.class.getName()
+ ": " + loggerType);
-                }
+            DEFAULT_LOGGER = createLogger(loggerType);
+        }
+    }
 
-                Object obj = clazz.newInstance();
-                DEFAULT_LOGGER = (ProtonCategoryLogger) obj;
-            }
-            catch (ClassNotFoundException e)
-            {
-                throw new RuntimeException(e);
-            }
-            catch (InstantiationException e)
-            {
-                throw new RuntimeException(e);
-            }
-            catch (IllegalAccessException e)
+    private static ProtonCategoryLogger createLogger(String loggerClass)
+    {
+        try
+        {
+            Class<?> clazz = Class.forName(loggerClass);
+            if(!ProtonCategoryLogger.class.isAssignableFrom(clazz))
             {
-                throw new RuntimeException(e);
+                throw new IllegalArgumentException("Provided class name must be a " +
+                                                   ProtonCategoryLogger.class.getName() +
": " + loggerClass);
             }
+
+            Object obj = clazz.newInstance();
+            return (ProtonCategoryLogger) obj;
+        }
+        catch (ClassNotFoundException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (InstantiationException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (IllegalAccessException e)
+        {
+            throw new RuntimeException(e);
         }
     }
 

Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java?rev=1501734&r1=1501733&r2=1501734&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java
(original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java
Wed Jul 10 11:47:15 2013
@@ -19,20 +19,77 @@
 package org.apache.qpid.proton.logging;
 
 import java.util.Date;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+/**
+ * Logs the enabled categories to standard out.
+ *
+ * Categories are enabled by setting a regular expression specifying the categories
+ * via system property {@value #PROTON_ENABLED_CATEGORIES_PROP} or, if absent,
+ * environment variable {@value #PROTON_ENABLED_CATEGORIES_ENV}.
+ */
 public class StdOutCategoryLogger implements ProtonCategoryLogger
 {
+    public static final String PROTON_ENABLED_CATEGORIES_PROP = "proton.logging.categories";
+    public static final String PROTON_ENABLED_CATEGORIES_ENV = "PN_LOGGING_CATEGORIES";
 
+    private ConcurrentHashMap<String, Boolean> _categoryEnabledStatuses = new ConcurrentHashMap<String,
Boolean>();
+
+    private final Pattern _enabledCategoriesPattern;
+
+    public StdOutCategoryLogger()
+    {
+        String enabledCategoriesEnv = System.getenv(PROTON_ENABLED_CATEGORIES_ENV);
+        String enabledCategoriesString = System.getProperty(PROTON_ENABLED_CATEGORIES_PROP,
enabledCategoriesEnv);
+        if(enabledCategoriesString == null || enabledCategoriesString.isEmpty())
+        {
+            _enabledCategoriesPattern = null;
+        }
+        else
+        {
+            _enabledCategoriesPattern = Pattern.compile(enabledCategoriesString);
+        }
+    }
+
+    /**
+     * Returns whether the supplied category is enabled.
+     */
     @Override
     public boolean isEnabled(String category, ProtonLogLevel level)
     {
-        return true;
+        if(_enabledCategoriesPattern == null)
+        {
+            return false;
+        }
+        else
+        {
+            Boolean enabledStatus = _categoryEnabledStatuses.get(category);
+            if(enabledStatus == null)
+            {
+                Matcher matcher = _enabledCategoriesPattern.matcher(category);
+                boolean matches = matcher.matches();
+                _categoryEnabledStatuses.putIfAbsent(category, matches);
+                return matches;
+            }
+            else
+            {
+                return enabledStatus;
+            }
+        }
     }
 
+    /**
+     * Logs the message if this category is enabled.
+     */
     @Override
     public void log(String category, ProtonLogLevel level, String message)
     {
-        System.out.println(String.format("%1$tF %1$tT.%tL [%s] [%s] %s",
-                                         new Date(), level, category, message));
+        if(isEnabled(category, level))
+        {
+            System.out.println(String.format("%1$tF %1$tT.%tL [%s] [%s] %s",
+                                             new Date(), level, category, message));
+        }
     }
 }

Modified: qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java?rev=1501734&r1=1501733&r2=1501734&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java
(original)
+++ qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java
Wed Jul 10 11:47:15 2013
@@ -30,9 +30,9 @@ public class CategoryLoggerDiscoveryTest
     private final CategoryLoggerDiscovery _discovery = new CategoryLoggerDiscovery();
 
     @Test
-    public void testDefaultLogger_isJavaUtilLogging()
+    public void testDefaultLogger_isStdOutLogger()
     {
-        assertThat(_discovery.getEffectiveLogger(), is(JULCategoryLogger.class));
+        assertThat(_discovery.getEffectiveLogger(), is(StdOutCategoryLogger.class));
     }
 
     @Test

Added: qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/StdOutCategoryLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/StdOutCategoryLoggerTest.java?rev=1501734&view=auto
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/StdOutCategoryLoggerTest.java
(added)
+++ qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/StdOutCategoryLoggerTest.java
Wed Jul 10 11:47:15 2013
@@ -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.qpid.proton.logging;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.apache.qpid.proton.test.ProtonTestCase;
+import org.junit.Test;
+
+public class StdOutCategoryLoggerTest extends ProtonTestCase
+{
+    @Test
+    public void testIsEnabled_returnsFalseByDefault()
+    {
+        StdOutCategoryLogger logger = new StdOutCategoryLogger();
+        assertFalse(logger.isEnabled("proton.category1", ProtonLogLevel.TRACE));
+    }
+
+    @Test
+    public void testIsEnabledForExactMatch_returnsTrue()
+    {
+        setTestSystemProperty(StdOutCategoryLogger.PROTON_ENABLED_CATEGORIES_PROP, "proton.category1");
+        StdOutCategoryLogger logger = new StdOutCategoryLogger();
+        assertWhetherEnabled(logger, "proton.category1", true);
+        assertWhetherEnabled(logger, "notproton.category1", false);
+    }
+
+    @Test
+    public void testIsEnabledForRegexMatch()
+    {
+        setTestSystemProperty(StdOutCategoryLogger.PROTON_ENABLED_CATEGORIES_PROP, "proton.*");
+        StdOutCategoryLogger logger = new StdOutCategoryLogger();
+
+        assertWhetherEnabled(logger, "proton", true);
+        assertWhetherEnabled(logger, "proton", true); // ask again to exercise the logger's
memoizing code path
+        assertWhetherEnabled(logger, "proton.category1", true);
+        assertWhetherEnabled(logger, "notproton", false);
+    }
+
+    @Test
+    public void testIsEnabledForMultiCategoryRegex()
+    {
+        setTestSystemProperty(StdOutCategoryLogger.PROTON_ENABLED_CATEGORIES_PROP, "(category1|category2)");
+        StdOutCategoryLogger logger = new StdOutCategoryLogger();
+
+        assertWhetherEnabled(logger, "category1", true);
+        assertWhetherEnabled(logger, "category2", true);
+        assertWhetherEnabled(logger, "category3", false);
+    }
+
+    private void assertWhetherEnabled(StdOutCategoryLogger logger, String category, boolean
isEnabled)
+    {
+        assertEquals(isEnabled, logger.isEnabled(category, ProtonLogLevel.TRACE));
+    }
+}

Added: qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/test/ProtonTestCase.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/test/ProtonTestCase.java?rev=1501734&view=auto
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/test/ProtonTestCase.java
(added)
+++ qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/test/ProtonTestCase.java
Wed Jul 10 11:47:15 2013
@@ -0,0 +1,110 @@
+/*
+ * 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.qpid.proton.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+
+public class ProtonTestCase
+{
+    private static final Logger _logger = Logger.getLogger(ProtonTestCase.class.getName());
+
+    private final Map<String, String> _propertiesSetForTest = new HashMap<String,
String>();
+
+    @Rule public TestName _testName = new TestName();
+
+    /**
+     * Set a System property for duration of this test only. The tearDown will
+     * guarantee to reset the property to its previous value after the test
+     * completes.
+     *
+     * @param property The property to set
+     * @param value the value to set it to, if null, the property will be cleared
+     */
+    protected void setTestSystemProperty(final String property, final String value)
+    {
+        if (!_propertiesSetForTest.containsKey(property))
+        {
+            // Record the current value so we can revert it later.
+            _propertiesSetForTest.put(property, System.getProperty(property));
+        }
+
+        if (value == null)
+        {
+            System.clearProperty(property);
+            _logger.info("Set system property '" + property + "' to be cleared");
+        }
+        else
+        {
+            System.setProperty(property, value);
+            _logger.info("Set system property '" + property + "' to: '" + value + "'");
+        }
+
+    }
+
+    /**
+     * Restore the System property values that were set by this test run.
+     */
+    protected void revertTestSystemProperties()
+    {
+        if(!_propertiesSetForTest.isEmpty())
+        {
+            for (String key : _propertiesSetForTest.keySet())
+            {
+                String value = _propertiesSetForTest.get(key);
+                if (value != null)
+                {
+                    System.setProperty(key, value);
+                    _logger.info("Reverted system property '" + key + "' to: '" + value +
"'");
+                }
+                else
+                {
+                    System.clearProperty(key);
+                    _logger.info("Reverted system property '" + key + "' to be cleared");
+                }
+            }
+
+            _propertiesSetForTest.clear();
+        }
+    }
+
+    @After
+    public void tearDown() throws java.lang.Exception
+    {
+        _logger.info("========== tearDown " + getTestName() + " ==========");
+        revertTestSystemProperties();
+    }
+
+    @Before
+    public void setUp() throws Exception
+    {
+        _logger.info("========== start " + getTestName() + " ==========");
+    }
+
+    protected String getTestName()
+    {
+        return getClass().getSimpleName() + "." +_testName.getMethodName();
+    }
+}

Added: qpid/proton/trunk/proton-j/proton-logging/LICENSE
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-logging/LICENSE?rev=1501734&view=auto
==============================================================================
--- qpid/proton/trunk/proton-j/proton-logging/LICENSE (added)
+++ qpid/proton/trunk/proton-j/proton-logging/LICENSE Wed Jul 10 11:47:15 2013
@@ -0,0 +1,203 @@
+
+                                 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 [yyyy] [name of copyright owner]
+
+   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.
+

Copied: qpid/proton/trunk/proton-j/proton-logging/pom.xml (from r1501318, qpid/proton/trunk/proton-j/proton-api/pom.xml)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-logging/pom.xml?p2=qpid/proton/trunk/proton-j/proton-logging/pom.xml&p1=qpid/proton/trunk/proton-j/proton-api/pom.xml&r1=1501318&r2=1501734&rev=1501734&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/pom.xml (original)
+++ qpid/proton/trunk/proton-j/proton-logging/pom.xml Wed Jul 10 11:47:15 2013
@@ -22,15 +22,21 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
+  <description>Additional implementations of proton-api's logging interfaces</description>
 
-  <artifactId>proton-api</artifactId>
-  <name>proton-api</name>
+  <artifactId>proton-logging</artifactId>
+  <name>proton-logging</name>
   <scm>
     <url>http://svn.apache.org/viewvc/qpid/proton/</url>
   </scm>
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>proton-api</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
       <!-- used to build SLF4JCategoryLogger, but marked 'optional' so application code
does
            not require it (unless it explicitly chooses to use the SLF4JCategoryLogger) -->
       <groupId>org.slf4j</groupId>

Copied: qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/JULCategoryLogger.java
(from r1501318, qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/JULCategoryLogger.java?p2=qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/JULCategoryLogger.java&p1=qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java&r1=1501318&r2=1501734&rev=1501734&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/StdOutCategoryLogger.java
(original)
+++ qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/JULCategoryLogger.java
Wed Jul 10 11:47:15 2013
@@ -18,21 +18,38 @@
  */
 package org.apache.qpid.proton.logging;
 
-import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-public class StdOutCategoryLogger implements ProtonCategoryLogger
+
+/**
+ * Uses java.util.logging
+ */
+public class JULCategoryLogger implements ProtonCategoryLogger
 {
+    private static final Map<ProtonLogLevel, Level> _protonLevelsToJavaLevels = new
HashMap<ProtonLogLevel, Level>();
+    static
+    {
+        _protonLevelsToJavaLevels.put(ProtonLogLevel.TRACE, Level.FINER);
+        _protonLevelsToJavaLevels.put(ProtonLogLevel.DEBUG, Level.FINE);
+        _protonLevelsToJavaLevels.put(ProtonLogLevel.INFO, Level.INFO);
+        _protonLevelsToJavaLevels.put(ProtonLogLevel.WARN, Level.WARNING);
+        _protonLevelsToJavaLevels.put(ProtonLogLevel.ERROR, Level.SEVERE);
+    }
 
     @Override
     public boolean isEnabled(String category, ProtonLogLevel level)
     {
-        return true;
+        Level julLevel = _protonLevelsToJavaLevels.get(level);
+        return Logger.getLogger(category).isLoggable(julLevel);
     }
 
     @Override
     public void log(String category, ProtonLogLevel level, String message)
     {
-        System.out.println(String.format("%1$tF %1$tT.%tL [%s] [%s] %s",
-                                         new Date(), level, category, message));
+        Level julLevel = _protonLevelsToJavaLevels.get(level);
+        Logger.getLogger(category).log(julLevel, message);
     }
 }

Added: qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/SLF4JCategoryLogger.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/SLF4JCategoryLogger.java?rev=1501734&view=auto
==============================================================================
--- qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/SLF4JCategoryLogger.java
(added)
+++ qpid/proton/trunk/proton-j/proton-logging/src/main/java/org/apache/qpid/proton/logging/SLF4JCategoryLogger.java
Wed Jul 10 11:47:15 2013
@@ -0,0 +1,74 @@
+/*
+ * 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.qpid.proton.logging;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SLF4JCategoryLogger implements ProtonCategoryLogger
+{
+    @Override
+    public boolean isEnabled(String category, ProtonLogLevel level)
+    {
+        Logger logger = LoggerFactory.getLogger(category);
+
+        switch(level)
+        {
+            case TRACE:
+                return logger.isTraceEnabled();
+            case DEBUG:
+                return logger.isDebugEnabled();
+            case INFO:
+                return logger.isInfoEnabled();
+            case WARN:
+                return logger.isWarnEnabled();
+            case ERROR:
+                return logger.isErrorEnabled();
+            default:
+                throw new RuntimeException("Unsupported log level: " + level);
+        }
+    }
+
+    @Override
+    public void log(String category, ProtonLogLevel level, String message)
+    {
+        Logger logger = LoggerFactory.getLogger(category);
+
+        switch(level)
+        {
+            case TRACE:
+                logger.trace(message);
+                break;
+            case DEBUG:
+                logger.debug(message);
+                break;
+            case INFO:
+                logger.info(message);
+                break;
+            case WARN:
+                logger.warn(message);
+                break;
+            case ERROR:
+                logger.error(message);
+                break;
+            default:
+                throw new RuntimeException("Unsupported log level: " + level);
+        }
+    }
+}

Modified: qpid/proton/trunk/tests/java/org/apache/qpid/proton/systemtests/logging/LoggingCustomisationTest.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tests/java/org/apache/qpid/proton/systemtests/logging/LoggingCustomisationTest.java?rev=1501734&r1=1501733&r2=1501734&view=diff
==============================================================================
--- qpid/proton/trunk/tests/java/org/apache/qpid/proton/systemtests/logging/LoggingCustomisationTest.java
(original)
+++ qpid/proton/trunk/tests/java/org/apache/qpid/proton/systemtests/logging/LoggingCustomisationTest.java
Wed Jul 10 11:47:15 2013
@@ -30,10 +30,10 @@ import org.apache.qpid.proton.amqp.trans
 import org.apache.qpid.proton.engine.Connection;
 import org.apache.qpid.proton.engine.EngineFactory;
 import org.apache.qpid.proton.logging.CategoryAwareProtonLogger;
-import org.apache.qpid.proton.logging.JULCategoryLogger;
 import org.apache.qpid.proton.logging.ProtonCategoryLogger;
 import org.apache.qpid.proton.logging.ProtonLogLevel;
 import org.apache.qpid.proton.logging.ProtonLogger;
+import org.apache.qpid.proton.logging.StdOutCategoryLogger;
 import org.apache.qpid.proton.systemtests.engine.ProtonFactoryTestFixture;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
@@ -53,10 +53,10 @@ public class LoggingCustomisationTest
     }
 
     @Test
-    public void testDefaultCategoryLoggerUsesJavaUtilLogging()
+    public void testDefaultCategoryLoggerUsesStdOut()
     {
         CategoryAwareProtonLogger engineLogger = (CategoryAwareProtonLogger)_engineFactory.getEngineLogger();
-        assertThat(engineLogger.getCategoryLogger(), is(JULCategoryLogger.class));
+        assertThat(engineLogger.getCategoryLogger(), is(StdOutCategoryLogger.class));
     }
 
     @Test



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message