You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2006/01/30 14:44:08 UTC
svn commit: r373512 - in
/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix:
framework/ framework/cache/ framework/searchpolicy/ framework/util/
moduleloader/
Author: rickhall
Date: Mon Jan 30 05:43:51 2006
New Revision: 373512
URL: http://svn.apache.org/viewcvs?rev=373512&view=rev
Log:
Renamed LogWrapper to Logger and updated all references.
Added:
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Logger.java
- copied, changed from r370894, incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/LogWrapper.java
Removed:
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/LogWrapper.java
Modified:
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleContextImpl.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleInfo.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Felix.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/FilterImpl.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/OSGiLibrarySource.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistry.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundle.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/BundleCache.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleCache.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/SearchPolicyImpl.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/DispatchQueue.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/FelixDispatchQueue.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/LibraryInfo.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/Util.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java
incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleContextImpl.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleContextImpl.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleContextImpl.java Mon Jan 30 05:43:51 2006
@@ -156,7 +156,7 @@
}
catch (InvalidSyntaxException ex)
{
- m_felix.getLogger().log(LogWrapper.LOG_ERROR, "BundleContextImpl: " + ex);
+ m_felix.getLogger().log(Logger.LOG_ERROR, "BundleContextImpl: " + ex);
}
return null;
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleInfo.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleInfo.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleInfo.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/BundleInfo.java Mon Jan 30 05:43:51 2006
@@ -24,7 +24,7 @@
class BundleInfo
{
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private BundleArchive m_archive = null;
private IModule[] m_modules = null;
private int m_state = 0;
@@ -39,7 +39,7 @@
private int m_lockCount = 0;
private Thread m_lockThread = null;
- protected BundleInfo(LogWrapper logger, BundleArchive archive, IModule module)
+ protected BundleInfo(Logger logger, BundleArchive archive, IModule module)
throws Exception
{
m_logger = logger;
@@ -133,7 +133,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error reading location from bundle archive.",
ex);
return null;
@@ -149,7 +149,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error reading start level from bundle archive.",
ex);
return defaultLevel;
@@ -165,7 +165,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error writing start level to bundle archive.",
ex);
}
@@ -182,7 +182,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error reading manifest from bundle archive.",
ex);
return null;
@@ -218,7 +218,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error reading persistent state from bundle archive.",
ex);
return Bundle.INSTALLED;
@@ -233,7 +233,7 @@
}
catch (Exception ex)
{
- m_logger.log(LogWrapper.LOG_ERROR,
+ m_logger.log(Logger.LOG_ERROR,
"Error writing persistent state to bundle archive.",
ex);
}
@@ -248,7 +248,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error writing persistent state to bundle archive.",
ex);
}
@@ -263,7 +263,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error writing persistent state to bundle archive.",
ex);
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Felix.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Felix.java Mon Jan 30 05:43:51 2006
@@ -33,7 +33,7 @@
public class Felix
{
// Logging related member variables.
- private LogWrapper m_logger = new LogWrapper();
+ private Logger m_logger = new Logger();
// Config properties.
private PropertyResolver m_config = new ConfigImpl();
// Configuration properties passed into constructor.
@@ -330,7 +330,7 @@
});
m_factory = new ModuleFactoryImpl(
- searchPolicy,
+ m_logger, searchPolicy,
new URLPolicyImpl(m_logger, new URLHandlersBundleStreamHandler(this)));
// Initialize dispatch queue.
@@ -379,7 +379,7 @@
{
m_factory = null;
DispatchQueue.shutdown();
- m_logger.log(LogWrapper.LOG_ERROR, "Unable to start system bundle.", ex);
+ m_logger.log(Logger.LOG_ERROR, "Unable to start system bundle.", ex);
throw new RuntimeException("Unable to start system bundle.");
}
@@ -394,7 +394,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to list saved bundles: " + ex, ex);
archives = null;
}
@@ -434,14 +434,14 @@
try
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to re-install " + archives[i].getLocation(),
ex);
}
catch (Exception ex2)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to re-install bundle " + archives[i].getId(),
ex);
}
@@ -518,7 +518,7 @@
catch (Exception ex)
{
fireFrameworkEvent(FrameworkEvent.ERROR, getBundle(0), ex);
- m_logger.log(LogWrapper.LOG_ERROR, "Error stopping system bundle.", ex);
+ m_logger.log(Logger.LOG_ERROR, "Error stopping system bundle.", ex);
}
// Loop through all bundles and update any updated bundles.
@@ -535,7 +535,7 @@
catch (Exception ex)
{
fireFrameworkEvent(FrameworkEvent.ERROR, bundle, ex);
- m_logger.log(LogWrapper.LOG_ERROR, "Unable to purge bundle "
+ m_logger.log(Logger.LOG_ERROR, "Unable to purge bundle "
+ bundle.getInfo().getLocation(), ex);
}
}
@@ -553,7 +553,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to remove "
+ m_uninstalledBundles[i].getInfo().getLocation(), ex);
}
@@ -679,7 +679,7 @@
{
fireFrameworkEvent(FrameworkEvent.ERROR, impl, th);
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error starting " + impl.getInfo().getLocation(), th);
}
}
@@ -695,7 +695,7 @@
{
fireFrameworkEvent(FrameworkEvent.ERROR, impl, th);
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error stopping " + impl.getInfo().getLocation(), th);
}
}
@@ -807,7 +807,7 @@
}
catch (BundleException ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "Unable to acquire lock to set start level.", ex);
+ m_logger.log(Logger.LOG_ERROR, "Unable to acquire lock to set start level.", ex);
return;
}
@@ -844,12 +844,12 @@
catch (Throwable th)
{
rethrow = th;
- m_logger.log(LogWrapper.LOG_ERROR, "Error starting/stopping bundle.", th);
+ m_logger.log(Logger.LOG_ERROR, "Error starting/stopping bundle.", th);
}
}
else
{
- m_logger.log(LogWrapper.LOG_WARNING, "Bundle start level must be greater than zero.");
+ m_logger.log(Logger.LOG_WARNING, "Bundle start level must be greater than zero.");
}
}
finally
@@ -1143,7 +1143,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_WARNING,
+ Logger.LOG_WARNING,
"Exception while evaluating the permission.",
ex);
return false;
@@ -1482,7 +1482,7 @@
}
catch (Exception ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "Unable to update the bundle.", ex);
+ m_logger.log(Logger.LOG_ERROR, "Unable to update the bundle.", ex);
rethrow = ex;
}
@@ -1517,7 +1517,7 @@
}
catch (IOException ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "Unable to close input stream.", ex);
+ m_logger.log(Logger.LOG_ERROR, "Unable to close input stream.", ex);
}
}
}
@@ -1609,7 +1609,7 @@
}
catch (Throwable th)
{
- m_logger.log(LogWrapper.LOG_ERROR, "Error stopping bundle.", th);
+ m_logger.log(Logger.LOG_ERROR, "Error stopping bundle.", th);
rethrow = th;
}
@@ -1720,7 +1720,7 @@
else
{
m_logger.log(
- LogWrapper.LOG_ERROR, "Unable to remove bundle from installed map!");
+ Logger.LOG_ERROR, "Unable to remove bundle from installed map!");
}
// Set state to uninstalled.
@@ -1841,7 +1841,7 @@
catch (IOException ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to close input stream.", ex);
}
}
@@ -1863,7 +1863,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Could not purge bundle.", ex);
}
}
@@ -1886,7 +1886,7 @@
catch (Exception ex1)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Could not remove from cache.", ex1);
}
}
@@ -1921,7 +1921,7 @@
catch (IOException ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to close input stream.", ex);
// Not much else we can do.
}
@@ -2362,7 +2362,7 @@
// We do not throw this exception since the bundle
// is not supposed to know about the service at all
// if it does not have permission.
- m_logger.log(LogWrapper.LOG_ERROR, ex.getMessage());
+ m_logger.log(Logger.LOG_ERROR, ex.getMessage());
}
}
@@ -2491,7 +2491,7 @@
}
catch (Exception ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, ex.getMessage());
+ m_logger.log(Logger.LOG_ERROR, ex.getMessage());
return null;
}
}
@@ -3267,7 +3267,7 @@
}
catch (NumberFormatException ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "Invalid property: " + keys[i]);
+ m_logger.log(Logger.LOG_ERROR, "Invalid property: " + keys[i]);
}
StringTokenizer st = new StringTokenizer(m_config.get(keys[i]), "\" ",true);
if (st.countTokens() > 0)
@@ -3286,7 +3286,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR, "Auto-properties install.", ex);
+ Logger.LOG_ERROR, "Auto-properties install.", ex);
}
}
}
@@ -3313,7 +3313,7 @@
}
catch (NumberFormatException ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "Invalid property: " + keys[i]);
+ m_logger.log(Logger.LOG_ERROR, "Invalid property: " + keys[i]);
}
StringTokenizer st = new StringTokenizer(m_config.get(keys[i]), "\" ",true);
if (st.countTokens() > 0)
@@ -3331,7 +3331,7 @@
}
catch (Exception ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "Auto-properties install.", ex);
+ m_logger.log(Logger.LOG_ERROR, "Auto-properties install.", ex);
}
}
}
@@ -3366,7 +3366,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR, "Auto-properties start.", ex);
+ Logger.LOG_ERROR, "Auto-properties start.", ex);
}
}
}
@@ -3470,7 +3470,7 @@
// Logging methods and inner classes.
//
- public LogWrapper getLogger()
+ public Logger getLogger()
{
return m_logger;
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/FilterImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/FilterImpl.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/FilterImpl.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/FilterImpl.java Mon Jan 30 05:43:51 2006
@@ -32,7 +32,7 @@
**/
public class FilterImpl implements Filter
{
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private String m_toString = null;
private Evaluator m_evaluator = null;
private SimpleMapper m_mapper = null;
@@ -47,7 +47,7 @@
* Construct a filter for a given filter expression string.
* @param expr the filter expression string for the filter.
**/
- public FilterImpl(LogWrapper logger, String expr) throws InvalidSyntaxException
+ public FilterImpl(Logger logger, String expr) throws InvalidSyntaxException
{
m_logger = logger;
if (expr == null)
@@ -132,11 +132,11 @@
}
catch (AttributeNotFoundException ex)
{
- m_logger.log(LogWrapper.LOG_DEBUG, "FilterImpl: " + ex);
+ m_logger.log(Logger.LOG_DEBUG, "FilterImpl: " + ex);
}
catch (EvaluationException ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "FilterImpl: " + toString(), ex);
+ m_logger.log(Logger.LOG_ERROR, "FilterImpl: " + toString(), ex);
}
return false;
}
@@ -158,11 +158,11 @@
}
catch (AttributeNotFoundException ex)
{
- m_logger.log(LogWrapper.LOG_DEBUG, "FilterImpl: " + ex);
+ m_logger.log(Logger.LOG_DEBUG, "FilterImpl: " + ex);
}
catch (EvaluationException ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "FilterImpl: " + toString(), ex);
+ m_logger.log(Logger.LOG_ERROR, "FilterImpl: " + toString(), ex);
}
return false;
}
@@ -176,11 +176,11 @@
}
catch (AttributeNotFoundException ex)
{
- m_logger.log(LogWrapper.LOG_DEBUG, "FilterImpl: " + ex);
+ m_logger.log(Logger.LOG_DEBUG, "FilterImpl: " + ex);
}
catch (EvaluationException ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "FilterImpl: " + toString(), ex); }
+ m_logger.log(Logger.LOG_ERROR, "FilterImpl: " + toString(), ex); }
return false;
}
Copied: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Logger.java (from r370894, incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/LogWrapper.java)
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Logger.java?p2=incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Logger.java&p1=incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/LogWrapper.java&r1=370894&r2=373512&rev=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/LogWrapper.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/Logger.java Mon Jan 30 05:43:51 2006
@@ -31,7 +31,7 @@
* </p>
**/
// TODO: Modify LogWrapper to get LogService service object and invoke with reflection.
-public class LogWrapper
+public class Logger
{
public static final int LOG_ERROR = 1;
public static final int LOG_WARNING = 2;
@@ -40,7 +40,7 @@
private Object m_logObj = null;
- public LogWrapper()
+ public Logger()
{
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/OSGiLibrarySource.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/OSGiLibrarySource.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/OSGiLibrarySource.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/OSGiLibrarySource.java Mon Jan 30 05:43:51 2006
@@ -23,7 +23,7 @@
public class OSGiLibrarySource implements LibrarySource
{
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private boolean m_opened = false;
private BundleCache m_cache = null;
private long m_bundleId = -1;
@@ -33,7 +33,7 @@
private LibraryInfo[] m_libraries = null;
public OSGiLibrarySource(
- LogWrapper logger, BundleCache cache, long bundleId, int revision,
+ Logger logger, BundleCache cache, long bundleId, int revision,
String os, String processor, LibraryInfo[] libraries)
{
m_logger = logger;
@@ -86,7 +86,7 @@
return m_cache.getArchive(m_bundleId)
.findLibrary(m_revision, library.getName());
} catch (Exception ex) {
- m_logger.log(LogWrapper.LOG_ERROR, "OSGiLibrarySource: Error finding library.", ex);
+ m_logger.log(Logger.LOG_ERROR, "OSGiLibrarySource: Error finding library.", ex);
}
}
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java Mon Jan 30 05:43:51 2006
@@ -174,7 +174,7 @@
catch (Exception ex)
{
m_registry.getLogger().log(
- LogWrapper.LOG_ERROR, "ServiceRegistrationImpl: Error getting service.", ex);
+ Logger.LOG_ERROR, "ServiceRegistrationImpl: Error getting service.", ex);
return null;
}
}
@@ -205,7 +205,7 @@
catch (Exception ex)
{
m_registry.getLogger().log(
- LogWrapper.LOG_ERROR, "ServiceRegistrationImpl: Error ungetting service.", ex);
+ Logger.LOG_ERROR, "ServiceRegistrationImpl: Error ungetting service.", ex);
}
}
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistry.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistry.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/ServiceRegistry.java Mon Jan 30 05:43:51 2006
@@ -23,7 +23,7 @@
public class ServiceRegistry
{
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private long m_currentServiceId = 1L;
// Maps bundle to an array of service registrations.
private Map m_serviceRegsMap = new HashMap();
@@ -32,7 +32,7 @@
private ServiceListener m_serviceListener = null;
- public ServiceRegistry(LogWrapper logger)
+ public ServiceRegistry(Logger logger)
{
m_logger = logger;
}
@@ -337,7 +337,7 @@
fireServiceChanged(new ServiceEvent(ServiceEvent.MODIFIED, reg.getReference()));
}
- public LogWrapper getLogger()
+ public Logger getLogger()
{
return m_logger;
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundle.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundle.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundle.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundle.java Mon Jan 30 05:43:51 2006
@@ -74,7 +74,7 @@
{
classPathPkgs = new IPackage[0];
getFelix().getLogger().log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error parsing system bundle export statement.", ex);
}
@@ -206,7 +206,7 @@
catch (Exception ex)
{
getFelix().getLogger().log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"SystemBundle: Error while shutting down.", ex);
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java Mon Jan 30 05:43:51 2006
@@ -24,9 +24,9 @@
public class SystemBundleContentLoader implements IContentLoader
{
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
- public SystemBundleContentLoader(LogWrapper logger)
+ public SystemBundleContentLoader(Logger logger)
{
m_logger = logger;
}
@@ -54,7 +54,7 @@
catch (ClassNotFoundException ex)
{
m_logger.log(
- LogWrapper.LOG_WARNING,
+ Logger.LOG_WARNING,
ex.getMessage(),
ex);
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/BundleCache.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/BundleCache.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/BundleCache.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/BundleCache.java Mon Jan 30 05:43:51 2006
@@ -18,7 +18,7 @@
import java.io.InputStream;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.apache.felix.framework.util.PropertyResolver;
/**
@@ -58,7 +58,7 @@
* @param logger the logger to use for reporting errors.
* @throws Exception if any error occurs.
**/
- public void initialize(PropertyResolver cfg, LogWrapper logger)
+ public void initialize(PropertyResolver cfg, Logger logger)
throws Exception;
/**
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java Mon Jan 30 05:43:51 2006
@@ -23,7 +23,7 @@
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.apache.felix.framework.searchpolicy.ContentLoaderImpl;
import org.apache.felix.framework.util.*;
import org.apache.felix.framework.util.Util;
@@ -56,7 +56,7 @@
private static final transient String INSTALLED_STATE = "installed";
private static final transient String UNINSTALLED_STATE = "uninstalled";
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private long m_id = -1;
private File m_dir = null;
private String m_location = null;
@@ -67,7 +67,7 @@
private long m_refreshCount = -1;
private int m_revisionCount = -1;
- public DefaultBundleArchive(LogWrapper logger, File dir, long id, String location, InputStream is)
+ public DefaultBundleArchive(Logger logger, File dir, long id, String location, InputStream is)
throws Exception
{
this(logger, dir, id);
@@ -83,14 +83,14 @@
if (!deleteDirectoryTree(dir))
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to delete the archive directory: " + id);
}
throw ex;
}
}
- public DefaultBundleArchive(LogWrapper logger, File dir, long id)
+ public DefaultBundleArchive(Logger logger, File dir, long id)
{
m_logger = logger;
m_dir = dir;
@@ -136,7 +136,7 @@
if (!m_dir.mkdir())
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"DefaultBundleArchive: Unable to create archive directory.");
throw new IOException("Unable to create archive directory.");
}
@@ -155,7 +155,7 @@
if (!revisionDir.mkdir())
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"DefaultBundleArchive: Unable to create revision directory.");
throw new IOException("Unable to create revision directory.");
}
@@ -357,7 +357,7 @@
catch (IOException ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"DefaultBundleArchive: Unable to record state: " + ex);
throw ex;
}
@@ -466,7 +466,7 @@
catch (IOException ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"DefaultBundleArchive: Unable to record start leel: " + ex);
throw ex;
}
@@ -569,7 +569,7 @@
catch (Exception ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"DefaultBundleArchive: Trying to deserialize - " + ex);
}
finally
@@ -626,7 +626,7 @@
catch (IOException ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"DefaultBundleArchive: Unable to serialize activator - " + ex);
throw ex;
}
@@ -992,7 +992,7 @@
catch (IOException ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"DefaultBundleArchive: Unable to write counter: " + ex);
throw ex;
}
@@ -1249,7 +1249,7 @@
{
// There is very little we can do here.
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to remove partial revision directory.", ex2);
}
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleCache.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleCache.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleCache.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/cache/DefaultBundleCache.java Mon Jan 30 05:43:51 2006
@@ -18,7 +18,7 @@
import java.io.*;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.apache.felix.framework.util.PropertyResolver;
/**
@@ -77,7 +77,7 @@
protected static transient final String BUNDLE_DIR_PREFIX = "bundle";
private PropertyResolver m_cfg = null;
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private File m_profileDir = null;
private BundleArchive[] m_archives = null;
@@ -85,7 +85,7 @@
{
}
- public void initialize(PropertyResolver cfg, LogWrapper logger) throws Exception
+ public void initialize(PropertyResolver cfg, Logger logger) throws Exception
{
// Save Properties reference.
m_cfg = cfg;
@@ -154,7 +154,7 @@
if (!m_profileDir.mkdirs())
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to create directory: " + m_profileDir);
throw new RuntimeException("Unable to create profile directory.");
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java Mon Jan 30 05:43:51 2006
@@ -5,7 +5,7 @@
import java.security.SecureClassLoader;
import java.security.cert.Certificate;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.apache.felix.moduleloader.*;
public class ContentClassLoader extends SecureClassLoader
@@ -168,7 +168,7 @@
catch (ResourceNotFoundException ex)
{
m_contentLoader.getLogger().log(
- LogWrapper.LOG_WARNING,
+ Logger.LOG_WARNING,
ex.getMessage(),
ex);
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java Mon Jan 30 05:43:51 2006
@@ -4,18 +4,18 @@
import java.io.InputStream;
import java.net.URL;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.apache.felix.moduleloader.*;
public class ContentLoaderImpl implements IContentLoader
{
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private IContent m_content = null;
private IContent[] m_classPath = null;
private IModuleCallback m_callback = null;
private ContentClassLoader m_classLoader = null;
- public ContentLoaderImpl(LogWrapper logger, IContent content, IContent[] classPath)
+ public ContentLoaderImpl(Logger logger, IContent content, IContent[] classPath)
{
m_logger = logger;
m_content = content;
@@ -28,7 +28,7 @@
}
}
- public LogWrapper getLogger()
+ public Logger getLogger()
{
return m_logger;
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/SearchPolicyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/SearchPolicyImpl.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/SearchPolicyImpl.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/SearchPolicyImpl.java Mon Jan 30 05:43:51 2006
@@ -3,7 +3,7 @@
import java.net.URL;
import java.util.*;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.apache.felix.framework.util.SecurityManagerEx;
import org.apache.felix.moduleloader.*;
import org.osgi.framework.Version;
@@ -21,7 +21,7 @@
// Boolean.
public static final String RESOLVED_ATTR = "resolved";
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private IModuleFactory m_factory = null;
private Map m_availPkgMap = new HashMap();
private Map m_inUsePkgMap = new HashMap();
@@ -39,7 +39,7 @@
// Re-usable security manager for accessing class context.
private static SecurityManagerEx m_sm = new SecurityManagerEx();
- public SearchPolicyImpl(LogWrapper logger)
+ public SearchPolicyImpl(Logger logger)
{
m_logger = logger;
}
@@ -484,13 +484,13 @@
getExportPackage(candidate, impMatch.getName()));
newWires[wires.length] = wire;
module.setAttribute(WIRING_ATTR, newWires);
-m_logger.log(LogWrapper.LOG_DEBUG, "WIRE: [" + module + "] " + newWires[wires.length]);
+m_logger.log(Logger.LOG_DEBUG, "WIRE: [" + module + "] " + newWires[wires.length]);
}
}
}
catch (Exception ex)
{
- m_logger.log(LogWrapper.LOG_ERROR, "Unable to dynamically import package.", ex);
+ m_logger.log(Logger.LOG_ERROR, "Unable to dynamically import package.", ex);
}
return wire;
@@ -769,7 +769,7 @@
while (!isClassSpaceConsistent(resolverMap, rootModule, cycleMap))
{
m_logger.log(
- LogWrapper.LOG_DEBUG,
+ Logger.LOG_DEBUG,
"Constraint violation detected, will try to repair.");
// The incrementCandidateConfiguration() method requires a
@@ -1056,7 +1056,7 @@
(wires != null) && (wireIdx < wires.length);
wireIdx++)
{
-m_logger.log(LogWrapper.LOG_DEBUG, "WIRE: [" + module + "] " + wires[wireIdx]);
+m_logger.log(Logger.LOG_DEBUG, "WIRE: [" + module + "] " + wires[wireIdx]);
// First remove the wire module from "available" package map.
IModule[] modules = (IModule[]) m_availPkgMap.get(wires[wireIdx].getExport().getName());
modules = removeModuleFromArray(modules, wires[wireIdx].getExportingModule());
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java Mon Jan 30 05:43:51 2006
@@ -2,7 +2,7 @@
import java.net.*;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.framework.util.SecureAction;
import org.apache.felix.moduleloader.IModule;
@@ -10,11 +10,11 @@
public class URLPolicyImpl implements IURLPolicy
{
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private URLStreamHandler m_streamHandler = null;
private SecureAction m_secureAction = new SecureAction();
- public URLPolicyImpl(LogWrapper logger, URLStreamHandler streamHandler)
+ public URLPolicyImpl(Logger logger, URLStreamHandler streamHandler)
{
m_logger = logger;
m_streamHandler = streamHandler;
@@ -39,7 +39,7 @@
catch (MalformedURLException ex)
{
m_logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Unable to create resource URL.",
ex);
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/DispatchQueue.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/DispatchQueue.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/DispatchQueue.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/DispatchQueue.java Mon Jan 30 05:43:51 2006
@@ -18,7 +18,7 @@
import java.util.*;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
/**
* This class implements an event dispatching queue to simplify delivering
@@ -66,13 +66,13 @@
// Cached dispatch requests to avoid memory allocation.
private static final ArrayList m_requestCache = new ArrayList();
// The logger for dispatch queue.
- private static LogWrapper m_logger = null;
+ private static Logger m_logger = null;
/**
* Constructs a dispatch queue and starts a dispather thread if
* necessary.
**/
- public DispatchQueue(LogWrapper logger)
+ public DispatchQueue(Logger logger)
{
synchronized (m_threadLock)
{
@@ -127,7 +127,7 @@
}
}
- public static LogWrapper getLogger()
+ public static Logger getLogger()
{
return m_logger;
}
@@ -360,7 +360,7 @@
try {
m_requestList.wait();
} catch (InterruptedException ex) {
- m_logger.log(LogWrapper.LOG_ERROR, "DispatchQueue: Thread interrupted.", ex);
+ m_logger.log(Logger.LOG_ERROR, "DispatchQueue: Thread interrupted.", ex);
}
}
@@ -396,7 +396,7 @@
dr.m_dispatcher.dispatch(
(EventListener) dr.m_listeners[i + 1], dr.m_eventObj);
} catch (Throwable th) {
- m_logger.log(LogWrapper.LOG_ERROR, "DispatchQueue: Error during dispatch.", th);
+ m_logger.log(Logger.LOG_ERROR, "DispatchQueue: Error during dispatch.", th);
}
}
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/FelixDispatchQueue.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/FelixDispatchQueue.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/FelixDispatchQueue.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/FelixDispatchQueue.java Mon Jan 30 05:43:51 2006
@@ -19,7 +19,7 @@
import java.util.EventListener;
import java.util.EventObject;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.osgi.framework.*;
/**
@@ -36,7 +36,7 @@
**/
public class FelixDispatchQueue extends DispatchQueue
{
- public FelixDispatchQueue(LogWrapper logger)
+ public FelixDispatchQueue(Logger logger)
{
super(logger);
}
@@ -77,7 +77,7 @@
(EventListener) lw, eventObj);
} catch (Throwable th) {
getLogger().log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"FelixDispatchQueue: Error during dispatch.", th);
}
}
@@ -100,7 +100,7 @@
(EventListener) lw, eventObj);
} catch (Throwable th) {
getLogger().log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"FelixDispatchQueue: Error during dispatch.", th);
}
}
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/LibraryInfo.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/LibraryInfo.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/LibraryInfo.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/LibraryInfo.java Mon Jan 30 05:43:51 2006
@@ -18,7 +18,7 @@
import java.util.*;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
import org.osgi.framework.Constants;
public class LibraryInfo
@@ -68,7 +68,7 @@
return m_processors;
}
- public static LibraryInfo[] parse(LogWrapper logger, String s)
+ public static LibraryInfo[] parse(Logger logger, String s)
{
try
{
@@ -169,7 +169,7 @@
catch (RuntimeException ex)
{
logger.log(
- LogWrapper.LOG_ERROR,
+ Logger.LOG_ERROR,
"Error parsing native library header.",
ex);
throw ex;
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/Util.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/Util.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/Util.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/util/Util.java Mon Jan 30 05:43:51 2006
@@ -20,7 +20,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
public class Util
{
@@ -99,7 +99,7 @@
* @return an array of <tt>LibraryInfo</tt> objects for the
* passed in strings.
**/
- public static LibraryInfo[] parseLibraryStrings(LogWrapper logger, String[] libStrs)
+ public static LibraryInfo[] parseLibraryStrings(Logger logger, String[] libStrs)
throws IllegalArgumentException
{
if (libStrs == null)
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java Mon Jan 30 05:43:51 2006
@@ -3,13 +3,13 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
public class ModuleFactoryImpl implements IModuleFactory
{
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private ISearchPolicy m_searchPolicy = null;
private IURLPolicy m_urlPolicy = null;
private Map m_moduleMap = new HashMap();
@@ -17,7 +17,7 @@
private ModuleListener[] m_listeners = null;
private static final ModuleListener[] m_noListeners = new ModuleListener[0];
- public ModuleFactoryImpl(LogWrapper logger, ISearchPolicy searchPolicy, IURLPolicy urlPolicy)
+ public ModuleFactoryImpl(Logger logger, ISearchPolicy searchPolicy, IURLPolicy urlPolicy)
{
m_logger = logger;
m_listeners = m_noListeners;
Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java?rev=373512&r1=373511&r2=373512&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java (original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java Mon Jan 30 05:43:51 2006
@@ -3,7 +3,7 @@
import java.net.URL;
import java.util.*;
-import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.Logger;
public class ModuleImpl implements IModule
{
@@ -18,7 +18,7 @@
**/
public static final int VALUE_IDX = 1;
- private LogWrapper m_logger = null;
+ private Logger m_logger = null;
private String m_id = null;
private ISearchPolicy m_searchPolicy = null;
private IURLPolicy m_urlPolicy = null;
@@ -26,7 +26,7 @@
private Map m_attrMap = new HashMap();
ModuleImpl(
- LogWrapper logger,
+ Logger logger,
String id, ISearchPolicy searchPolicy, IURLPolicy urlPolicy,
IContentLoader contentLoader, Object[][] attrs)
{
@@ -92,7 +92,7 @@
catch (ClassNotFoundException ex)
{
m_logger.log(
- LogWrapper.LOG_WARNING,
+ Logger.LOG_WARNING,
ex.getMessage(),
ex);
}
@@ -108,7 +108,7 @@
catch (ResourceNotFoundException ex)
{
m_logger.log(
- LogWrapper.LOG_WARNING,
+ Logger.LOG_WARNING,
ex.getMessage(),
ex);
}