[jboss-cvs] JBossAS SVN: r99938 - in projects/jboss-deployers/trunk: deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers and 10 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 26 08:10:12 EST 2010


Author: alesj
Date: 2010-01-26 08:10:11 -0500 (Tue, 26 Jan 2010)
New Revision: 99938

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractClassLoaderDescribeDeployer.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployerWrapper.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java
   projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
   projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/ServiceDeploymentDeployer.java
   projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXBDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/XSLDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractCandidateStructureVisitor.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/FileModificationTypeMatcher.java
Log:
[JBDEPLOY-235]; make use of debugf.

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractClassLoaderDescribeDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractClassLoaderDescribeDeployer.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractClassLoaderDescribeDeployer.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -98,16 +98,16 @@
             if (deployment.getParentDomain() == null)
             {
                deployment.setDomain(unitName);
-               log.debug("Will use synthetic domain for classloader of subdeployment: " + unitName);
+               log.debugf("Will use synthetic domain for classloader of subdeployment: %1s", unitName);
             }
             else
             {
-               log.debug("Will create top level classloader for subdeployment: " + unitName);
+               log.debugf("Will create top level classloader for subdeployment: %1s", unitName);
             }
          }
          else
          {
-            log.debug("Asked to create top level classloader for subdeployment: " + unitName);
+            log.debugf("Asked to create top level classloader for subdeployment: %1s", unitName);
          }
       }
       

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployerWrapper.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployerWrapper.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployerWrapper.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -181,7 +181,7 @@
       }
       catch (Throwable t)
       {
-         log.debug("Error during deploy: " + unit.getName(), t);
+         log.debugf(t, "Error during deploy: %1s", unit.getName());
          throw DeploymentException.rethrowAsDeploymentException("Error during deploy: " + unit.getName(), t);
       }
       finally

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -785,13 +785,11 @@
             DeploymentContext context = undeploy.get(i);
             if (DeploymentState.ERROR.equals(context.getState()) == false)
                context.setState(DeploymentState.UNDEPLOYING);
-            if (log.isDebugEnabled())
-               log.debug("Undeploying " + context.getName());
+            log.debugf("Undeploying %1s", context.getName());
             DeploymentControllerContext deploymentControllerContext = context.getTransientAttachments().getAttachment(ControllerContext.class.getName(), DeploymentControllerContext.class);
             if (deploymentControllerContext == null)
             {
-               if (log.isDebugEnabled())
-                  log.debug("DeploymentContext has no DeploymentControllerContext during undeploy request, ignoring: " + context);
+               log.debugf("DeploymentContext has no DeploymentControllerContext during undeploy request, ignoring: %1s", context);
             }
             else
             {
@@ -844,8 +842,7 @@
                unregisterMBean(context);
                removeClassLoader(context);
                cleanup(context);
-               if (log.isDebugEnabled())
-                  log.debug("Fully Undeployed " + context.getName());
+               log.debugf("Fully Undeployed %1s", context.getName());
             }
             catch (Throwable t)
             {
@@ -870,8 +867,7 @@
             {
                controller.install(deploymentControllerContext);
                context.setState(DeploymentState.DEPLOYING);
-               if (log.isDebugEnabled())
-                  log.debug("Deploying " + context.getName());
+               log.debugf("Deploying %1s", context.getName());
                if (scopeBuilder != null)
                   context.getTransientAttachments().addAttachment(ScopeBuilder.class, scopeBuilder);
                if (repository != null)
@@ -1355,8 +1351,7 @@
       {
          if (ControllerState.INSTALLED.equals(toState) && DeploymentState.DEPLOYING.equals(deploymentContext.getState()))
          {
-            if (log.isDebugEnabled())
-               log.debug("Fully Deployed " + context.getName());
+            log.debugf("Fully Deployed %1s", context.getName());
             setState(deploymentContext, DeploymentState.DEPLOYED, null);
          }
       }

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -357,8 +357,7 @@
             throw new DeploymentException("The main deployer is shutdown");
 
          String name = deployment.getName();
-         if (log.isDebugEnabled())
-            log.debug("Add deployment: " + name);
+         log.debugf("Add deployment: %1s", name);
 
          // only try to recognize non re-deployments
          if (checkExistingTopLevelDeployment(deployment, addToDeploy) == false)
@@ -386,8 +385,7 @@
       DeploymentContext previous = topLevelDeployments.get(name);
       if (previous != null)
       {
-         if (log.isDebugEnabled())
-            log.debug("Removing previous deployment: " + previous.getName());
+         log.debugf("Removing previous deployment: %1s", previous.getName());
          toRedeploy.put(name, deployment);
          return true;
       }
@@ -484,8 +482,7 @@
          if (shutdown.get())
             throw new IllegalStateException("The main deployer is shutdown");
 
-         if (log.isDebugEnabled())
-            log.debug("Remove deployment context: " + name);
+         log.debugf("Remove deployment context: %1s", name);
 
          DeploymentContext context = topLevelDeployments.remove(name);
          if (context == null)
@@ -1004,14 +1001,12 @@
       allDeployments.put(context.getName(), context);
       if (context.getState() == DeploymentState.ERROR)
       {
-         if (log.isDebugEnabled())
-            log.debug("Not scheduling addition of context already in error: " + context.getName() + " reason=" + context.getProblem());
+         log.debugf("Not scheduling addition of context already in error: %1s, reason= %2s", context.getName(), context.getProblem());
          return;
       }
       context.setState(DeploymentState.DEPLOYING);
       DeploymentContext parent = context.getParent();
-      if (log.isDebugEnabled())
-         log.debug("Scheduling deployment: " + context.getName() + " parent=" + parent);
+      log.debugf("Scheduling deployment: %1s, parent=%2s", context.getName(), parent);
 
       // Process the top level only
       if (context.isTopLevel() && addToDeploy)
@@ -1041,8 +1036,7 @@
       if (DeploymentState.ERROR.equals(context.getState()) == false)
          context.setState(DeploymentState.UNDEPLOYING);
       DeploymentContext parent = context.getParent();
-      if (log.isDebugEnabled())
-         log.debug("Scheduling undeployment: " + name + " parent=" + parent);
+      log.debugf("Scheduling undeployment: %1s, parent=%2s", name, parent);
 
       // Process the top level only
       if (context.isTopLevel() && addToUndeploy)

Modified: projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -115,7 +115,7 @@
          Element config = parsed.getConfig();
          if (config == null)
          {
-            log.debug("Service deployment has no services: " + parsed.getName());
+            log.debugf("Service deployment has no services: %1s", parsed.getName());
             return parsed;
          }
          if (log.isDebugEnabled())
@@ -152,7 +152,7 @@
          String codebase = path.getCodeBase();
          String archives = path.getArchives();
 
-         log.debug("Processing classpath: " + unit.getName() + " codebase=" + codebase + " archives=" + archives);
+         log.debugf("Processing classpath: %1s codebase=%2s archives=%3s", unit.getName(), codebase, archives);
          VirtualFile codebaseFile = unit.getRoot();
          if (".".equals(codebase) == false)
          {
@@ -168,7 +168,7 @@
          if (archives == null)
          {
             classpath.add(codebaseFile);
-            log.debug("Using codebase as classpath: " + unit.getName());
+            log.debugf("Using codebase as classpath: %1s", unit.getName());
          }
          else
          {

Modified: projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/ServiceDeploymentDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/ServiceDeploymentDeployer.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/ServiceDeploymentDeployer.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -90,7 +90,7 @@
                Element config = deployment.getConfig();
                if (config == null)
                {
-                  log.debug("Service deployment has no services: " + deployment.getName());
+                  log.debugf("Service deployment has no services: %1s", deployment.getName());
                   return;
                }
                if (log.isDebugEnabled())

Modified: projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -102,7 +102,7 @@
                Class<?> originalClass = moClass;
                ManagementObjectClass moc = (ManagementObjectClass)sam.getAnnotationInstance(loader);
                moClass = moc.code();
-               log.debug("Using alternate class '" + moClass + "' for class " + originalClass);
+               log.debugf("Using alternate class '%1s' for class %2s",  moClass, originalClass);
                break;
             }  
          }
@@ -169,12 +169,12 @@
                }
                catch(Exception e2)
                {
-                  log.debug("Failed to get value from mbean for: "+attribute, e2);
+                  log.debugf(e2, "Failed to get value from mbean for: %1s", attribute);
                }               
             }
             catch(Exception e)
             {
-               log.debug("Failed to get value from mbean for: "+name, e);
+               log.debugf(e, "Failed to get value from mbean for: %1s", name);
             }
          }
    
@@ -198,8 +198,7 @@
          }
          catch(Exception e)
          {
-            log.debug("Failed to get property value for bean: "+beanInfo.getName()
-                  +", property: "+propertyInfo.getName(), e);
+            log.debugf(e, "Failed to get property value for bean: %1s, property: %2s", beanInfo.getName(), propertyInfo.getName());
             mvalue = metaValueFactory.create(null, propertyInfo.getType());
             return mvalue;
          }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -167,7 +167,7 @@
          }
          catch (Exception e)
          {
-            log.debug("Unable to retrieve classloader for deployment: " + unit.getName() + " reason=" + e.toString());
+            log.debugf("Unable to retrieve classloader for deployment: %1s reason=%2s", unit.getName(), e);
          }
       }
       KernelControllerContext context = createControllerContext(unit, deployment);

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -52,7 +52,7 @@
          {
             ResourceFilter previousRecurse = unit.addAttachment(ResourceFilter.class.getName() + ".recurse", recurse, ResourceFilter.class);
             if (previousRecurse != null)
-               log.debug("Overridding previous recurse filter: " + previousRecurse);
+               log.debugf("Overridding previous recurse filter: %1s", previousRecurse);
          }
 
          // resource
@@ -61,7 +61,7 @@
          {
             ResourceFilter previousFilter = unit.addAttachment(ResourceFilter.class.getName() + ".resource", filter, ResourceFilter.class);
             if (previousFilter != null)
-               log.debug("Overridding previous resource filter: " + previousFilter);
+               log.debugf("Overridding previous resource filter: %1s", previousFilter);
          }
       }
       return true;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -82,7 +82,7 @@
          unit.addAttachment(DYNAMIC_CLASS_URL_KEY, dynamicClassRoot);
          unit.addAttachment(DYNAMIC_CLASS_KEY, classes);
          unit.prependClassPath(classes);
-         log.debug("Dynamic class root for " + unit.getName() + " is " + dynamicClassRoot);
+         log.debugf("Dynamic class root for %1s is %2s", unit.getName(), dynamicClassRoot);
       }
       catch (Exception e)
       {
@@ -93,7 +93,7 @@
    @Override
    public void undeploy(VFSDeploymentUnit unit)
    {
-      log.debug("Removing dynamic class root for " + unit.getName());
+      log.debugf("Removing dynamic class root for %1s", unit.getName());
       try
       {
          VirtualFile classes = unit.removeAttachment(DYNAMIC_CLASS_KEY, VirtualFile.class);

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -150,7 +150,7 @@
             if (child != null)
                locations.put(child, entry.getType());
             else
-               log.debug("Meta data path does not exist: root=" + root.getPathName() + " path=" + path);
+               log.debugf("Meta data path does not exist: root=%1s path=%2s", root.getPathName(), path);
          }
          setMetaDataLocationsMap(locations);
       }
@@ -290,7 +290,7 @@
             }
             catch (IOException e)
             {
-               log.debug("Search exception invocation for metafile " + name + " in " + location.getName() + ", reason: " + e);
+               log.debugf("Search exception invocation for metafile %1s in %2s, reason: %3s", name, location.getName(), e);
             }
          }
       }
@@ -363,7 +363,7 @@
       }
       catch (Exception e)
       {
-         log.debug("Error retrieving meta data: filter=" + filter, e);
+         log.debugf(e, "Error retrieving meta data: filter=%1s", filter);
          return Collections.emptyList();
       }
    }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -120,8 +120,7 @@
       if (deployer == null)
          throw new IllegalArgumentException("Null deployer");
       structureDeployers.add(new StructureDeployerWrapper(deployer));
-      if (log.isDebugEnabled())
-         log.debug("Added structure deployer " + deployer);
+      log.debugf("Added structure deployer %1s", deployer);
    }
 
    /**
@@ -134,8 +133,7 @@
       if (deployer == null)
          throw new IllegalArgumentException("Null deployer");
       structureDeployers.remove(deployer);
-      if (log.isDebugEnabled())
-         log.debug("Removed structure deployer " + deployer);
+      log.debugf("Removed structure deployer %1s", deployer);
    }
    
    public boolean determineStructure(VirtualFile file, StructureContext parentContext) throws DeploymentException

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -79,7 +79,7 @@
                   }
                   catch (Exception e)
                   {
-                     log.debug("Exception checking child context (" + child + ") for modification, cause: " + e);
+                     log.debugf("Exception checking child context (%1s) for modification, cause: %2s", child, e);
                   }
                }
             }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/FileModificationTypeMatcher.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/FileModificationTypeMatcher.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/FileModificationTypeMatcher.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -60,7 +60,7 @@
             }
             catch (Exception e)
             {
-               log.debug("Cannot determine modification type, cause: " + e);
+               log.debugf("Cannot determine modification type, cause: %1s", e);
             }
          }
       }

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXBDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXBDeployer.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXBDeployer.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -168,7 +168,7 @@
       if (file == null)
          throw new IllegalArgumentException("Null file");
 
-      log.debug("Parsing: " + file.getName());
+      log.debugf("Parsing: %1s", file.getName());
 
       Unmarshaller unmarshaller = context.createUnmarshaller();
       unmarshaller.setEventHandler(validationEventHandler);

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -203,8 +203,7 @@
       if (file == null)
          throw new IllegalArgumentException("Null file");
 
-      if (log.isDebugEnabled())
-         log.debug("Parsing: " + file.getName());
+      log.debugf("Parsing: %1s", file.getName());
       
       InputSource source = new VFSInputSource(file);
       DocumentBuilderFactory factory = getDocumentBuilderFactory();

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/XSLDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/XSLDeployer.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/XSLDeployer.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -113,7 +113,7 @@
          StreamSource ss = new StreamSource(is);
          ss.setSystemId(xslPath);
          templates = tf.newTemplates(ss);
-         log.debug("Created templates: " + templates);
+         log.debugf("Created templates: %1s", templates);
       }
       finally
       {
@@ -155,7 +155,7 @@
       
       document = (Document) r.getNode();
       String docStr = DOMWriter.printNode(document, true);
-      log.debug("Transformed " + file.getPathName() + " into " + docStr);
+      log.debugf("Transformed %1s into %2s", file.getPathName(), docStr);
       
       return parse(unit, file, document);
    }

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractCandidateStructureVisitor.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractCandidateStructureVisitor.java	2010-01-26 12:39:59 UTC (rev 99937)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractCandidateStructureVisitor.java	2010-01-26 13:10:11 UTC (rev 99938)
@@ -143,7 +143,7 @@
          }
          catch (IOException e)
          {
-            log.debug("Ignoring " + file + " reason=" + e);
+            log.debugf("Ignoring %1s reason=%2s", file, e);
             return;
          }
          
@@ -158,7 +158,7 @@
          }
          catch (Exception e)
          {
-            log.debug("Ignoring " + file + " reason=" + e);
+            log.debugf("Ignoring %1s reason=%2s", file, e);
          }
       }
    }




More information about the jboss-cvs-commits mailing list