[jboss-cvs] JBossAS SVN: r99939 - in projects/kernel/trunk: aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 26 10:14:42 EST 2010
Author: alesj
Date: 2010-01-26 10:14:40 -0500 (Tue, 26 Jan 2010)
New Revision: 99939
Modified:
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ArrayBinding.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/Aspect.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectBinding.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/DelegatingBeanAspectFactory.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/tracker/AbstractContextRegistry.java
projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerCreateDestroyLifecycleCallback.java
projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java
projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java
projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerStartStopLifecycleCallback.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceConfigurator.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceController.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceDeploymentParser.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/CreateDestroyLifecycleAction.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/StartStopLifecycleAction.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/KernelFactory.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AnnotationsAction.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AutowireAction.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClearableDependencyItem.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/DescribeAction.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/InstantiateAction.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ScopedKernelController.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/event/AbstractEventEmitter.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/LRUPolicyCachingBasicKernelMetaDataRepository.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/TimedPolicyCachingBasicKernelMetaDataRepository.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java
Log:
[JBKERNEL-83]; check debug usage --> debugf.
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXLifecycleCallback.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -60,7 +60,7 @@
}
Object mbean = (registerDirectly ? context.getTarget() : new StandardMBean(context.getTarget(), intfClass));
server.registerMBean(mbean, objectName);
- log.debug("Registered MBean " + objectName);
+ log.debugf("Registered MBean %1s", objectName);
}
public void uninstall(ControllerContext context) throws Exception
@@ -69,7 +69,7 @@
JMX jmx = readJmxAnnotation(context);
ObjectName objectName = createObjectName(context, jmx);
- log.debug("Unregistering MBean " + objectName);
+ log.debugf("Unregistering MBean %1s", objectName);
server.unregisterMBean(objectName);
}
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ArrayBinding.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -116,7 +116,7 @@
InterceptorFactory[] facs = interceptors != null ? interceptors.toArray(new InterceptorFactory[interceptors.size()]) : new InterceptorFactory[0];
org.jboss.aop.array.ArrayBinding binding = new org.jboss.aop.array.ArrayBinding(name, facs, theType);
manager.addArrayBinding(binding);
- log.debug("Bound array binding " + name);
+ log.debugf("Bound array binding %1s", name);
}
public void stop() throws Exception
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/Aspect.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/Aspect.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/Aspect.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -276,7 +276,7 @@
binding.rebind();
}
- log.debug("Bound aspect " + name + "; deployed:" + definition.isDeployed());
+ log.debugf("Bound aspect %1s; deployed:%2s", name, definition.isDeployed());
}
protected ManagedAspectDefinition getAspectDefinitionNoDependencies()
@@ -306,7 +306,7 @@
public void stop()
{
- log.debug("Unbinding aspect " + name);
+ log.debugf("Unbinding aspect %1s", name);
manager.removeAspectDefinition(name);
if (definition != null)
{
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectBinding.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectBinding.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectBinding.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -144,7 +144,7 @@
}
}
manager.addBinding(binding);
- log.debug("Bound binding " + name);
+ log.debugf("Bound binding %1s", name);
}
public void stop() throws Exception
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/DelegatingBeanAspectFactory.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/DelegatingBeanAspectFactory.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/DelegatingBeanAspectFactory.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -120,7 +120,7 @@
{
if (aspectFactory == null)
{
- log.debug("Creating advice " + name);
+ log.debugf("Creating advice %1s", name);
PushedClassLoaderMetaData pcmd = null;
if (((GenericBeanFactory)factory).getClassLoader() == null)
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -127,7 +127,7 @@
try
{
final ClassLoader loader = getCreatingClassLoader(advisor);
- log.debug("Creating advice " + name + " with loader " + loader);
+ log.debugf("Creating advice %1s with loader %2s", name, loader);
if (factory instanceof ClassLoaderAwareGenericBeanFactory)
{
((ClassLoaderAwareGenericBeanFactory)factory).pushLoader(loader);
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -2045,7 +2045,7 @@
}
catch (Throwable ignored)
{
- log.debug("Error unregistering alias: " + alias, ignored);
+ log.debugf(ignored, "Error unregistering alias: %1s", alias);
}
}
@@ -2056,7 +2056,7 @@
}
catch (Throwable ignored)
{
- log.debug("Error unregistering context with name: " + name, ignored);
+ log.debugf(ignored, "Error unregistering context with name: %1s", name);
}
}
}
@@ -2094,7 +2094,7 @@
}
catch (Throwable ignored)
{
- log.debug("Error unregistering alias: " + alias, ignored);
+ log.debugf(ignored, "Error unregistering alias: %1s", alias);
}
}
}
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/tracker/AbstractContextRegistry.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/tracker/AbstractContextRegistry.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/tracker/AbstractContextRegistry.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -300,7 +300,7 @@
}
else if (classContext.used)
{
- log.debug("Additional matching bean - contextual injection already used for class: " + clazz);
+ log.debugf("Additional matching bean - contextual injection already used for class: %1s", clazz);
}
if (trace)
{
Modified: projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerCreateDestroyLifecycleCallback.java
===================================================================
--- projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerCreateDestroyLifecycleCallback.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerCreateDestroyLifecycleCallback.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -82,7 +82,7 @@
}
catch(Exception e)
{
- log.debug("Error destroying mbean", e);
+ log.debugf(e, "Error destroying mbean");
}
}
}
\ No newline at end of file
Modified: projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java
===================================================================
--- projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -111,7 +111,7 @@
}
catch (Throwable t)
{
- log.debug("Unable to get classloader from " + context + " " + t);
+ log.debugf("Unable to get classloader from %1s" + context + " %2s", context, t);
}
if (cl == null)
cl = Thread.currentThread().getContextClassLoader();
@@ -151,11 +151,11 @@
}
catch (Exception t)
{
- log.debug("Error unregistering mbean", t);
+ log.debugf(t, "Error unregistering mbean");
}
throw e;
}
- log.debug("Registered MBean " + objectName);
+ log.debugf("Registered MBean %1s", objectName);
}
public void uninstall(ControllerContext context) throws Exception
@@ -165,7 +165,7 @@
try
{
- log.debug("Unregistering MBean " + objectName);
+ log.debugf("Unregistering MBean %1s", objectName);
serviceController.destroy(objectName);
}
finally
@@ -176,10 +176,10 @@
}
catch(Exception e)
{
- log.debug("Error unregistering mbean", e);
+ log.debugf(e, "Error unregistering mbean");
}
}
- log.debug("Unregistered MBean " + objectName);
+ log.debugf("Unregistered MBean %1s", objectName);
}
private JMX readJmxAnnotation(ControllerContext context) throws Exception
Modified: projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java
===================================================================
--- projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -92,7 +92,7 @@
}
catch (Throwable t)
{
- log.debug("Unable to get classloader from " + context + " " + t);
+ log.debugf("Unable to get classloader from %1s %2s", context, t);
}
if (cl == null)
cl = Thread.currentThread().getContextClassLoader();
@@ -132,11 +132,11 @@
}
catch (Exception t)
{
- log.debug("Error unregistering mbean", t);
+ log.debugf(t, "Error unregistering mbean");
}
throw e;
}
- log.debug("Registered MBean " + objectName);
+ log.debugf("Registered MBean %1s", objectName);
}
/**
@@ -154,9 +154,9 @@
}
catch(Exception e)
{
- log.debug("Error unregistering mbean", e);
+ log.debugf(e, "Error unregistering mbean");
}
- log.debug("Unregistered MBean " + objectName);
+ log.debugf("Unregistered MBean %1s", objectName);
}
@SuppressWarnings("unchecked")
Modified: projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerStartStopLifecycleCallback.java
===================================================================
--- projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerStartStopLifecycleCallback.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-aop-mc-int/src/main/java/org/jboss/system/microcontainer/jmx/ServiceControllerStartStopLifecycleCallback.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -81,7 +81,7 @@
}
catch(Exception e)
{
- log.debug("Error stopping mbean", e);
+ log.debugf(e, "Error stopping mbean");
}
}
}
\ No newline at end of file
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -302,7 +302,7 @@
}
catch (Throwable e)
{
- log.debug("Unexpected error during destroy", e);
+ log.debugf(e, "Unexpected error during destroy");
}
// cleanup
@@ -317,16 +317,16 @@
*/
public void handleNotification2(Notification n, Object handback)
{
- log.debug("Got notification: " + n);
+ log.debugf("Got notification: %1s", n);
if (startHandback != null && startHandback.equals(handback))
{
- log.debug("Saw '" + handback + "' handback, starting barrier");
+ log.debugf("Saw '%1s' handback, starting barrier", handback);
startBarrier();
}
else if (stopHandback != null && stopHandback.equals(handback))
{
- log.debug("Saw '" + handback + "' handback, stopping barrier");
+ log.debugf("Saw '%1s' handback, stopping barrier", handback);
stopBarrier();
}
}
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -164,7 +164,7 @@
throw new IllegalStateException("Interceptor already attached");
}
- log.debug("Attaching interceptor: " + interceptor.getName());
+ log.debugf("Attaching interceptor: %1s", interceptor.getName());
// remember the interceptor
this.interceptor = interceptor;
@@ -185,7 +185,7 @@
params,
signature);
- log.debug("Interceptor attached to: '" + target + "'");
+ log.debugf("Interceptor attached to: '%1s'", target);
}
}
}
@@ -197,7 +197,7 @@
{
if (interceptor != null)
{
- log.debug("Detaching interceptor: " + interceptor.getName());
+ log.debugf("Detaching interceptor: %1s", interceptor.getName());
if (interceptables != null)
{
Object[] params = new Object[] { interceptor };
@@ -213,12 +213,11 @@
params,
signature);
- log.debug("Interceptor detached from: '" + target + "'");
+ log.debugf("Interceptor detached from: '%1s'", target);
}
catch (Exception e)
{
- log.debug("Caught exception while removing interceptor from '" +
- target + "'", e);
+ log.debugf(e, "Caught exception while removing interceptor from '%1s'", target);
}
}
}
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -239,7 +239,7 @@
if (this.xmllist != null && this.sublist == null)
{
// Parse the XML spec
- log.debug("Parsing subscription specification");
+ log.debugf("Parsing subscription specification");
List subscriptionList = parseXMLSubscriptionSpec(this.xmllist);
subscribe(subscriptionList, dynamicSubscriptions, listener);
@@ -249,7 +249,7 @@
subscribe(sublist, dynamicSubscriptions, listener);
}
else
- log.debug("Subscription specification not provided");
+ log.debugf("Subscription specification not provided");
}
/**
@@ -276,12 +276,12 @@
this.dynamicSubscriptions = dynamicSubscriptions;
this.listener = listener;
- log.debug(this.sublist);
-
- log.debug("Subscribing for JMX notifications" +
- ", dynamic=" + dynamicSubscriptions +
- (this.getServiceName().equals(listener) ? "" :
- ", listener='" + listener + "'"));
+ log.debugf("%1s", this.sublist);
+
+ log.debugf(
+ "Subscribing for JMX notifications, dynamic=%1s %2s",
+ dynamicSubscriptions, (this.getServiceName().equals(listener) ? "" : ", listener='" + listener + "'")
+ );
bulkRegister();
@@ -295,13 +295,13 @@
this.myHandback
);
- log.debug("Subscribed to MBeanServerDelegate, too");
+ log.debugf("Subscribed to MBeanServerDelegate, too");
}
subscribed = true;
}
else
- log.debug("Subscription list not provided");
+ log.debugf("Subscription list not provided");
}
/**
@@ -313,7 +313,7 @@
if (!subscribed)
return;
- log.debug("Removing all JMX notification subscriptions");
+ log.debugf("Removing all JMX notification subscriptions");
bulkUnregister();
if (this.dynamicSubscriptions == true)
@@ -327,7 +327,7 @@
this.myHandback
);
- log.debug("Unsubscribed from MBeanServerDelegate, too");
+ log.debugf("Unsubscribed from MBeanServerDelegate, too");
}
catch (MalformedObjectNameException e)
{
@@ -392,7 +392,7 @@
{
if(objectName.apply(target))
{
- log.debug("ObjectName: '" + target + "' matched '" + objectName + "'");
+ log.debugf("ObjectName: '%1s' matched '%2s'", target, objectName);
// go for it!
singleRegister(
@@ -464,8 +464,7 @@
catch (InstanceNotFoundException e)
{
// ignore - mbean might not be registered
- log.debug("Could not subscribe to: '" + target
- + "', target or listener MBean not registered");
+ log.debugf("Could not subscribe to: '%1s', target or listener MBean not registered", target);
}
catch (RuntimeException e)
{
@@ -487,24 +486,23 @@
// remove the matching subscription
server.removeNotificationListener(target, listener, filter, handback);
- log.debug("Unsubscribed from: '" + target + "'");
+ log.debugf("Unsubscribed from: '%1s'", target);
}
catch (InstanceNotFoundException e)
{
// ignore - target mbean not present
- log.debug("Could not unsubscribe from non-existent: '"
- + target + "'");
+ log.debugf("Could not unsubscribe from non-existent: '%1s'", target);
}
catch (ListenerNotFoundException e)
{
// May happen if target is not a notification broadcaster
// and so we hadn't registered in the first place
- log.debug("Could not unsubscribe from: '" + target + "'");
+ log.debugf("Could not unsubscribe from: '%1s'", target);
}
catch (RuntimeException e)
{
// whatever
- log.debug("Could not unsubscribe from: '" + target + "'");
+ log.debugf("Could not unsubscribe from: '%1s'", target);
}
}
@@ -531,7 +529,7 @@
{
Set mset = server.queryNames(objectName, null);
- log.debug("ObjectName: '" + objectName + "' matched " + mset.size() + " MBean(s)");
+ log.debugf("ObjectName: '%1s' matched %2d MBean(s)", objectName, mset.size());
Iterator j = mset.iterator();
while (j.hasNext())
@@ -566,7 +564,7 @@
{
Set mset = server.queryNames(objectName, null);
- log.debug("ObjectName: '" + objectName + "' matched " + mset.size() + " MBean(s)");
+ log.debugf("ObjectName: '%1s' matched %2d MBean(s)", objectName, mset.size());
Iterator j = mset.iterator();
while (j.hasNext())
@@ -587,14 +585,13 @@
{
StringBuffer sbuf = new StringBuffer(100);
- sbuf.append("Subscribed to: { objectName='").append(objectName);
- sbuf.append("', listener='").append(listener);
- sbuf.append("', handback=").append(handback);
- sbuf.append(", filter=");
- sbuf.append(filter == null ? null : filter.toString());
+ sbuf.append("Subscribed to: { objectName='%1s");
+ sbuf.append("', listener='%2s");
+ sbuf.append("', handback=%3s");
+ sbuf.append(", filter=%4s");
sbuf.append(" }");
- log.debug(sbuf.toString());
+ log.debugf(sbuf.toString(), objectName, listener, handback, filter);
}
/**
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceConfigurator.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceConfigurator.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceConfigurator.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -178,7 +178,7 @@
Object outputValue = value;
if (attributeName.toLowerCase().indexOf("password") != -1)
outputValue = "****";
- log.debug(attributeName + " set to " + outputValue + " in " + objectName);
+ log.debugf("%1s set to %2s in %3s", attributeName, outputValue, objectName);
}
server.setAttribute(objectName, new Attribute(attributeName, value));
}
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceController.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceController.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceController.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -342,7 +342,7 @@
return;
}
- log.debug("Registering service " + serviceName);
+ log.debugf("Registering service %1s", serviceName);
// This is an already registered mbean
KernelController controller = kernel.getController();
@@ -378,7 +378,7 @@
return;
}
- log.debug("Creating service " + serviceName);
+ log.debugf("Creating service %1s", serviceName);
// Register if not already done so
ServiceControllerContext context = installed.get(serviceName);
@@ -394,7 +394,7 @@
|| ctx.state == ServiceContext.RUNNING
|| ctx.state == ServiceContext.FAILED)
{
- log.debug("Ignoring create request for service: " + ctx.objectName + " at state " + ctx.getStateString());
+ log.debugf("Ignoring create request for service %1s at state %2s", ctx.objectName, ctx.getStateString());
return;
}
@@ -418,7 +418,7 @@
return;
}
- log.debug("starting service " + serviceName);
+ log.debugf("starting service %1s", serviceName);
// Register if not already done so
ServiceControllerContext context = installed.get(serviceName);
@@ -432,7 +432,7 @@
// If we are already started (can happen in dependencies) just return
if (ctx.state == ServiceContext.RUNNING || ctx.state == ServiceContext.FAILED)
{
- log.debug("Ignoring start request for service: " + ctx.objectName + " at state " + ctx.getStateString());
+ log.debugf("Ignoring start request for service: %1s at state %2s", ctx.objectName, ctx.getStateString());
return;
}
@@ -456,7 +456,7 @@
return;
}
- log.debug("restarting service " + serviceName);
+ log.debugf("restarting service %1s", serviceName);
stop(serviceName);
start(serviceName);
}
@@ -469,7 +469,7 @@
return;
}
- log.debug("stopping service: " + serviceName);
+ log.debugf("stopping service: %1s", serviceName);
ServiceControllerContext context = installed.get(serviceName);
if (context == null)
@@ -482,7 +482,7 @@
ServiceContext ctx = context.getServiceContext();
if (ctx.state != ServiceContext.RUNNING)
{
- log.debug("Ignoring stop request for service: " + ctx.objectName + " at state " + ctx.getStateString());
+ log.debugf("Ignoring stop request for service: %1s at state %2s", ctx.objectName, ctx.getStateString());
return;
}
@@ -506,7 +506,7 @@
return;
}
- log.debug("destroying service: " + serviceName);
+ log.debugf("destroying service: %1s", serviceName);
ServiceControllerContext context = installed.get(serviceName);
if (context == null)
@@ -519,7 +519,7 @@
ServiceContext ctx = context.getServiceContext();
if (ctx.state == ServiceContext.DESTROYED || ctx.state == ServiceContext.NOTYETINSTALLED || ctx.state == ServiceContext.FAILED)
{
- log.debug("Ignoring destroy request for service: " + ctx.objectName + " at state " + ctx.getStateString());
+ log.debugf("Ignoring destroy request for service: %1s at state %2s", ctx.objectName, ctx.getStateString());
return;
}
@@ -555,7 +555,7 @@
return;
}
installedOrder.remove(context);
- log.debug("removing service: " + objectName);
+ log.debugf("removing service: %1s", objectName);
// Uninstall the context
safelyRemoveAnyRegisteredContext(context);
@@ -571,7 +571,7 @@
public void shutdown()
{
- log.debug("Stopping " + installedOrder.size() + " services");
+ log.debugf("Stopping %1d services", installedOrder.size());
KernelController controller = kernel.getController();
@@ -585,7 +585,7 @@
controller.uninstall(context.getName());
++serviceCounter;
}
- log.debug("Stopped " + serviceCounter + " services");
+ log.debugf("Stopped %1d services", serviceCounter);
// Shutdown ourselves
controller.uninstall(ServiceControllerMBean.OBJECT_NAME.getCanonicalName());
@@ -604,7 +604,7 @@
kernel = bootstrap.getKernel();
}
- log.debug("Controller MBean online");
+ log.debugf("Controller MBean online");
return name == null ? OBJECT_NAME : name;
}
@@ -671,7 +671,7 @@
controller.change(context, requiredState);
ControllerState state = context.getState();
if (logWait != null && requiredState.equals(state) == false && state != ControllerState.ERROR)
- log.debug("Waiting in " + logWait + " of " + context.getObjectName() + " on " + getUnresolvedDependencies(context, requiredState));
+ log.debugf("Waiting in %1s of %2s on %3s", logWait, context.getObjectName(), getUnresolvedDependencies(context, requiredState));
}
}
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -140,7 +140,7 @@
result = installExternalXMBean(server, objectName, metaData);
}
- log.debug("Created mbean: " + objectName);
+ log.debugf("Created mbean: %1s", objectName);
return result;
}
catch (Throwable e)
@@ -178,13 +178,13 @@
String interfaceName = metaData.getInterfaceName();
Class<?> intf = loader.loadClass(interfaceName);
- log.debug("About to create bean resource: " + objectName + " with code: " + code + " and interface " + interfaceName);
+ log.debugf("About to create bean resource:%1s with code: %2s and interface %3s", objectName, code, interfaceName);
Object resource = server.instantiate(code,
loaderName,
constructor.getParameters(loader),
constructor.getSignature());
- log.debug("About to register StandardMBean : " + objectName);
+ log.debugf("About to register StandardMBean : %1s", objectName);
ObjectInstance instance = server.createMBean(StandardMBean.class.getName(),
objectName,
loaderName,
@@ -210,7 +210,7 @@
ServiceConstructorMetaData constructor = metaData.getConstructor();
// This is a standard or dynamic mbean
- log.debug("About to create bean: " + objectName + " with code: " + code);
+ log.debugf("About to create bean: %1s with code: %2s", objectName, code);
Object resource = null;
try
{
@@ -251,7 +251,7 @@
ServiceConstructorMetaData constructor = metaData.getConstructor();
// This is an xmbean with an embedded mbean descriptor
- log.debug("About to create xmbean object: " + objectName + " with code: " + code + " with embedded descriptor");
+ log.debugf("About to create xmbean object: %1s with code: %2s with embedded descriptor", objectName, code);
//xmbean: construct object first.
Object resource = server.instantiate(code,
loaderName,
@@ -288,7 +288,7 @@
String xmbeanDD = metaData.getXMBeanDD();
// This is an xmbean with an external descriptor
- log.debug("About to create xmbean object: " + objectName + " with code: " + code + " with descriptor: " + xmbeanDD);
+ log.debugf("About to create xmbean object: %1s with code: %2s with descriptor: %3s", objectName, code, xmbeanDD);
//xmbean: construct object first.
Object resource = server.instantiate(code,
loaderName,
@@ -334,12 +334,12 @@
throw new IllegalArgumentException("Null ObjectName");
try
{
- log.debug("Removing mbean from server: " + objectName);
+ log.debugf("Removing mbean from server: %1s", objectName);
server.unregisterMBean(objectName);
}
catch (Throwable t)
{
- log.debug("Error unregistering mbean " + objectName, t);
+ log.debugf(t, "Error unregistering mbean %1s", objectName);
}
}
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -184,7 +184,7 @@
}
catch (Throwable t)
{
- log.debug("Error setting attribute " + attribute.getName(), t);
+ log.debugf(t, "Error setting attribute %1s", attribute.getName());
}
}
return list;
@@ -204,7 +204,7 @@
}
catch (Throwable t)
{
- log.debug("Error getting attribute " + attributes[i], t);
+ log.debugf(t, "Error getting attribute %1s", attributes[i]);
}
}
return list;
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -312,11 +312,11 @@
if (state == CREATED || state == STARTING || state == STARTED
|| state == STOPPING || state == STOPPED)
{
- log.debug("Ignoring create call; current state is " + getStateString());
+ log.debugf("Ignoring create call; current state is %1s", getStateString());
return;
}
- log.debug("Creating " + jbossInternalDescription());
+ log.debugf("Creating %1s", jbossInternalDescription());
try
{
@@ -325,30 +325,30 @@
}
catch (Exception e)
{
- log.debug("Initialization failed " + jbossInternalDescription(), e);
+ log.debugf(e, "Initialization failed %1s", jbossInternalDescription());
throw e;
}
- log.debug("Created " + jbossInternalDescription());
+ log.debugf("Created %1s", jbossInternalDescription());
}
protected void jbossInternalStart() throws Exception
{
if (state == STARTING || state == STARTED || state == STOPPING)
{
- log.debug("Ignoring start call; current state is " + getStateString());
+ log.debugf("Ignoring start call; current state is %1s", getStateString());
return;
}
if (state != CREATED && state != STOPPED && state != FAILED)
{
- log.debug("Start requested before create, calling create now");
+ log.debugf("Start requested before create, calling create now");
create();
}
state = STARTING;
sendStateChangeNotification(STOPPED, STARTING, getName() + " starting", null);
- log.debug("Starting " + jbossInternalDescription());
+ log.debugf("Starting %1s", jbossInternalDescription());
try
{
@@ -358,26 +358,26 @@
{
state = FAILED;
sendStateChangeNotification(STARTING, FAILED, getName() + " failed", e);
- log.debug("Starting failed " + jbossInternalDescription(), e);
+ log.debugf(e, "Starting failed %1s", jbossInternalDescription());
throw e;
}
state = STARTED;
sendStateChangeNotification(STARTING, STARTED, getName() + " started", null);
- log.debug("Started " + jbossInternalDescription());
+ log.debugf("Started %1s", jbossInternalDescription());
}
protected void jbossInternalStop()
{
if (state != STARTED)
{
- log.debug("Ignoring stop call; current state is " + getStateString());
+ log.debugf("Ignoring stop call; current state is %1s", getStateString());
return;
}
state = STOPPING;
sendStateChangeNotification(STARTED, STOPPING, getName() + " stopping", null);
- log.debug("Stopping " + jbossInternalDescription());
+ log.debugf("Stopping %1s", jbossInternalDescription());
try
{
@@ -393,24 +393,24 @@
state = STOPPED;
sendStateChangeNotification(STOPPING, STOPPED, getName() + " stopped", null);
- log.debug("Stopped " + jbossInternalDescription());
+ log.debugf("Stopped %1s", jbossInternalDescription());
}
protected void jbossInternalDestroy()
{
if (state == DESTROYED)
{
- log.debug("Ignoring destroy call; current state is " + getStateString());
+ log.debugf("Ignoring destroy call; current state is %1s", getStateString());
return;
}
if (state == STARTED)
{
- log.debug("Destroy requested before stop, calling stop now");
+ log.debugf("Destroy requested before stop, calling stop now");
stop();
}
- log.debug("Destroying " + jbossInternalDescription());
+ log.debugf("Destroying %1s", jbossInternalDescription());
try
{
@@ -421,7 +421,7 @@
log.warn("Destroying failed " + jbossInternalDescription(), t);
}
state = DESTROYED;
- log.debug("Destroyed " + jbossInternalDescription());
+ log.debugf("Destroyed %1s", jbossInternalDescription());
}
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceDeploymentParser.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceDeploymentParser.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceDeploymentParser.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -102,7 +102,7 @@
Element classpathElement = (Element)children.item(i);
if (classpathElement.getTagName().equals("classpath"))
{
- log.debug("Found classpath element: " + classpathElement);
+ log.debugf("Found classpath element: %1s", classpathElement);
if (classpathElement.hasAttribute("codebase") == false)
throw new ConfigurationException("Invalid classpath element missing codebase: " + classpathElement);
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/CreateDestroyLifecycleAction.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/CreateDestroyLifecycleAction.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/CreateDestroyLifecycleAction.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -82,7 +82,7 @@
}
catch (Throwable t)
{
- log.debug("Error during destroy for " + context.getObjectName(), t);
+ log.debugf(t, "Error during destroy for %1s", context.getObjectName());
}
}
}
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/StartStopLifecycleAction.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/StartStopLifecycleAction.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/StartStopLifecycleAction.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -81,7 +81,7 @@
}
catch (Throwable t)
{
- log.debug("Error during stop for " + context.getObjectName(), t);
+ log.debugf(t, "Error during stop for %1s" + context.getObjectName());
}
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -288,7 +288,7 @@
// currently value constructor supports only values that are instances of class itself
// this will add another instance with the same class to context
ClassInfo type = beanInfo.getClassInfo();
- log.debug("Constructing bean from injection value: results in multiple beans with same class type - " + type);
+ log.debugf("Constructing bean from injection value: results in multiple beans with same class type - %1s", type);
return type;
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -373,7 +373,7 @@
{
visitor.visitorNodeStack().push(node);
}
- log.debug(context.getName() + ": Contextual injection usage (class -> classloader): " + injectionClass + " -> " + SecurityActions.getClassLoader(injectionClass) + " defined by " + node);
+ log.debugf("%1s : Contextual injection usage (class -> classloader): %2s -> %3s defined by %4s", context.getName(), injectionClass, SecurityActions.getClassLoader(injectionClass), node);
// set when required
ControllerState whenRequired = whenRequiredState;
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -62,7 +62,7 @@
}
catch (Throwable t)
{
- log.debug("Unable to initialise property editors", t);
+ log.debugf(t, "Unable to initialise property editors");
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/KernelFactory.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/KernelFactory.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/KernelFactory.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -83,7 +83,7 @@
long begin = 0;
long end = 0;
- log.debug("Starting JBoss Kernel construction...");
+ log.debugf("Starting JBoss Kernel construction...");
begin = System.currentTimeMillis();
//local caching for easy reference:
@@ -109,7 +109,7 @@
log.trace("Kernel instance initialzed");
end = System.currentTimeMillis();
- log.debug("Completed JBoss Kernel construction. Duration: " + (end - begin) + " milliseconds");
+ log.debugf("Completed JBoss Kernel construction. Duration: %1d milliseconds", (end - begin));
return kernel;
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -73,7 +73,7 @@
}
catch (Throwable t)
{
- log.debug("Ignored error unsetting context ", t);
+ log.debugf(t, "Ignored error unsetting context ");
}
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AnnotationsAction.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AnnotationsAction.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AnnotationsAction.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -67,7 +67,7 @@
}
catch(Throwable t)
{
- log.debug("Error while cleaning the annotations: " + t);
+ log.debugf(t, "Error while cleaning the annotations: ");
}
finally
{
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AutowireAction.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AutowireAction.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AutowireAction.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -54,7 +54,7 @@
}
catch (Throwable ignored)
{
- log.debug("Ignored error unsetting context ", ignored);
+ log.debugf(ignored, "Ignored error unsetting context ");
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClearableDependencyItem.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClearableDependencyItem.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClearableDependencyItem.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -22,13 +22,21 @@
package org.jboss.kernel.plugins.dependency;
import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.DependencyItem;
/**
- *
+ * Clearable dependency item.
+ *
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
-public interface ClearableDependencyItem
+public interface ClearableDependencyItem extends DependencyItem
{
+ /**
+ * Clear dependency item.
+ * e.g. remove class ref
+ *
+ * @param controller the controller
+ */
void clear(Controller controller);
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/DescribeAction.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/DescribeAction.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/DescribeAction.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -91,7 +91,7 @@
}
catch (Throwable e)
{
- log.debug("Error while cleaning the annotations: " + e);
+ log.debugf(e, "Error while cleaning the annotations: ");
return;
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/InstantiateAction.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/InstantiateAction.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/InstantiateAction.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -119,7 +119,7 @@
}
catch (Throwable ignored)
{
- log.debug("Ignored error unsetting context ", ignored);
+ log.debugf(ignored, "Ignored error unsetting context ");
}
finally
{
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -232,7 +232,7 @@
}
catch (Exception ignored)
{
- log.debug("Ignored error unsetting context " + context.getName(), ignored);
+ log.debugf(ignored, "Ignored error unsetting context %1s", context.getName());
}
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ScopedKernelController.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ScopedKernelController.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ScopedKernelController.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -117,7 +117,7 @@
if (controller != null)
controller.removeController(this);
else
- log.debug("Parent controller already released, cannot remove this: " + toString());
+ log.debugf("Parent controller already released, cannot remove this: %1s", this);
setUnderlyingController(null);
setParentController(null);
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -393,6 +393,6 @@
if (controller.isShutdown() == false)
controller.uninstall(context.getName());
else
- log.debug("Not undeploying " + context.getName() + " the controller is shutdown!");
+ log.debugf("Not undeploying %1s, the controller is shutdown!", context.getName());
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -89,14 +89,14 @@
deployment.setName(url.toString());
long now = System.currentTimeMillis();
- log.debug("Parsing " + url + " took " + (now -start) + " milliseconds");
+ log.debugf("Parsing %1s took %2d milliseconds", url, (now - start));
if (trace)
log.trace("Deploying " + deployment);
deploy(deployment);
now = System.currentTimeMillis();
- log.debug("Deploying " + url + " took " + (now -start) + " milliseconds");
+ log.debugf("Deploying %1s took %2d milliseconds", url, (now - start));
if (trace)
log.trace("Deployed " + deployment.getInstalledContexts());
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/event/AbstractEventEmitter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/event/AbstractEventEmitter.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/event/AbstractEventEmitter.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -171,7 +171,7 @@
}
catch (Throwable t)
{
- log.debug("Ignored unhandled throwable: ", t);
+ log.debugf(t, "Ignored unhandled throwable: ");
}
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/LRUPolicyCachingBasicKernelMetaDataRepository.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/LRUPolicyCachingBasicKernelMetaDataRepository.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/LRUPolicyCachingBasicKernelMetaDataRepository.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -54,7 +54,7 @@
if (min == null || max == null)
throw new IllegalArgumentException("Missing min (" + min + ") or max (" + max + ").");
- log.debug("Creating LRU cache policy, min: " + min + ", max: " + max);
+ log.debugf("Creating LRU cache policy, min: %1d, max: %2d", min, max);
return new ConcurrentLRUCachePolicyFactory(min, max);
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/TimedPolicyCachingBasicKernelMetaDataRepository.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/TimedPolicyCachingBasicKernelMetaDataRepository.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/metadata/basic/TimedPolicyCachingBasicKernelMetaDataRepository.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -60,7 +60,7 @@
if (resolution == null)
resolution = parseInteger(readSystemProperty("TimedPolicyCaching.resolution", null));
- log.debug("Creating timed cache policy, lifetime: " + defaultLifetime + ", threadSafe: " + threadSafe + ", resolution: " + resolution);
+ log.debugf("Creating timed cache policy, lifetime: %1d, threadSafe: %2b, resolution: %3d", defaultLifetime, threadSafe, resolution);
if (defaultLifetime == null)
return new TimedCachePolicyFactory();
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -87,7 +87,7 @@
if (url != null)
methodDeployment = deploy(url);
else
- getLog().debug("No method specific deployment " + getMethodDeployment());
+ getLog().debugf("No method specific deployment %1s", getMethodDeployment());
afterSetUp();
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java 2010-01-26 13:10:11 UTC (rev 99938)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java 2010-01-26 15:14:40 UTC (rev 99939)
@@ -290,7 +290,7 @@
{
try
{
- log.debug("Deploying " + url);
+ log.debugf("Deploying %1s", url);
KernelDeployment deployment = deployer.deploy(url);
log.trace("Deployed " + url);
return deployment;
@@ -323,11 +323,11 @@
protected KernelControllerContext deploy(BeanMetaData beanMetaData) throws Exception
{
KernelController controller = kernel.getController();
- log.debug("Deploying " + beanMetaData);
+ log.debugf("Deploying %1s", beanMetaData);
try
{
KernelControllerContext result = controller.install(beanMetaData);
- log.debug("Deployed " + result.getName());
+ log.debugf("Deployed %1s", result.getName());
return result;
}
catch (Exception e)
@@ -352,11 +352,11 @@
*/
protected void deploy(KernelDeployment deployment) throws Exception
{
- log.debug("Deploying " + deployment);
+ log.debugf("Deploying %1s", deployment);
try
{
deployer.deploy(deployment);
- log.debug("Deployed " + deployment);
+ log.debugf("Deployed %1s", deployment);
}
catch (Exception e)
{
@@ -381,10 +381,10 @@
{
if (context == null)
throw new IllegalArgumentException("Null context");
- log.debug("Undeploying " + context.getName());
+ log.debugf("Undeploying %1s", context.getName());
KernelController controller = kernel.getController();
controller.uninstall(context.getName());
- log.debug("Undeployed " + context.getName());
+ log.debugf("Undeployed %1s", context.getName());
}
/**
@@ -394,7 +394,7 @@
*/
protected void undeploy(KernelDeployment deployment)
{
- log.debug("Undeploying " + deployment.getName());
+ log.debugf("Undeploying %1s", deployment.getName());
try
{
deployer.undeploy(deployment);
@@ -413,7 +413,7 @@
*/
protected void undeploy(URL url)
{
- log.debug("Undeploying " + url);
+ log.debugf("Undeploying %1s", url);
try
{
deployer.undeploy(url);
@@ -437,7 +437,7 @@
if (url != null)
deploy(url);
else
- log.debug("No test specific deployment " + testName);
+ log.debugf("No test specific deployment %1s", testName);
}
protected void shutdown()
@@ -461,7 +461,7 @@
*/
protected void undeploy()
{
- log.debug("Undeploying " + deployer.getDeploymentNames());
+ log.debugf("Undeploying %1s", deployer.getDeploymentNames());
deployer.shutdown();
}
}
More information about the jboss-cvs-commits
mailing list