karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1545191 - in /karaf/trunk/log/core/src: main/java/org/apache/karaf/log/core/ main/java/org/apache/karaf/log/core/internal/ main/resources/OSGI-INF/blueprint/ test/java/org/apache/karaf/log/core/internal/
Date Mon, 25 Nov 2013 09:46:31 GMT
Author: jbonofre
Date: Mon Nov 25 09:46:30 2013
New Revision: 1545191

URL: http://svn.apache.org/r1545191
Log:
[KARAF-2264] Rename Log to LogMBeanImpl

Added:
    karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogMBeanImpl.java
      - copied, changed from r1545164, karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/Log.java
Removed:
    karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/Log.java
Modified:
    karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/LogMBean.java
    karaf/trunk/log/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.java

Modified: karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/LogMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/LogMBean.java?rev=1545191&r1=1545190&r2=1545191&view=diff
==============================================================================
--- karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/LogMBean.java (original)
+++ karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/LogMBean.java Mon Nov 25
09:46:30 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.karaf.log.core;
 
-
 /**
  * Log MBean.
  */

Copied: karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogMBeanImpl.java
(from r1545164, karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/Log.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogMBeanImpl.java?p2=karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogMBeanImpl.java&p1=karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/Log.java&r1=1545164&r2=1545191&rev=1545191&view=diff
==============================================================================
--- karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/Log.java (original)
+++ karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogMBeanImpl.java
Mon Nov 25 09:46:30 2013
@@ -23,13 +23,13 @@ import org.apache.karaf.log.core.LogMBea
 import org.apache.karaf.log.core.LogService;
 
 /**
- * Implementation of the Log MBean.
+ * Implementation of the LogMBean.
  */
-public class Log extends StandardMBean implements LogMBean {
+public class LogMBeanImpl extends StandardMBean implements LogMBean {
 
     private final LogService logService;
 
-    public Log(LogService logService) throws NotCompliantMBeanException {
+    public LogMBeanImpl(LogService logService) throws NotCompliantMBeanException {
         super(LogMBean.class);
         this.logService = logService;
     }

Modified: karaf/trunk/log/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/log/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1545191&r1=1545190&r2=1545191&view=diff
==============================================================================
--- karaf/trunk/log/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/trunk/log/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Nov 25 09:46:30
2013
@@ -50,7 +50,7 @@
     
     <service ref="logService" interface="org.apache.karaf.log.core.LogService"/>
 
-    <bean id="logMBean" class="org.apache.karaf.log.core.internal.Log">
+    <bean id="logMBean" class="org.apache.karaf.log.core.internal.LogMBeanImpl">
         <argument ref="logService"/>
     </bean>
 

Modified: karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.java?rev=1545191&r1=1545190&r2=1545191&view=diff
==============================================================================
--- karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.java
(original)
+++ karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.java
Mon Nov 25 09:46:30 2013
@@ -16,18 +16,13 @@
  */
 package org.apache.karaf.log.core.internal;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
 import java.util.Hashtable;
 
 import junit.framework.TestCase;
 
-import org.apache.karaf.log.core.Level;
 import org.apache.karaf.log.core.LogMBean;
 import org.apache.karaf.log.core.LogService;
 import org.easymock.EasyMock;
-import org.junit.experimental.categories.Categories.ExcludeCategory;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 
@@ -56,7 +51,7 @@ public class SetLogLevelTest extends Tes
         ConfigurationAdmin configAdmin = EasyMock.createMock(ConfigurationAdmin.class);
         EasyMock.expect(configAdmin.getConfiguration(LogServiceImpl.CONFIGURATION_PID, null)).andReturn(configuration);
         logService = new LogServiceImpl(configAdmin, new LruList(100));
-        logMBean = new Log(logService);
+        logMBean = new LogMBeanImpl(logService);
         EasyMock.replay(configAdmin);
         EasyMock.replay(configuration);
     }



Mime
View raw message