[jboss-cvs] JBossAS SVN: r99934 - in projects/jboss-deployers/trunk: deployers-impl/src/main/java/org/jboss/deployers/plugins/main and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 26 07:17:26 EST 2010
Author: alesj
Date: 2010-01-26 07:17:26 -0500 (Tue, 26 Jan 2010)
New Revision: 99934
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/main/MainDeployerImpl.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.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/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java
Log:
[JBDEPLOY-235]; check log creation.
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:02:34 UTC (rev 99933)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java 2010-01-26 12:17:26 UTC (rev 99934)
@@ -362,7 +362,8 @@
String stageName = stage.getName();
deployersByStage.removeDeployer(stageName, wrapper);
- log.debug("Removed deployer " + deployer + " from stage " + stageName);
+ if (isTraceAddDeployer())
+ log.trace("Removed deployer " + deployer + " from stage " + stageName);
}
/**
@@ -408,7 +409,8 @@
controller.addState(ControllerState.newState(stageName), preceeds);
stages.put(stageName, stage);
- log.debug("Added stage " + stageName + " before " + preceeds);
+ if (log.isTraceEnabled())
+ log.trace("Added stage " + stageName + " before " + preceeds);
}
/**
@@ -504,7 +506,8 @@
public void setMgtObjectCreator(ManagedObjectCreator mgtObjectCreator)
{
this.mgtObjectCreator = mgtObjectCreator;
- log.debug("setMgtObjectCreator, " + mgtObjectCreator);
+ if (log.isTraceEnabled())
+ log.trace("setMgtObjectCreator, " + mgtObjectCreator);
}
/**
@@ -782,11 +785,13 @@
DeploymentContext context = undeploy.get(i);
if (DeploymentState.ERROR.equals(context.getState()) == false)
context.setState(DeploymentState.UNDEPLOYING);
- log.debug("Undeploying " + context.getName());
+ if (log.isDebugEnabled())
+ log.debug("Undeploying " + context.getName());
DeploymentControllerContext deploymentControllerContext = context.getTransientAttachments().getAttachment(ControllerContext.class.getName(), DeploymentControllerContext.class);
if (deploymentControllerContext == null)
{
- log.debug("DeploymentContext has no DeploymentControllerContext during undeploy request, ignoring: " + context);
+ if (log.isDebugEnabled())
+ log.debug("DeploymentContext has no DeploymentControllerContext during undeploy request, ignoring: " + context);
}
else
{
@@ -839,7 +844,8 @@
unregisterMBean(context);
removeClassLoader(context);
cleanup(context);
- log.debug("Fully Undeployed " + context.getName());
+ if (log.isDebugEnabled())
+ log.debug("Fully Undeployed " + context.getName());
}
catch (Throwable t)
{
@@ -864,7 +870,8 @@
{
controller.install(deploymentControllerContext);
context.setState(DeploymentState.DEPLOYING);
- log.debug("Deploying " + context.getName());
+ if (log.isDebugEnabled())
+ log.debug("Deploying " + context.getName());
if (scopeBuilder != null)
context.getTransientAttachments().addAttachment(ScopeBuilder.class, scopeBuilder);
if (repository != null)
@@ -1348,7 +1355,8 @@
{
if (ControllerState.INSTALLED.equals(toState) && DeploymentState.DEPLOYING.equals(deploymentContext.getState()))
{
- log.debug("Fully Deployed " + context.getName());
+ if (log.isDebugEnabled())
+ log.debug("Fully Deployed " + 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:02:34 UTC (rev 99933)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java 2010-01-26 12:17:26 UTC (rev 99934)
@@ -357,7 +357,8 @@
throw new DeploymentException("The main deployer is shutdown");
String name = deployment.getName();
- log.debug("Add deployment: " + name);
+ if (log.isDebugEnabled())
+ log.debug("Add deployment: " + name);
// only try to recognize non re-deployments
if (checkExistingTopLevelDeployment(deployment, addToDeploy) == false)
@@ -385,7 +386,8 @@
DeploymentContext previous = topLevelDeployments.get(name);
if (previous != null)
{
- log.debug("Removing previous deployment: " + previous.getName());
+ if (log.isDebugEnabled())
+ log.debug("Removing previous deployment: " + previous.getName());
toRedeploy.put(name, deployment);
return true;
}
@@ -482,7 +484,8 @@
if (shutdown.get())
throw new IllegalStateException("The main deployer is shutdown");
- log.debug("Remove deployment context: " + name);
+ if (log.isDebugEnabled())
+ log.debug("Remove deployment context: " + name);
DeploymentContext context = topLevelDeployments.remove(name);
if (context == null)
@@ -1001,12 +1004,14 @@
allDeployments.put(context.getName(), context);
if (context.getState() == DeploymentState.ERROR)
{
- log.debug("Not scheduling addition of context already in error: " + context.getName() + " reason=" + context.getProblem());
+ if (log.isDebugEnabled())
+ log.debug("Not scheduling addition of context already in error: " + context.getName() + " reason=" + context.getProblem());
return;
}
context.setState(DeploymentState.DEPLOYING);
DeploymentContext parent = context.getParent();
- log.debug("Scheduling deployment: " + context.getName() + " parent=" + parent);
+ if (log.isDebugEnabled())
+ log.debug("Scheduling deployment: " + context.getName() + " parent=" + parent);
// Process the top level only
if (context.isTopLevel() && addToDeploy)
@@ -1036,7 +1041,8 @@
if (DeploymentState.ERROR.equals(context.getState()) == false)
context.setState(DeploymentState.UNDEPLOYING);
DeploymentContext parent = context.getParent();
- log.debug("Scheduling undeployment: " + name + " parent=" + parent);
+ if (log.isDebugEnabled())
+ log.debug("Scheduling undeployment: " + name + " parent=" + parent);
// Process the top level only
if (context.isTopLevel() && addToUndeploy)
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2010-01-26 12:02:34 UTC (rev 99933)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2010-01-26 12:17:26 UTC (rev 99934)
@@ -550,7 +550,7 @@
public void setClassLoader(ClassLoader classLoader)
{
this.classLoader = classLoader;
- if (classLoader != null)
+ if (classLoader != null && log.isTraceEnabled())
log.trace("ClassLoader for " + name + " is " + classLoader);
}
@@ -723,7 +723,8 @@
components.add(component);
if (server != null)
registerMBeans(component, true, true);
- log.debug("Added component " + component.getName() + " to " + getName());
+ if (log.isTraceEnabled())
+ log.trace("Added component " + component.getName() + " to " + getName());
}
public boolean removeComponent(DeploymentContext component)
@@ -738,8 +739,8 @@
log.warn("Removing component " + name + " which still has components " + componentComponents);
boolean result = components.remove(component);
component.cleanup();
- if (result)
- log.debug("Removed component " + component.getName() + " from " + getName());
+ if (result && log.isTraceEnabled())
+ log.trace("Removed component " + component.getName() + " from " + getName());
return result;
}
@@ -1067,7 +1068,8 @@
}
catch (Exception e)
{
- log.trace("Unable to unregister deployment mbean " + context.getName(), e);
+ if (log.isTraceEnabled())
+ log.trace("Unable to unregister deployment mbean " + context.getName(), e);
}
}
if (unregisterSubDeployments)
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:02:34 UTC (rev 99933)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java 2010-01-26 12:17:26 UTC (rev 99934)
@@ -120,7 +120,8 @@
if (deployer == null)
throw new IllegalArgumentException("Null deployer");
structureDeployers.add(new StructureDeployerWrapper(deployer));
- log.debug("Added structure deployer " + deployer);
+ if (log.isDebugEnabled())
+ log.debug("Added structure deployer " + deployer);
}
/**
@@ -133,7 +134,8 @@
if (deployer == null)
throw new IllegalArgumentException("Null deployer");
structureDeployers.remove(deployer);
- log.debug("Removed structure deployer " + deployer);
+ if (log.isDebugEnabled())
+ log.debug("Removed structure deployer " + deployer);
}
public boolean determineStructure(VirtualFile file, StructureContext parentContext) throws DeploymentException
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:02:34 UTC (rev 99933)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java 2010-01-26 12:17:26 UTC (rev 99934)
@@ -203,7 +203,8 @@
if (file == null)
throw new IllegalArgumentException("Null file");
- log.debug("Parsing: " + file.getName());
+ if (log.isDebugEnabled())
+ log.debug("Parsing: " + file.getName());
InputSource source = new VFSInputSource(file);
DocumentBuilderFactory factory = getDocumentBuilderFactory();
More information about the jboss-cvs-commits
mailing list