You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/04/05 14:42:31 UTC
svn commit: r1089005 - in /commons/proper/discovery/trunk/src:
java/org/apache/commons/discovery/ java/org/apache/commons/discovery/jdk/
java/org/apache/commons/discovery/log/
java/org/apache/commons/discovery/resource/
java/org/apache/commons/discover...
Author: simonetripodi
Date: Tue Apr 5 12:42:30 2011
New Revision: 1089005
URL: http://svn.apache.org/viewvc?rev=1089005&view=rev
Log:
removed custom common-logging implementation, see DISCOVERY-15
Removed:
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/log/
Modified:
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ClassUtils.java
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ManagedProperties.java
commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/ResourceClass.java Tue Apr 5 12:42:30 2011
@@ -20,8 +20,8 @@ import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* 'Resource' located by discovery.
@@ -34,7 +34,7 @@ import org.apache.commons.logging.Log;
*/
public class ResourceClass<T> extends Resource {
- private static Log log = DiscoveryLogFactory.newLog(ResourceClass.class);
+ private static Log log = LogFactory.getLog(ResourceClass.class);
/**
* Sets the {@code Log} for this class.
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/jdk/JDK12Hooks.java Tue Apr 5 12:42:30 2011
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -34,7 +34,7 @@ public class JDK12Hooks extends JDKHooks
/**
* Logger
*/
- private static Log log = DiscoveryLogFactory.newLog(JDK12Hooks.class);
+ private static Log log = LogFactory.getLog(JDK12Hooks.class);
private static final ClassLoader systemClassLoader
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/DiscoverResources.java Tue Apr 5 12:42:30 2011
@@ -24,8 +24,8 @@ import org.apache.commons.discovery.Reso
import org.apache.commons.discovery.ResourceDiscover;
import org.apache.commons.discovery.ResourceIterator;
import org.apache.commons.discovery.jdk.JDKHooks;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -35,7 +35,7 @@ public class DiscoverResources
extends ResourceDiscoverImpl
implements ResourceDiscover
{
- private static Log log = DiscoveryLogFactory.newLog(DiscoverResources.class);
+ private static Log log = LogFactory.getLog(DiscoverResources.class);
/**
* Sets the {@code Log} for this class.
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java Tue Apr 5 12:42:30 2011
@@ -23,9 +23,9 @@ import java.util.List;
import org.apache.commons.discovery.ResourceClass;
import org.apache.commons.discovery.ResourceClassDiscover;
import org.apache.commons.discovery.ResourceClassIterator;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.discovery.resource.ClassLoaders;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -37,7 +37,7 @@ public class DiscoverClasses<T>
extends ResourceClassDiscoverImpl<T>
implements ResourceClassDiscover<T>
{
- private static Log log = DiscoveryLogFactory.newLog(DiscoverClasses.class);
+ private static Log log = LogFactory.getLog(DiscoverClasses.class);
/**
* Sets the {@code Log} for this class.
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverMappedNames.java Tue Apr 5 12:42:30 2011
@@ -21,8 +21,8 @@ import java.util.Map;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -39,7 +39,7 @@ public class DiscoverMappedNames
extends ResourceNameDiscoverImpl
implements ResourceNameDiscover
{
- private static Log log = DiscoveryLogFactory.newLog(DiscoverMappedNames.class);
+ private static Log log = LogFactory.getLog(DiscoverMappedNames.class);
public static void setLog(Log _log) {
log = _log;
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInAlternateManagedProperties.java Tue Apr 5 12:42:30 2011
@@ -21,9 +21,9 @@ import java.util.Map;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.discovery.tools.ManagedProperties;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -40,7 +40,7 @@ public class DiscoverNamesInAlternateMan
extends ResourceNameDiscoverImpl
implements ResourceNameDiscover
{
- private static Log log = DiscoveryLogFactory.newLog(DiscoverNamesInAlternateManagedProperties.class);
+ private static Log log = LogFactory.getLog(DiscoverNamesInAlternateManagedProperties.class);
/**
* Sets the {@code Log} for this class.
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInDictionary.java Tue Apr 5 12:42:30 2011
@@ -21,8 +21,8 @@ import java.util.Hashtable;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -36,7 +36,7 @@ public class DiscoverNamesInDictionary
extends ResourceNameDiscoverImpl
implements ResourceNameDiscover
{
- private static Log log = DiscoveryLogFactory.newLog(DiscoverNamesInDictionary.class);
+ private static Log log = LogFactory.getLog(DiscoverNamesInDictionary.class);
public static void setLog(Log _log) {
log = _log;
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInFile.java Tue Apr 5 12:42:30 2011
@@ -28,10 +28,10 @@ import org.apache.commons.discovery.Reso
import org.apache.commons.discovery.ResourceIterator;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.discovery.resource.ClassLoaders;
import org.apache.commons.discovery.resource.DiscoverResources;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
@@ -51,7 +51,7 @@ public class DiscoverNamesInFile
extends ResourceNameDiscoverImpl
implements ResourceNameDiscover
{
- private static Log log = DiscoveryLogFactory.newLog(DiscoverNamesInFile.class);
+ private static Log log = LogFactory.getLog(DiscoverNamesInFile.class);
public static void setLog(Log _log) {
log = _log;
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInManagedProperties.java Tue Apr 5 12:42:30 2011
@@ -18,9 +18,9 @@ package org.apache.commons.discovery.res
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.discovery.tools.ManagedProperties;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -31,7 +31,7 @@ public class DiscoverNamesInManagedPrope
extends ResourceNameDiscoverImpl
implements ResourceNameDiscover
{
- private static Log log = DiscoveryLogFactory.newLog(DiscoverNamesInManagedProperties.class);
+ private static Log log = LogFactory.getLog(DiscoverNamesInManagedProperties.class);
/**
* Sets the {@code Log} for this class.
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/DiscoverNamesInSystemProperties.java Tue Apr 5 12:42:30 2011
@@ -18,8 +18,8 @@ package org.apache.commons.discovery.res
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -29,7 +29,7 @@ public class DiscoverNamesInSystemProper
extends ResourceNameDiscoverImpl
implements ResourceNameDiscover
{
- private static Log log = DiscoveryLogFactory.newLog(DiscoverNamesInSystemProperties.class);
+ private static Log log = LogFactory.getLog(DiscoverNamesInSystemProperties.class);
public static void setLog(Log _log) {
log = _log;
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/names/NameDiscoverers.java Tue Apr 5 12:42:30 2011
@@ -21,8 +21,8 @@ import java.util.List;
import org.apache.commons.discovery.ResourceNameDiscover;
import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -34,7 +34,7 @@ public class NameDiscoverers
extends ResourceNameDiscoverImpl
implements ResourceNameDiscover
{
- private static Log log = DiscoveryLogFactory.newLog(NameDiscoverers.class);
+ private static Log log = LogFactory.getLog(NameDiscoverers.class);
public static void setLog(Log _log) {
log = _log;
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ClassUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ClassUtils.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ClassUtils.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ClassUtils.java Tue Apr 5 12:42:30 2011
@@ -22,16 +22,15 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import org.apache.commons.discovery.DiscoveryException;
-
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
*
*/
public class ClassUtils {
- private static Log log = DiscoveryLogFactory.newLog(ClassUtils.class);
+ private static Log log = LogFactory.getLog(ClassUtils.class);
public static void setLog(Log _log) {
log = _log;
}
Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ManagedProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ManagedProperties.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ManagedProperties.java (original)
+++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/ManagedProperties.java Tue Apr 5 12:42:30 2011
@@ -26,8 +26,8 @@ import java.util.Map;
import java.util.Properties;
import org.apache.commons.discovery.jdk.JDKHooks;
-import org.apache.commons.discovery.log.DiscoveryLogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
@@ -78,7 +78,7 @@ import org.apache.commons.logging.Log;
* </p>
*/
public class ManagedProperties {
- private static Log log = DiscoveryLogFactory.newLog(ManagedProperties.class);
+ private static Log log = LogFactory.getLog(ManagedProperties.class);
public static void setLog(Log _log) {
log = _log;
}
Modified: commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java?rev=1089005&r1=1089004&r2=1089005&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java (original)
+++ commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java Tue Apr 5 12:42:30 2011
@@ -45,13 +45,9 @@ import org.junit.Test;
* @version $Revision$
*/
public class TestAll {
- private static final int logLevel =
- org.apache.commons.discovery.log.SimpleLog.LOG_LEVEL_INFO;
@Test
public void findDefaultImpl_1() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
TestInterface1 ti = null;
try {
@@ -67,8 +63,6 @@ public class TestAll {
@Test
public void findDefaultImpl_2() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
TestInterface1 ti = null;
try {
@@ -84,8 +78,6 @@ public class TestAll {
@Test
public void cacheAssertions() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
TestInterface1 ti = null;
try {
@@ -110,8 +102,6 @@ public class TestAll {
@Test
public void releaseAssertions() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
TestInterface1 ti = null;
try {
@@ -136,8 +126,6 @@ public class TestAll {
@Test
public void findPropertyImpl_1() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
TestInterface1 ti = null;
try {
@@ -157,8 +145,6 @@ public class TestAll {
@Test
public void myFactoryManagedProperty() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
TestInterface1 ti = null;
try {
@@ -182,8 +168,6 @@ public class TestAll {
@Test
public void findPropFileDefault() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
TestInterface1 ti = null;
try {
@@ -201,8 +185,6 @@ public class TestAll {
@Test
public void findServiceFileDefault() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
TestInterface2 ti = null;
try {
@@ -220,8 +202,6 @@ public class TestAll {
@Test
public void lowLevelFind() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
ClassLoaders loaders = ClassLoaders.getAppLoaders(TestInterface2.class, getClass(), false);
String name = "org.apache.commons.discovery.test.TestImpl2_1";
@@ -245,8 +225,6 @@ public class TestAll {
@Test
public void findResources() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
ClassLoaders loaders = new ClassLoaders();
/**
@@ -289,8 +267,6 @@ public class TestAll {
@Test
public void findViaDiscoverClass() {
- org.apache.commons.discovery.log.SimpleLog.setLevel(logLevel);
-
ClassLoaders loaders = ClassLoaders.getAppLoaders(TestInterface2.class, getClass(), false);
DiscoverClass discover = new DiscoverClass(loaders);