[jbpm-commits] JBoss JBPM SVN: r4361 - in jbpm3/trunk/modules/core/src/main/java/org/jbpm: ant and 27 other directories.

Author: bradsdavis Date: 2009-03-30 15:46:57 -0400 (Mon, 30 Mar 2009) New Revision: 4361 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/ant/AntHelper.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/impl/CommandServiceImpl.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/ObjectFactoryImpl.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableContainer.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/variableinstance/JcrNodeInstance.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/ActionTypes.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/EventCallback.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Decision.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/NodeTypes.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/ProcessState.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/jcr/impl/AbstractJcrServiceFactory.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/BeanMethod.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/msg/db/DbMessageService.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceServiceFactory.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/Services.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/save/CascadeSaveOperation.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java Log: JIRA: JBPM-2091 Wrapped core debug statements with log.isDebugEnabled() to ensure that heavy logging operations perform efficiently in production environments. The next step should be refactoring appropriate trace logs into trace logging statements. Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -298,7 +298,9 @@ // configuration does not exist or was evicted, construct it if (defaultObjectFactory != null) { - log.debug("creating configuration from default object factory: " + defaultObjectFactory); + if(log.isDebugEnabled()){ + log.debug("creating configuration from default object factory: " + defaultObjectFactory); + } instance = new JbpmConfiguration(defaultObjectFactory); } else @@ -394,7 +396,9 @@ public static JbpmConfiguration parseResource(String resource) { - log.debug("creating jbpm configuration from resource: " + resource); + if(log.isDebugEnabled()){ + log.debug("creating jbpm configuration from resource: " + resource); + } InputStream inputStream = null; if (resource != null) { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -109,7 +109,9 @@ */ public JbpmContext(Services services, ObjectFactory objectFactory) { - log.debug("creating " + toString()); + if(log.isDebugEnabled()){ + log.debug("creating " + toString()); + } this.services = services; this.objectFactory = objectFactory; } @@ -119,7 +121,9 @@ */ public void close() { - log.debug("closing jbpmContext " + toString()); + if(log.isDebugEnabled()){ + log.debug("closing jbpmContext " + toString()); + } try { if (services != null) Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/ant/AntHelper.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/ant/AntHelper.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/ant/AntHelper.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -53,7 +53,10 @@ Configuration configuration = (Configuration)configurations.get(key); if (configuration == null) { - log.debug("creating hibernate configuration from cfg '" + hibernateCfgResource + "' and properties '" + hibernatePropertiesResource + "'"); + if(log.isDebugEnabled()) + { + log.debug("creating hibernate configuration from cfg '" + hibernateCfgResource + "' and properties '" + hibernatePropertiesResource + "'"); + } configuration = new Configuration(); configuration.configure(hibernateCfgResource); if (hibernatePropertiesResource != null) @@ -78,7 +81,10 @@ } else { - log.debug("got hibernate configuration from cfg '" + hibernateCfgResource + "' and properties '" + hibernatePropertiesResource + "' from the cache"); + if(log.isDebugEnabled()) + { + log.debug("got hibernate configuration from cfg '" + hibernateCfgResource + "' and properties '" + hibernatePropertiesResource + "' from the cache"); + } } return configuration; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -74,7 +74,10 @@ void logBlocks(String msg) { for(int blockIndex=0; blockIndex<byteBlocks.size(); blockIndex++) { byte[] block = (byte[]) byteBlocks.get(blockIndex); - log.debug(msg+"["+block.length+"] "+StringUtil.toHexString(block)); + if(log.isDebugEnabled()) + { + log.debug(msg+"["+block.length+"] "+StringUtil.toHexString(block)); + } } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/bytes/ByteBlockChopper.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -49,7 +49,10 @@ int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size"); int byteCount = byteArray.length; if (byteCount > blockSize) { - log.debug("chopping " + byteCount + " bytes"); + if(log.isDebugEnabled()) + { + log.debug("chopping " + byteCount + " bytes"); + } bytes = new ArrayList(); int offset; for (offset = 0; byteCount - offset > blockSize; offset += blockSize) { @@ -58,7 +61,10 @@ bytes.add(subArray(byteArray, offset, byteCount - offset)); } else if (byteCount > 0) { - log.debug("no need to chop " + byteCount + " bytes"); + if(log.isDebugEnabled()) + { + log.debug("no need to chop " + byteCount + " bytes"); + } bytes = Collections.singletonList(byteArray); } } @@ -68,7 +74,10 @@ private static byte[] subArray(byte[] array, int offset, int length) { byte[] subArray = new byte[length]; System.arraycopy(array, offset, subArray, 0, length); - log.debug("chopped " + length + " bytes beggining at " + offset); + if(log.isDebugEnabled()) + { + log.debug("chopped " + length + " bytes beggining at " + offset); + } return subArray; } @@ -82,13 +91,19 @@ break; case 1: byteArray = (byte[]) byteBlocks.get(0); - log.debug("no need to glue " + byteArray.length + " bytes"); + if(log.isDebugEnabled()) + { + log.debug("no need to glue " + byteArray.length + " bytes"); + } break; default: int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size"); byte[] lastBlock = (byte[]) byteBlocks.get(blockCount - 1); int byteCount = blockSize * (blockCount - 1) + lastBlock.length; - log.debug("gluing " + byteCount + " bytes"); + if(log.isDebugEnabled()) + { + log.debug("gluing " + byteCount + " bytes"); + } byteArray = new byte[byteCount]; int offset = 0; @@ -96,11 +111,17 @@ byte[] block = (byte[]) byteBlocks.get(i); int length = block.length; System.arraycopy(block, 0, byteArray, offset, length); - log.debug("glued " + length + " bytes beggining at " + offset); + if(log.isDebugEnabled()) + { + log.debug("glued " + length + " bytes beggining at " + offset); + } // JBPM-702 sybase truncates trailing zeros if (length < blockSize && i < n-1) { Arrays.fill(byteArray, offset + length, offset + blockSize, (byte) 0); - log.debug("zero filled " + (blockSize - length) + " trailing bytes"); + if(log.isDebugEnabled()) + { + log.debug("zero filled " + (blockSize - length) + " trailing bytes"); + } offset += blockSize; } else { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -54,7 +54,10 @@ this.jbpmContext = jbpmContext; try { - log.debug("executing " + this); + if(log.isDebugEnabled()) + { + log.debug("executing " + this); + } // batch tokens if (processInstanceIds != null && processInstanceIds.length > 0) Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -61,7 +61,10 @@ try { ArrayList result = new ArrayList(); - log.debug("executing " + this); + if(log.isDebugEnabled()) + { + log.debug("executing " + this); + } // batch tokens if (tokenIds != null && tokenIds.length > 0) Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -31,8 +31,10 @@ public Object execute(Token token) { if (inStateAtLeastSince == null || token.getNodeEnter().before(inStateAtLeastSince)) { - - log.debug("signal token " + token); + if(log.isDebugEnabled()) + { + log.debug("signal token " + token); + } if (transitionName == null) { token.signal(); } else { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -115,12 +115,17 @@ // set process variable to remember old version pi.getContextInstance().setVariable(OLD_VERSION_PROCESS_VARIABLE_NAME, oldDef.getVersion()); - log.debug("Start changing process id " + pi.getId() + " from version " + pi.getProcessDefinition().getVersion() + " to new version " + newDef.getVersion()); + if(log.isDebugEnabled()) + { + log.debug("Start changing process id " + pi.getId() + " from version " + pi.getProcessDefinition().getVersion() + " to new version " + newDef.getVersion()); + } pi.setProcessDefinition(newDef); changeTokenVersion(pi.getRootToken()); - - log.debug("process id " + pi.getId() + " changed to version " + pi.getProcessDefinition().getVersion()); + if(log.isDebugEnabled()) + { + log.debug("process id " + pi.getId() + " changed to version " + pi.getProcessDefinition().getVersion()); + } return pi; } @@ -131,8 +136,10 @@ private void changeTokenVersion(Token token) { ProcessDefinition newDef = getNewProcessDefinition(token); - log.debug("change token id " + token.getId() + " to new version " + newDef.getVersion()); - + if(log.isDebugEnabled()) + { + log.debug("change token id " + token.getId() + " to new version " + newDef.getVersion()); + } // change node reference on token (current node) Node oldNode = token.getNode(); Node newNode = findReplacementNode(newDef, oldNode); @@ -168,7 +175,10 @@ Task newTask = findReplacementTask(newDef, oldNode, oldTask); ti.setTask(newTask); - log.debug("change dependent task-instance with id " + oldTask.getId()); + if(log.isDebugEnabled()) + { + log.debug("change dependent task-instance with id " + oldTask.getId()); + } } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -85,14 +85,23 @@ { if (job.isExclusive()) { - log.debug("exclusive acquirable job found (" + job + "). querying for other exclusive jobs to lock them all in one tx..."); + if(log.isDebugEnabled()) + { + log.debug("exclusive acquirable job found (" + job + "). querying for other exclusive jobs to lock them all in one tx..."); + } List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance()); jobsToLock.addAll(otherExclusiveJobs); - log.debug("trying to obtain a process-instance exclusive locks for '" + otherExclusiveJobs + "'"); + if(log.isDebugEnabled()) + { + log.debug("trying to obtain a process-instance exclusive locks for '" + otherExclusiveJobs + "'"); + } } else { - log.debug("trying to obtain a lock for '" + job + "'"); + if(log.isDebugEnabled()) + { + log.debug("trying to obtain a lock for '" + job + "'"); + } jobsToLock.add(job); } @@ -118,12 +127,18 @@ } acquiredJobs = jobsToLock; - log.debug("obtained locks on following jobs: " + acquiredJobs); + if(log.isDebugEnabled()) + { + log.debug("obtained locks on following jobs: " + acquiredJobs); + } } catch (StaleStateException e) { - log.debug("couldn't acquire lock on job(s): " + jobsToLock); + if(log.isDebugEnabled()) + { + log.debug("couldn't acquire lock on job(s): " + jobsToLock); + } } return acquiredJobs; } @@ -135,7 +150,11 @@ try { - log.debug("executing job " + job); + if(log.isDebugEnabled()) + { + log.debug("executing job " + job); + } + if (job.execute(jbpmContext)) { jobSession.deleteJob(job); @@ -144,7 +163,10 @@ } catch (Exception e) { - log.debug("exception while executing '" + job + "'", e); + if(log.isDebugEnabled()) + { + log.debug("exception while executing '" + job + "'", e); + } StringWriter sw = new StringWriter(); e.printStackTrace(new PrintWriter(sw)); job.setException(sw.toString()); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -68,7 +68,10 @@ public Object execute(JbpmContext jbpmContext) { - log.debug("executing " + this); + if(log.isDebugEnabled()) + { + log.debug("executing " + this); + } if (previousProcessInstance != null) { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/impl/CommandServiceImpl.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/impl/CommandServiceImpl.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/impl/CommandServiceImpl.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -63,7 +63,10 @@ public Object execute(Command command) { JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - log.debug("executing " + command); + if(log.isDebugEnabled()) + { + log.debug("executing " + command); + } return command.execute(jbpmContext); } catch (RuntimeException e) { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -77,7 +77,10 @@ catch (RuntimeException e) { // Client probably does not need support for this type and omitted the dependency // So let us log and ignore - log.debug("could not instantiate jbpm type '" + XmlUtil.toString(jbpmTypeElement) + "': " + e); + if(log.isDebugEnabled()) + { + log.debug("could not instantiate jbpm type '" + XmlUtil.toString(jbpmTypeElement) + "': " + e); + } // make sure this JbpmType is ignored by always returning false in the JbpmTypeMatcher typeMatcherObjectInfo = NoObjectInfo.getInstance(); converter = null; Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/ObjectFactoryImpl.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/ObjectFactoryImpl.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/ObjectFactoryImpl.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -56,7 +56,10 @@ public void addObjectInfo(ObjectInfo objectInfo) { if (objectInfo.hasName()) { - log.debug("adding object info '"+objectInfo.getName()+"'"); + if(log.isDebugEnabled()) + { + log.debug("adding object info '"+objectInfo.getName()+"'"); + } Object removed = namedObjectInfos.put(objectInfo.getName(), objectInfo); if (removed!=null) { objectInfos.remove(removed); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableContainer.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableContainer.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableContainer.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -159,17 +159,26 @@ && (!variableInstance.supports(value)) ) { // delete the old variable instance - log.debug("variable type change. deleting '"+name+"' from '"+this+"'"); + if(log.isDebugEnabled()) + { + log.debug("variable type change. deleting '"+name+"' from '"+this+"'"); + } deleteVariableInstance(name); variableInstance = null; } if (variableInstance==null) { - log.debug("create variable '"+name+"' in '"+this+"' with value '"+value+"'"); + if(log.isDebugEnabled()) + { + log.debug("create variable '"+name+"' in '"+this+"' with value '"+value+"'"); + } variableInstance = VariableInstance.create(getToken(), name, value); addVariableInstance(variableInstance); } else { - log.debug("update variable '"+name+"' in '"+this+"' to value '"+value+"'"); + if(log.isDebugEnabled()) + { + log.debug("update variable '"+name+"' in '"+this+"' to value '"+value+"'"); + } variableInstance.setValue(value); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/variableinstance/JcrNodeInstance.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/variableinstance/JcrNodeInstance.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/variableinstance/JcrNodeInstance.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -128,8 +128,10 @@ repository = repo.getDescriptor(Repository.REP_NAME_DESC); workspace = wspace.getName(); path = node.getPath(); - - log.debug("stored jcr node repository("+repository+"), workspace("+workspace+") and path("+path+")"); + if(log.isDebugEnabled()) + { + log.debug("stored jcr node repository("+repository+"), workspace("+workspace+") and path("+path+")"); + } } catch (RepositoryException e) { throw new JbpmException("problem storing JCR node '"+node+"' in the process variable '"+name+"'", e); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -217,7 +217,10 @@ int nbrOfJobsAvailable = 0; Number jobs = (Number) session.createQuery("select count(*) from org.jbpm.job.Job") .uniqueResult(); - log.debug("there are " + jobs + " jobs in the database"); + if(log.isDebugEnabled()) + { + log.debug("there are " + jobs + " jobs in the database"); + } if (jobs != null) { nbrOfJobsAvailable = jobs.intValue(); } @@ -227,7 +230,10 @@ protected int getTimerCount() { Number timerCount = (Number) session.createQuery("select count(*) from org.jbpm.job.Timer") .uniqueResult(); - log.debug("there are " + timerCount + " timers in the database"); + if(log.isDebugEnabled()) + { + log.debug("there are " + timerCount + " timers in the database"); + } return timerCount.intValue(); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -246,7 +246,10 @@ deleteProcessInstance(processInstance); } else { - log.debug("process instance " + processInstanceId + " has been deleted already"); + if(log.isDebugEnabled()) + { + log.debug("process instance " + processInstanceId + " has been deleted already"); + } } } @@ -404,35 +407,53 @@ try { // delete outstanding jobs if (includeJobs) { - log.debug("deleting jobs for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("deleting jobs for " + processInstance); + } int entityCount = session.getNamedQuery("GraphSession.deleteJobsForProcessInstance") .setEntity("processInstance", processInstance) .executeUpdate(); - log.debug("deleted " + entityCount + " jobs for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("deleted " + entityCount + " jobs for " + processInstance); + } } // delete logs - log.debug("deleting logs for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("deleting logs for " + processInstance); + } deleteLogs(processInstance); // detach from parent process token Token superProcessToken = processInstance.getSuperProcessToken(); if (superProcessToken != null) { - log.debug("detaching " + if(log.isDebugEnabled()) + { + log.debug("detaching " + processInstance + " from super process token " + superProcessToken.getId()); + } processInstance.setSuperProcessToken(null); superProcessToken.setSubProcessInstance(null); } // delete tokens and subprocess instances - log.debug("deleting subprocesses for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("deleting subprocesses for " + processInstance); + } deleteSubProcesses(processInstance); // delete tasks (TaskLogs reference tasks, so tasks must be deleted after logs) if (includeTasks) { - log.debug("deleting tasks for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("deleting tasks for " + processInstance); + } List<?> tasks = session.getNamedQuery("GraphSession.findTaskInstancesForProcessInstance") .setEntity("processInstance", processInstance) .list(); @@ -442,7 +463,10 @@ } // delete the process instance - log.debug("deleting " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("deleting " + processInstance); + } session.delete(processInstance); } catch (Exception e) { @@ -467,12 +491,18 @@ .list(); if (subProcessInstances.isEmpty()) { - log.debug("no subprocesses to delete for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("no subprocesses to delete for " + processInstance); + } return; } for (ProcessInstance subProcessInstance : CollectionUtil.checkList(subProcessInstances, ProcessInstance.class)) { - log.debug("preparing to delete sub process instance " + subProcessInstance.getId()); + if(log.isDebugEnabled()) + { + log.debug("preparing to delete sub process instance " + subProcessInstance.getId()); + } deleteProcessInstance(subProcessInstance); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -86,7 +86,10 @@ if (jndiName!=null) { try { // fetch the JbpmSessionFactory from JNDI - log.debug("fetching JbpmSessionFactory from '"+jndiName+"'"); + if(log.isDebugEnabled()) + { + log.debug("fetching JbpmSessionFactory from '"+jndiName+"'"); + } InitialContext initialContext = new InitialContext(); Object o = initialContext.lookup(jndiName); instance = (JbpmSessionFactory) PortableRemoteObject.narrow(o, JbpmSessionFactory.class); @@ -137,10 +140,16 @@ // create the hibernate configuration configuration = new Configuration(); if (configResource!=null) { - log.debug("using '"+configResource+"' as hibernate configuration for jbpm"); + if(log.isDebugEnabled()) + { + log.debug("using '"+configResource+"' as hibernate configuration for jbpm"); + } configuration.configure(configResource); } else { - log.debug("using the default hibernate configuration file: hibernate.cfg.xml"); + if(log.isDebugEnabled()) + { + log.debug("using the default hibernate configuration file: hibernate.cfg.xml"); + } configuration.configure(); } @@ -153,7 +162,10 @@ } catch (IOException e) { throw new JbpmException("couldn't load the hibernate properties from resource '"+hibernatePropertiesResource+"'", e); } - log.debug("overriding hibernate properties with "+ hibernateProperties); + if(log.isDebugEnabled()) + { + log.debug("overriding hibernate properties with "+ hibernateProperties); + } configuration.setProperties(hibernateProperties); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -123,7 +123,10 @@ public void deleteJob(Job job) { try { session.delete(job); - log.debug("deleted " + job); + if(log.isDebugEnabled()) + { + log.debug("deleted " + job); + } } catch (HibernateException e) { throw new JbpmException("could not delete " + job, e); @@ -230,7 +233,10 @@ int entityCount = session.getNamedQuery("JobSession.deleteJobsForProcessInstance") .setParameter("processInstance", processInstance) .executeUpdate(); - log.debug("deleted " + entityCount + " jobs for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("deleted " + entityCount + " jobs for " + processInstance); + } // prevent further repetitions List<?> timers = session.getNamedQuery("JobSession.findRepeatingTimersForProcessInstance") @@ -248,7 +254,10 @@ for (Timer timer : CollectionUtil.checkList(timers, Timer.class)) { timer.setRepeat(null); } - log.debug("prevented further repetitions of " + timers); + if(log.isDebugEnabled()) + { + log.debug("prevented further repetitions of " + timers); + } } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -85,8 +85,10 @@ throw new JbpmException("converter-ids must be of length 1 (to be stored in a char)"); if (convertersByDatabaseId.containsKey(databaseId)) throw new JbpmException("duplicate converter id: '" + databaseId + "'"); - - log.debug("adding converter '" + databaseId + "', '" + converter + "'"); + if(log.isDebugEnabled()) + { + log.debug("adding converter '" + databaseId + "', '" + converter + "'"); + } convertersByClassNames.put(converter.getClass().getName(), converter); convertersByDatabaseId.put(databaseId, converter); convertersIds.put(converter, databaseId); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -84,7 +84,10 @@ if (cfgXmlResource != null) { // use the configured file name URL cfgURL = Thread.currentThread().getContextClassLoader().getResource(cfgXmlResource); - log.debug("creating hibernate configuration resource '" + cfgURL + "'"); + if(log.isDebugEnabled()) + { + log.debug("creating hibernate configuration resource '" + cfgURL + "'"); + } configuration.configure(cfgXmlResource); } else { log.debug("using default hibernate configuration resource (hibernate.cfg.xml)"); @@ -93,7 +96,10 @@ // if the properties are specified in a separate file if (propertiesResource != null) { - log.debug("using hibernate properties from resource '" + propertiesResource + "'"); + if(log.isDebugEnabled()) + { + log.debug("using hibernate properties from resource '" + propertiesResource + "'"); + } // load the properties Properties properties = loadPropertiesFromResource(propertiesResource); if (!properties.isEmpty()) { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/ActionTypes.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/ActionTypes.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/ActionTypes.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -81,7 +81,10 @@ } catch (Exception e) { // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. - log.debug("action '"+elementTag+"' will not be available. class '"+className+"' couldn't be loaded"); + if(log.isDebugEnabled()) + { + log.debug("action '"+elementTag+"' will not be available. class '"+className+"' couldn't be loaded"); + } } } return types; Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -118,7 +118,10 @@ Map<String, Object> outputMap = new HashMap<String, Object>(); try { - log.debug("script input: " + inputMap); + if(log.isDebugEnabled()) + { + log.debug("script input: " + inputMap); + } Interpreter interpreter = new Interpreter(); for (Map.Entry<String, Object> entry : inputMap.entrySet()) { String inputName = entry.getKey(); @@ -130,7 +133,10 @@ Object outputValue = interpreter.get(outputName); outputMap.put(outputName, outputValue); } - log.debug("script output: " + outputMap); + if(log.isDebugEnabled()) + { + log.debug("script output: " + outputMap); + } } catch (ParseException e) { throw new DelegationException("parse error occurred", e); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/EventCallback.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/EventCallback.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/EventCallback.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -89,7 +89,10 @@ public void afterCompletion(int status) { if (status == Status.STATUS_COMMITTED) { - log.debug("sending '" + event + "' notification"); + if(log.isDebugEnabled()) + { + log.debug("sending '" + event + "' notification"); + } Semaphore eventSemaphore = getEventSemaphore(event); eventSemaphore.release(); } @@ -155,11 +158,17 @@ } public static void waitForEvent(int occurrences, String event, long timeout) { - log.debug("waiting for " + event); + if(log.isDebugEnabled()) + { + log.debug("waiting for " + event); + } Semaphore eventSemaphore = getEventSemaphore(event); try { if (eventSemaphore.tryAcquire(occurrences, timeout, TimeUnit.MILLISECONDS)) { - log.debug("received '" + event + "' notification"); + if(log.isDebugEnabled()) + { + log.debug("received '" + event + "' notification"); + } } else { throw new JbpmException("event '" + event + "' did not occur within " + timeout + " ms"); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -176,7 +176,10 @@ // event handling /////////////////////////////////////////////////////////// public void fireEvent(String eventType, ExecutionContext executionContext) { - log.debug("event '" + eventType + "' on " + this + " for " + executionContext.getToken()); + if(log.isDebugEnabled()) + { + log.debug("event '" + eventType + "' on " + this + " for " + executionContext.getToken()); + } try { executionContext.setEventSource(this); @@ -268,7 +271,10 @@ executionContext.setAction(action); // execute the action - log.debug("executing " + action); + if(log.isDebugEnabled()) + { + log.debug("executing " + action); + } String lockOwnerId = "token[" + token.getId() + "]"; try { if (actionMustBeLocked) { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -745,7 +745,10 @@ { throw new JbpmException("token '" + id + "' can't be locked by '" + lockOwnerId + "' cause it's already locked by '" + lock + "'"); } - log.debug("token[" + id + "] is locked by " + lockOwnerId); + if(log.isDebugEnabled()) + { + log.debug("token[" + id + "] is locked by " + lockOwnerId); + } lock = lockOwnerId; } @@ -762,7 +765,11 @@ { throw new JbpmException("'" + lockOwnerId + "' can't unlock token '" + id + "' because it was already locked by '" + lock + "'"); } - log.debug("token[" + id + "] is unlocked by " + lockOwnerId); + if(log.isDebugEnabled()) + { + log.debug("token[" + id + "] is unlocked by " + lockOwnerId); + } + lock = null; } @@ -780,7 +787,10 @@ { log.warn("Unlock of token '" + id + "' forced, but it is not locked"); } - log.debug("Foce unlock of token[" + id + "] which was locked by " + lock); + if(log.isDebugEnabled()) + { + log.debug("Foce unlock of token[" + id + "] which was locked by " + lock); + } lock = null; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Decision.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -152,8 +152,10 @@ if (transition == null) throw new JbpmException("decision cannot select transition: " + this); - - log.debug("decision did not select transition, taking default " + transition); + if(log.isDebugEnabled()) + { + log.debug("decision did not select transition, taking default " + transition); + } } // since the decision node evaluates condition expressions, the condition of the @@ -161,7 +163,10 @@ // the standard condition enforcement in the transitions after a decision node. transition.removeConditionEnforcement(); - log.debug("decision '" + name + "' is taking " + transition); + if(log.isDebugEnabled()) + { + log.debug("decision '" + name + "' is taking " + transition); + } executionContext.leaveNode(transition); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -112,7 +112,10 @@ // obtain update lock by default (LockMode.UPGRADE) LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode) : LockMode.UPGRADE; - log.debug("acquiring " + lockMode + " lock on " + parentToken); + if(log.isDebugEnabled()) + { + log.debug("acquiring " + lockMode + " lock on " + parentToken); + } // lock updates as appropriate, no need to flush here session.lock(parentToken, lockMode); } @@ -191,7 +194,10 @@ String concurrentTokenName = childTokenNames.next(); Token concurrentToken = parentToken.getChild(concurrentTokenName); if (concurrentToken.isAbleToReactivateParent()) { - log.debug("join will not reactivate parent: found concurrent " + concurrentToken); + if(log.isDebugEnabled()) + { + log.debug("join will not reactivate parent: found concurrent " + concurrentToken); + } return false; } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/NodeTypes.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/NodeTypes.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/NodeTypes.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -76,7 +76,10 @@ } catch (Exception e) { if (!"org.jboss.seam.jbpm.Page".equals(className)) { - log.debug("node '"+elementTag+"' will not be available. class '"+className+"' couldn't be loaded"); + if(log.isDebugEnabled()) + { + log.debug("node '"+elementTag+"' will not be available. class '"+className+"' couldn't be loaded"); + } } } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/ProcessState.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -125,15 +125,24 @@ if (subProcessDefinition != null) { - log.debug("subprocess for process-state '" + name + "' bound to " + subProcessDefinition); + if(log.isDebugEnabled()) + { + log.debug("subprocess for process-state '" + name + "' bound to " + subProcessDefinition); + } } else if (subProcessName != null) { - log.debug("subprocess for process-state '" + name + "' will be late bound to " + subProcessName); + if(log.isDebugEnabled()) + { + log.debug("subprocess for process-state '" + name + "' will be late bound to " + subProcessName); + } } else { - log.debug("subprocess for process-state '" + name + "' not yet bound"); + if(log.isDebugEnabled()) + { + log.debug("subprocess for process-state '" + name + "' not yet bound"); + } } this.variableAccesses = new HashSet<VariableAccess>(jpdlReader.readVariableAccesses(processStateElement)); @@ -196,7 +205,10 @@ String variableName = variableAccess.getVariableName(); Object value = superContextInstance.getVariable(variableName, superProcessToken); String mappedName = variableAccess.getMappedName(); - log.debug("copying super process var '" + variableName + "' to sub process var '" + mappedName + "': " + value); + if(log.isDebugEnabled()) + { + log.debug("copying super process var '" + variableName + "' to sub process var '" + mappedName + "': " + value); + } if (value != null) { subContextInstance.setVariable(mappedName, value); @@ -233,7 +245,10 @@ String mappedName = variableAccess.getMappedName(); Object value = subContextInstance.getVariable(mappedName); String variableName = variableAccess.getVariableName(); - log.debug("copying sub process var '" + mappedName + "' to super process var '" + variableName + "': " + value); + if(log.isDebugEnabled()) + { + log.debug("copying sub process var '" + mappedName + "' to super process var '" + variableName + "': " + value); + } if (value != null) { superContextInstance.setVariable(variableName, value, superProcessToken); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jcr/impl/AbstractJcrServiceFactory.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jcr/impl/AbstractJcrServiceFactory.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jcr/impl/AbstractJcrServiceFactory.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -44,7 +44,10 @@ Session session = null; try { Repository jcrRepository = getRepository(); - log.debug("opening jcr session "+(username!=null ? username : "")+" "+(workspace!=null ? workspace : "")); + if(log.isDebugEnabled()) + { + log.debug("opening jcr session "+(username!=null ? username : "")+" "+(workspace!=null ? workspace : "")); + } if ( (username==null) && (workspace==null) ) { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -22,7 +22,10 @@ } public boolean execute(JbpmContext jbpmContext) throws Exception { - log.debug("job[" + id + "] executes " + action); + if(log.isDebugEnabled()) + { + log.debug("job[" + id + "] executes " + action); + } // register process instance for automatic save // see https://jira.jboss.org/jira/browse/JBPM-1015 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -21,7 +21,10 @@ } public boolean execute(JbpmContext jbpmContext) throws Exception { - log.debug("job[" + id + "] executes " + node); + if(log.isDebugEnabled()) + { + log.debug("job[" + id + "] executes " + node); + } // register process instance for automatic save // see https://jira.jboss.org/jira/browse/JBPM-1015 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -52,7 +52,10 @@ // then execute the action if there is one if (action != null) { try { - log.debug("executing " + this); + if(log.isDebugEnabled()) + { + log.debug("executing " + this); + } if (graphElement != null) { graphElement.executeAction(action, executionContext); } @@ -68,7 +71,10 @@ try { // give that graphElement a chance to catch the exception graphElement.raiseException(actionException, executionContext); - log.debug("timer exception got handled by '" + graphElement + "'"); + if(log.isDebugEnabled()) + { + log.debug("timer exception got handled by '" + graphElement + "'"); + } } catch (Exception handlerException) { // if the exception handler rethrows or the original exception results in a DelegationException... @@ -101,8 +107,10 @@ do { repeatDate = businessCalendar.add(repeatDate, interval); } while (repeatDate.getTime() <= currentTime); - - log.debug("scheduling " + this + " for repeat on: " + formatDueDate(repeatDate)); + if(log.isDebugEnabled()){ + log.debug("scheduling " + this + " for repeat on: " + formatDueDate(repeatDate)); + } + dueDate = repeatDate; // unlock timer so that: Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -43,7 +43,10 @@ public synchronized void start() { if (!isStarted) { - log.debug("starting job executor '" + name + "'..."); + if(log.isDebugEnabled()) + { + log.debug("starting job executor '" + name + "'..."); + } for (int i = 0; i < nbrOfThreads; i++) { startThread(); } @@ -51,7 +54,10 @@ isStarted = true; } else { - log.debug("ignoring start: job executor '" + name + "' is already started'"); + if(log.isDebugEnabled()) + { + log.debug("ignoring start: job executor '" + name + "' is already started'"); + } } } @@ -66,7 +72,10 @@ public synchronized List<Thread> stop() { List<Thread> stoppedThreads; if (isStarted) { - log.debug("stopping job executor '" + name + "'..."); + if(log.isDebugEnabled()) + { + log.debug("stopping job executor '" + name + "'..."); + } isStarted = false; stoppedThreads = new ArrayList<Thread>(threads.size()); @@ -77,7 +86,10 @@ if (lockMonitorThread != null) lockMonitorThread.deactivate(); } else { - log.debug("ignoring stop: job executor '" + name + "' not started"); + if(log.isDebugEnabled()) + { + log.debug("ignoring stop: job executor '" + name + "' not started"); + } stoppedThreads = Collections.emptyList(); } return stoppedThreads; @@ -95,8 +107,10 @@ String threadName = getNextThreadName(); Thread thread = createThread(threadName); threads.put(threadName, thread); - - log.debug("starting new job executor thread '" + threadName + "'"); + if(log.isDebugEnabled()) + { + log.debug("starting new job executor thread '" + threadName + "'"); + } thread.start(); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -117,13 +117,21 @@ if (job != null) { if (job.isExclusive()) { ProcessInstance processInstance = job.getProcessInstance(); - log.debug("loaded exclusive " + job + ", finding exclusive jobs for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("loaded exclusive " + job + ", finding exclusive jobs for " + processInstance); + } acquiredJobs = jobSession.findExclusiveJobs(lockOwner, processInstance); - log.debug("trying to obtain locks on " + acquiredJobs + " for " + processInstance); + if(log.isDebugEnabled()) + { + log.debug("trying to obtain locks on " + acquiredJobs + " for " + processInstance); + } } else { acquiredJobs = Collections.singletonList(job); - log.debug("trying to obtain lock on " + job); + if(log.isDebugEnabled()){ + log.debug("trying to obtain lock on " + job); + } } Date lockTime = new Date(); @@ -139,12 +147,18 @@ finally { try { jbpmContext.close(); - log.debug("obtained lock on jobs: " + acquiredJobs); + if(log.isDebugEnabled()) + { + log.debug("obtained lock on jobs: " + acquiredJobs); + } } catch (JbpmPersistenceException e) { // if this is a stale state exception, keep it quiet if (DbPersistenceService.isStaleStateException(e)) { - log.debug("optimistic locking failed, could not acquire jobs " + acquiredJobs); + if(log.isDebugEnabled()) + { + log.debug("optimistic locking failed, could not acquire jobs " + acquiredJobs); + } StaleObjectLogConfigurer.getStaleObjectExceptionsLog().error( "optimistic locking failed, could not acquire jobs " + acquiredJobs, e); acquiredJobs = Collections.emptyList(); @@ -163,8 +177,10 @@ try { JobSession jobSession = jbpmContext.getJobSession(); job = jobSession.loadJob(job.getId()); - - log.debug("executing " + job); + if(log.isDebugEnabled()) + { + log.debug("executing " + job); + } try { if (job.execute(jbpmContext)) { jobSession.deleteJob(job); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -80,7 +80,10 @@ JobSession jobSession = jbpmContext.getJobSession(); overdueJobs = jobSession.findJobsWithOverdueLockTime(threshold); for (Job job : overdueJobs) { - log.debug("unlocking " + job + " owned by thread " + job.getLockOwner()); + if(log.isDebugEnabled()) + { + log.debug("unlocking " + job + " owned by thread " + job.getLockOwner()); + } job.setLockOwner(null); job.setLockTime(null); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/BeanMethod.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/BeanMethod.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/BeanMethod.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -15,7 +15,9 @@ } public Object invoke(Object object) throws InvocationTargetException, IllegalArgumentException, IllegalAccessException { - log.debug("invoking expression method '"+method.getName()+"'"); + if(log.isDebugEnabled()){ + log.debug("invoking expression method '"+method.getName()+"'"); + } return method.invoke(object, (Object[]) null); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -107,7 +107,9 @@ URL schemaURL = classLoader.getResource(schemaResource); if (schemaURL != null) { String schemaLocation = schemaURL.toString(); - log.debug("schema resource found: " + schemaResource); + if(log.isDebugEnabled()){ + log.debug("schema resource found: " + schemaResource); + } schemaLocations.add(schemaLocation); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/logging/exe/LoggingInstance.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -106,13 +106,15 @@ void logLog(String indentation, ProcessLog processLog) { boolean isComposite = processLog instanceof CompositeLog; - log.debug(indentation + if(log.isDebugEnabled()){ + log.debug(indentation + (isComposite ? "+ [" : " [") + processLog.getIndex() + "] " + processLog + " on " + processLog.getToken()); + } if (isComposite) { CompositeLog compositeLog = (CompositeLog) processLog; List<ProcessLog> children = compositeLog.getChildren(); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -221,7 +221,9 @@ private static void sendMailInternal(Properties mailServerProperties, String fromAddress, List recipients, List bccRecipients, String subject, String text) throws Exception { - log.debug("sending email to '" + recipients + "' " + (bccRecipients != null ? "and in bcc to '" + bccRecipients + "' " : "") + "about '" + subject + "'"); + if(log.isDebugEnabled()){ + log.debug("sending email to '" + recipients + "' " + (bccRecipients != null ? "and in bcc to '" + bccRecipients + "' " : "") + "about '" + subject + "'"); + } Session session = Session.getDefaultInstance(mailServerProperties, null); MimeMessage message = new MimeMessage(session); if (fromAddress != null) Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/msg/db/DbMessageService.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/msg/db/DbMessageService.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/msg/db/DbMessageService.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -49,7 +49,9 @@ public void send(Job job) { jobSession.saveJob(job); - log.debug("saved "+job); + if(log.isDebugEnabled()){ + log.debug("saved "+job); + } hasProducedJobs = true; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -93,7 +93,9 @@ mustConnectionBeClosed = false; } else if (connection != null) { - log.debug("creating hibernate session on " + connection); + if(log.isDebugEnabled()){ + log.debug("creating hibernate session on " + connection); + } session = getSessionFactory().openSession(connection); mustSessionBeClosed = true; mustSessionBeFlushed = true; @@ -117,7 +119,9 @@ public void beginTransaction() { log.debug("beginning hibernate transaction"); transaction = session.beginTransaction(); - log.debug("begun " + transaction); + if(log.isDebugEnabled()){ + log.debug("begun " + transaction); + } } public void endTransaction() { @@ -172,9 +176,11 @@ } if (session != null) { connection = session.connection(); - log.debug("fetched " - + connection - + " from hibernate session, client is responsible for closing it!"); + if(log.isDebugEnabled()){ + log.debug("fetched " + + connection + + " from hibernate session, client is responsible for closing it!"); + } mustConnectionBeClosed = false; } } @@ -222,7 +228,10 @@ protected Exception commit() { try { - log.debug("committing " + transaction); + if(log.isDebugEnabled()) + { + log.debug("committing " + transaction); + } mustSessionBeFlushed = false; // commit does a flush anyway transaction.commit(); } @@ -242,7 +251,10 @@ protected Exception rollback() { try { - log.debug("rolling back " + transaction); + if(log.isDebugEnabled()) + { + log.debug("rolling back " + transaction); + } // flushing updates that will be rolled back is not very clever :-) mustSessionBeFlushed = false; transaction.rollback(); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceServiceFactory.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceServiceFactory.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceServiceFactory.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -95,7 +95,9 @@ if (sessionFactoryJndiName != null) { - log.debug("looking up hibernate session factory in jndi '" + sessionFactoryJndiName + "'"); + if(log.isDebugEnabled()){ + log.debug("looking up hibernate session factory in jndi '" + sessionFactoryJndiName + "'"); + } sessionFactory = (SessionFactory)JndiUtil.lookup(sessionFactoryJndiName, SessionFactory.class); } @@ -112,7 +114,9 @@ { if ((dataSource == null) && (dataSourceJndiName != null)) { - log.debug("looking up datasource from jndi location '" + dataSourceJndiName + "'"); + if(log.isDebugEnabled()){ + log.debug("looking up datasource from jndi location '" + dataSourceJndiName + "'"); + } dataSource = (DataSource)JndiUtil.lookup(dataSourceJndiName, DataSource.class); } return dataSource; Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -65,7 +65,9 @@ public void beginTransaction() { try { - log.debug("beginning " + transaction); + if(log.isDebugEnabled()) { + log.debug("beginning " + transaction); + } JtaDbPersistenceServiceFactory jtaFactory = (JtaDbPersistenceServiceFactory) persistenceServiceFactory; transaction = jtaFactory.getUserTransaction(); transaction.begin(); @@ -86,7 +88,9 @@ } protected Exception commit() { - log.debug("committing " + transaction); + if(log.isDebugEnabled()) { + log.debug("committing " + transaction); + } try { transaction.commit(); return null; @@ -109,7 +113,9 @@ } protected Exception rollback() { - log.debug("rolling back " + transaction); + if(log.isDebugEnabled()) { + log.debug("rolling back " + transaction); + } try { transaction.rollback(); return null; Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/Services.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/Services.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/Services.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -239,7 +239,9 @@ Service service = services.get(serviceName); if (service != null) { try { - log.debug("closing service '" + serviceName + "': " + service); + if(log.isDebugEnabled()){ + log.debug("closing service '" + serviceName + "': " + service); + } service.close(); } catch (JbpmPersistenceException e) { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/save/CascadeSaveOperation.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/save/CascadeSaveOperation.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/svc/save/CascadeSaveOperation.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -35,7 +35,9 @@ private static final long serialVersionUID = 1L; public void save(ProcessInstance processInstance, JbpmContext jbpmContext) { - log.debug("cascading save of '" + processInstance + "'"); + if(log.isDebugEnabled()) { + log.debug("cascading save of '" + processInstance + "'"); + } Set<ProcessInstance> cascadedProcessInstances = new HashSet<ProcessInstance>(); cascadedProcessInstances.add(processInstance); cascadeSave(processInstance.removeCascadeProcessInstances(), jbpmContext, @@ -55,7 +57,9 @@ Set<ProcessInstance> cascadedProcessInstances) { if (!cascadedProcessInstances.contains(cascadeInstance)) { Collection<ProcessInstance> cascadeProcessInstances = cascadeInstance.removeCascadeProcessInstances(); - log.debug("cascading save to process instance '" + cascadeInstance + "'"); + if(log.isDebugEnabled()) { + log.debug("cascading save to process instance '" + cascadeInstance + "'"); + } jbpmContext.save(cascadeInstance); cascadedProcessInstances.add(cascadeInstance); cascadeSave(cascadeProcessInstances, jbpmContext, cascadedProcessInstances); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -98,10 +98,14 @@ if (variableAccess.isReadable()) { String variableName = variableAccess.getVariableName(); Object value = contextInstance.getVariable(variableName, token); - log.debug("creating task instance variable '" + mappedName + "' from process variable '" + variableName + "', value '" + value + "'"); + if(log.isDebugEnabled()){ + log.debug("creating task instance variable '" + mappedName + "' from process variable '" + variableName + "', value '" + value + "'"); + } taskInstance.setVariableLocally(mappedName, value); } else { - log.debug("creating task instance local variable '" + mappedName + "'. initializing with null value."); + if(log.isDebugEnabled()){ + log.debug("creating task instance local variable '" + mappedName + "'. initializing with null value."); + } taskInstance.setVariableLocally(mappedName, null); } } @@ -165,7 +169,9 @@ if (variableAccess.isWritable()) { Object value = taskInstance.getVariable(mappedName); if (value != null) { - log.debug("submitting task variable '" + mappedName + "' to process variable '" + variableName + "', value '" + value + "'"); + if(log.isDebugEnabled()){ + log.debug("submitting task variable '" + mappedName + "' to process variable '" + variableName + "', value '" + value + "'"); + } contextInstance.setVariable(variableName, value, token); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -119,11 +119,13 @@ if (variableInstances != null) { ContextInstance contextInstance = token.getProcessInstance().getContextInstance(); for (VariableInstance variableInstance : variableInstances.values()) { - log.debug("flushing variable '" - + variableInstance.getName() - + "' from task '" - + name - + "' to process variables"); + if(log.isDebugEnabled()) { + log.debug("flushing variable '" + + variableInstance.getName() + + "' from task '" + + name + + "' to process variables"); + } // This might be optimized, but this was the simplest way to make a clone of the variable // instance. contextInstance.setVariable(variableInstance.getName(), variableInstance.getValue(), token); @@ -255,7 +257,9 @@ this.previousActorId = this.actorId; this.actorId = actorId; if ((swimlaneInstance != null) && (overwriteSwimlane)) { - log.debug("assigning task '" + name + "' to '" + actorId + "'"); + if(log.isDebugEnabled()){ + log.debug("assigning task '" + name + "' to '" + actorId + "'"); + } swimlaneInstance.setActorId(actorId); } @@ -433,17 +437,22 @@ || ((task != null) && (token != null) && (task.getTaskNode() != null) && (task.getTaskNode().completionTriggersSignal(this)))) { if (transition == null) { - log.debug("completion of task '" - + task.getName() - + "' results in taking the default transition"); + + if(log.isDebugEnabled()){ + log.debug("completion of task '" + + task.getName() + + "' results in taking the default transition"); + } token.signal(); } else { - log.debug("completion of task '" - + task.getName() - + "' results in taking transition '" - + transition - + "'"); + if(log.isDebugEnabled()){ + log.debug("completion of task '" + + task.getName() + + "' results in taking transition '" + + transition + + "'"); + } token.signal(transition); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java 2009-03-30 17:11:22 UTC (rev 4360) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/JndiUtil.java 2009-03-30 19:46:57 UTC (rev 4361) @@ -40,7 +40,10 @@ object = initialContext.lookup(jndiName); object = PortableRemoteObject.narrow(object, type); // fetch from JNDI - log.debug("fetched '"+object+"' from JNDI location '"+jndiName+"'"); + if(log.isDebugEnabled()) + { + log.debug("fetched '"+object+"' from JNDI location '"+jndiName+"'"); + } } catch (Exception e) { throw new JndiLookupException("couldn't fetch '"+jndiName+"' from jndi", e); }