[jbpm-commits] JBoss JBPM SVN: r3880 - in jbpm4/trunk/modules: enterprise/src/test/java/org/jbpm/enterprise/internal/custom and 44 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sun Feb 15 08:22:38 EST 2009
Author: tom.baeyens at jboss.com
Date: 2009-02-15 08:22:37 -0500 (Sun, 15 Feb 2009)
New Revision: 3880
Added:
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ErrorTriggeredFileHandler.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14LogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFormatter.java
Removed:
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ErrorTriggeredFileHandler.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14Log.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLog.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFactory.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java
Modified:
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/IntegrationTestSetup.java
jbpm4/trunk/modules/examples/src/test/resources/logging.properties
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EsbActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ActivitiesParser.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblemsDeployer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/PvmNamingStrategy.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/HibernateSessionResource.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CollectionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextTypeRefDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/FieldOperation.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/MethodInvokerListener.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java
jbpm4/trunk/modules/pvm/src/test/resources/logging.properties
jbpm4/trunk/modules/task/src/test/resources/logging.properties
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
jbpm4/trunk/modules/test-db/src/main/resources/logging.properties
jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
jbpm4/trunk/modules/test-load/src/test/resources/logging.properties
jbpm4/trunk/modules/test-pojo/src/main/resources/logging.properties
Log:
JBPM-2011 moved log package to org.jbpm.internal.log package
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -34,7 +34,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* Stateless session command executor.
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -41,8 +41,8 @@
import javax.naming.NamingException;
import org.jbpm.cmd.Command;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Job;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
/**
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,8 +26,8 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.session.DbSession;
import org.jbpm.session.TimerSession;
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.session.DbSession;
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -36,7 +36,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,9 +25,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.jbpm.internal.log.Log;
import org.jbpm.listener.EventListener;
import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,9 +26,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.jbpm.internal.log.Log;
import org.jbpm.listener.EventListener;
import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -34,7 +34,7 @@
import org.jbpm.enterprise.internal.ejb.CommandExecutorSLSB;
import org.jbpm.enterprise.internal.ejb.LocalCommandExecutor;
import org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.test.enterprise.IntegrationTestSetup;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -41,7 +41,7 @@
import org.jbpm.enterprise.internal.custom.InsertCommentCmd;
import org.jbpm.enterprise.internal.custom.RemoveCommentCmd;
import org.jbpm.enterprise.internal.ejb.CommandReceiverMDB;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.test.enterprise.IntegrationTestSetup;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -38,7 +38,7 @@
import org.jbpm.enterprise.internal.custom.NoisyListener;
import org.jbpm.enterprise.internal.custom.WaitState;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -29,7 +29,7 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/IntegrationTestSetup.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/IntegrationTestSetup.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/IntegrationTestSetup.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -33,7 +33,7 @@
import junit.extensions.TestSetup;
import junit.framework.TestSuite;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* A test setup that deploys/undeploys archives
Modified: jbpm4/trunk/modules/examples/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EsbActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EsbActivity.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EsbActivity.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jbpm.activity.ActivityExecution;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ExpressionEvaluator;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlActivity.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jbpm.JbpmException;
import org.jbpm.activity.ActivityExecution;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ActivitiesParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ActivitiesParser.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ActivitiesParser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -21,7 +21,7 @@
*/
package org.jbpm.jpdl.xml;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.xml.Binding;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -29,9 +29,9 @@
import javax.xml.parsers.SAXParser;
import org.jbpm.activity.ActivityBehaviour;
+import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.JpdlProcessDefinition;
import org.jbpm.jpdl.activity.JpdlActivityBinding;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.util.ReflectUtil;
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,8 +22,8 @@
package org.jbpm.jpdl;
import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.xml.JpdlParser;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.test.BaseJbpmTestCase;
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ErrorTriggeredFileHandler.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ErrorTriggeredFileHandler.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/ErrorTriggeredFileHandler.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+import java.io.IOException;
+import java.util.logging.FileHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
+import java.util.logging.MemoryHandler;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ErrorTriggeredFileHandler extends Handler {
+
+ private static final int DEFAULT_SIZE = 500;
+ private static final Level DEFAULT_PUSH_LEVEL = Level.SEVERE;
+ private static final String DEFAULT_PATTERN = "%h/jbpm%u.log";
+
+ DecoratedMemoryHandler memoryHandler = null;
+ FileHandler fileHandler = null;
+
+ public ErrorTriggeredFileHandler() throws SecurityException, IOException {
+ fileHandler = getConfiguredTarget();
+ memoryHandler = new DecoratedMemoryHandler(fileHandler, getConfiguredSize(), getConfiguredPushLevel());
+ }
+
+ private static Level getConfiguredPushLevel() {
+ LogManager manager = LogManager.getLogManager();
+ String pushLevelText = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".push");
+ if (pushLevelText == null) {
+ return DEFAULT_PUSH_LEVEL;
+ }
+ try {
+ return Level.parse(pushLevelText.trim());
+ } catch (Exception ex) {
+ return DEFAULT_PUSH_LEVEL;
+ }
+ }
+
+ protected static int getConfiguredSize() {
+ LogManager manager = LogManager.getLogManager();
+ String sizeText = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".size");
+ if (sizeText == null) {
+ return DEFAULT_SIZE;
+ }
+ try {
+ return Integer.parseInt(sizeText.trim());
+ } catch (Exception ex) {
+ return DEFAULT_SIZE;
+ }
+ }
+
+ protected static FileHandler getConfiguredTarget() throws SecurityException, IOException {
+ LogManager manager = LogManager.getLogManager();
+ String pattern = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".pattern");
+ if (pattern == null) {
+ pattern = DEFAULT_PATTERN;
+ }
+ return new FileHandler(pattern);
+ }
+
+
+ public class DecoratedMemoryHandler extends MemoryHandler {
+ public DecoratedMemoryHandler(FileHandler target, int size, Level pushLevel) {
+ super(target, size, pushLevel);
+ }
+ public void push() {
+ fileHandler.setFormatter(new LogFormatter());
+ super.push();
+ LogRecord emptyLine = new LogRecord(Level.INFO, "");
+ emptyLine.setLoggerName("");
+ fileHandler.publish(emptyLine);
+ LogRecord line = new LogRecord(Level.INFO, "---- END OF TRIGGERED PUSH ---------------------------------------------------");
+ line.setLoggerName("");
+ fileHandler.publish(line);
+ fileHandler.publish(emptyLine);
+ fileHandler.publish(emptyLine);
+ }
+ }
+
+ public void close() throws SecurityException {
+ memoryHandler.close();
+ }
+
+ public void flush() {
+ memoryHandler.flush();
+ }
+
+ public void publish(LogRecord record) {
+ memoryHandler.publish(record);
+ }
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jbpm.internal.log.Log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class Jdk14Log extends Log {
+
+ Logger log;
+
+ public Jdk14Log(Logger logger) {
+ this.log = logger;
+ }
+
+ public void error(String msg) {
+ log.log(Level.SEVERE, msg);
+ }
+
+ public void error(String msg, Throwable exception) {
+ log.log(Level.SEVERE, msg, exception);
+ }
+
+ public boolean isInfoEnabled() {
+ return log.isLoggable(Level.INFO);
+ }
+
+ public void info(String msg) {
+ log.log(Level.INFO, msg);
+ }
+
+ public void info(String msg, Throwable exception) {
+ log.log(Level.INFO, msg, exception);
+ }
+
+ public boolean isDebugEnabled() {
+ return log.isLoggable(Level.FINE);
+ }
+
+ public void debug(String msg) {
+ log.log(Level.FINE, msg);
+ }
+
+ public void debug(String msg, Throwable exception) {
+ log.log(Level.FINE, msg, exception);
+ }
+
+ public boolean isTraceEnabled() {
+ return log.isLoggable(Level.FINEST);
+ }
+
+ public void trace(String msg) {
+ log.log(Level.FINEST, msg);
+ }
+
+ public void trace(String msg, Throwable exception) {
+ log.log(Level.FINEST, msg, exception);
+ }
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14LogFactory.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14LogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class Jdk14LogFactory implements LogFactory {
+
+ public Jdk14LogFactory() {
+ initializeJdk14Logging();
+ }
+
+ public Log getLog(String name) {
+ return new Jdk14Log(Logger.getLogger(name));
+ }
+
+ /** redirects commons logging to JDK 1.4 logging. This can be handy when
+ * you have log4j on the classpath, but still want to use the JDK logging. */
+ public static synchronized void redirectCommonsToJdk14() {
+ System.setProperty("org.apache.commons.logging.Log",
+ "org.apache.commons.logging.impl.Jdk14Logger" );
+ }
+
+ /** configures JDK 1.4 logging from the resource file <code>logging.properties</code> */
+ public static synchronized void initializeJdk14Logging() {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ InputStream inputStream = classLoader.getResourceAsStream("logging.properties");
+ try {
+ if (inputStream != null) {
+ LogManager.getLogManager().readConfiguration(inputStream);
+
+ String redirectCommons = LogManager.getLogManager().getProperty("redirect.commons.logging");
+ if ( (redirectCommons!=null)
+ && (! redirectCommons.equalsIgnoreCase("disabled"))
+ && (! redirectCommons.equalsIgnoreCase("off"))
+ && (! redirectCommons.equalsIgnoreCase("false"))
+ ) {
+ redirectCommonsToJdk14();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("couldn't initialize logging properly", e);
+ } finally {
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public abstract class Log {
+
+ static LogFactory logFactory;
+
+ public static synchronized Log getLog(String name) {
+ if (logFactory==null) {
+
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
+ // if logging.properties is available on the classpath
+ if (classLoader.getResource("logging.properties")!=null) {
+ logFactory = new Jdk14LogFactory();
+
+ // if log4j is available on the classpath
+ } else if (isLog4jAvailable(classLoader)) {
+ logFactory = new Log4jLogFactory();
+
+ } else {
+ logFactory = new Jdk14LogFactory();
+
+ }
+ }
+ return logFactory.getLog(name);
+ }
+
+ static boolean isLog4jAvailable(ClassLoader classLoader) {
+ try {
+ Class.forName("org.apache.log4j.LogManager", false, classLoader);
+ return true;
+ } catch (ClassNotFoundException e) {
+ return false;
+ }
+ }
+
+
+ public abstract void error(String msg);
+ public abstract void error(String msg, Throwable exception);
+
+ public abstract boolean isInfoEnabled();
+ public abstract void info(String msg);
+ public abstract void info(String msg, Throwable exception);
+
+ public abstract boolean isDebugEnabled();
+ public abstract void debug(String msg);
+ public abstract void debug(String msg, Throwable exception);
+
+ public abstract boolean isTraceEnabled();
+ public abstract void trace(String msg);
+ public abstract void trace(String msg, Throwable exception);
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+/**
+ * @author Tom Baeyens
+ */
+public class Log4jLog extends Log {
+
+ org.apache.log4j.Logger log;
+
+ public Log4jLog(org.apache.log4j.Logger log) {
+ this.log = log;
+ }
+
+ public void error(String msg) {
+ log.error(msg);
+ }
+
+ public void error(String msg, Throwable exception) {
+ log.error(msg, exception);
+ }
+
+ public boolean isInfoEnabled() {
+ return log.isInfoEnabled();
+ }
+
+ public void info(String msg) {
+ log.info(msg);
+ }
+
+ public void info(String msg, Throwable exception) {
+ log.info(msg, exception);
+ }
+
+ public boolean isDebugEnabled() {
+ return log.isDebugEnabled();
+ }
+
+ public void debug(String msg) {
+ log.debug(msg);
+ }
+
+ public void debug(String msg, Throwable exception) {
+ log.debug(msg, exception);
+ }
+
+ public boolean isTraceEnabled() {
+ return log.isTraceEnabled();
+ }
+
+ public void trace(String msg) {
+ log.trace(msg);
+ }
+
+ public void trace(String msg, Throwable exception) {
+ log.trace(msg, exception);
+ }
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLogFactory.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+import org.apache.log4j.LogManager;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class Log4jLogFactory implements LogFactory {
+
+ public Log getLog(String name) {
+ return new Log4jLog(LogManager.getLogger(name));
+ }
+
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFactory.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface LogFactory {
+
+ Log getLog(String name);
+
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFormatter.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFormatter.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/LogFormatter.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -0,0 +1,83 @@
+package org.jbpm.internal.log;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Formatter;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+public class LogFormatter extends Formatter {
+
+ static final String NEWLINE = System.getProperty("line.separator");
+ static final DateFormat dateTimeFormat = new SimpleDateFormat("HH:mm:ss,SSS");
+ static final Map<Level, String> levels = new HashMap<Level, String>();
+ private static Map<Integer, Integer> indentations = new HashMap<Integer, Integer>();
+
+
+ static {
+ levels.put(Level.ALL, "ALL");
+ levels.put(Level.CONFIG, "CFG");
+ levels.put(Level.FINE, "FIN");
+ levels.put(Level.FINER, "FNR");
+ levels.put(Level.FINEST, "FST");
+ levels.put(Level.INFO, "INF");
+ levels.put(Level.OFF, "OFF");
+ levels.put(Level.SEVERE, "SEV");
+ levels.put(Level.WARNING, "WRN");
+ }
+
+ public String format(LogRecord logRecord) {
+ StringWriter msg = new StringWriter();
+ if (logRecord.getThrown()!=null) {
+ msg.append("### EXCEPTION ###########################################");
+ msg.append(NEWLINE);
+ }
+ msg.append(dateTimeFormat.format(new Date()));
+ msg.append(" ");
+ msg.append(levels.get(logRecord.getLevel()));
+ msg.append(" ");
+
+ int threadId = logRecord.getThreadID();
+ for (int i=0; i<getIndentation(threadId); i++) {
+ msg.append(" ");
+ }
+
+ msg.append("| [");
+
+ String loggerName = logRecord.getLoggerName();
+ int dotIndex = loggerName.lastIndexOf('.');
+ if (dotIndex!=-1) {
+ loggerName = loggerName.substring(dotIndex+1);
+ }
+ msg.append(loggerName);
+
+ msg.append("] ");
+
+ msg.append(logRecord.getMessage());
+ if (logRecord.getThrown()!=null) {
+ msg.append(NEWLINE);
+ logRecord.getThrown().printStackTrace(new PrintWriter(msg));
+ msg.append("### EXCEPTION ###########################################");
+ }
+ msg.append(NEWLINE);
+ return msg.toString();
+ }
+
+ private int getIndentation(int threadId) {
+ Integer indentation = indentations.get(threadId);
+ if (indentation==null) {
+ indentation = indentations.size();
+ indentations.put(threadId, indentation);
+ }
+ return indentation;
+ }
+
+ public static void resetIndentation() {
+ indentations = new HashMap<Integer, Integer>();
+ }
+}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ErrorTriggeredFileHandler.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ErrorTriggeredFileHandler.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ErrorTriggeredFileHandler.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,115 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.log;
-
-import java.io.IOException;
-import java.util.logging.FileHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.LogRecord;
-import java.util.logging.MemoryHandler;
-
-
-/**
- * @author Tom Baeyens
- */
-public class ErrorTriggeredFileHandler extends Handler {
-
- private static final int DEFAULT_SIZE = 500;
- private static final Level DEFAULT_PUSH_LEVEL = Level.SEVERE;
- private static final String DEFAULT_PATTERN = "%h/jbpm%u.log";
-
- DecoratedMemoryHandler memoryHandler = null;
- FileHandler fileHandler = null;
-
- public ErrorTriggeredFileHandler() throws SecurityException, IOException {
- fileHandler = getConfiguredTarget();
- memoryHandler = new DecoratedMemoryHandler(fileHandler, getConfiguredSize(), getConfiguredPushLevel());
- }
-
- private static Level getConfiguredPushLevel() {
- LogManager manager = LogManager.getLogManager();
- String pushLevelText = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".push");
- if (pushLevelText == null) {
- return DEFAULT_PUSH_LEVEL;
- }
- try {
- return Level.parse(pushLevelText.trim());
- } catch (Exception ex) {
- return DEFAULT_PUSH_LEVEL;
- }
- }
-
- protected static int getConfiguredSize() {
- LogManager manager = LogManager.getLogManager();
- String sizeText = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".size");
- if (sizeText == null) {
- return DEFAULT_SIZE;
- }
- try {
- return Integer.parseInt(sizeText.trim());
- } catch (Exception ex) {
- return DEFAULT_SIZE;
- }
- }
-
- protected static FileHandler getConfiguredTarget() throws SecurityException, IOException {
- LogManager manager = LogManager.getLogManager();
- String pattern = manager.getProperty(ErrorTriggeredFileHandler.class.getName() + ".pattern");
- if (pattern == null) {
- pattern = DEFAULT_PATTERN;
- }
- return new FileHandler(pattern);
- }
-
-
- public class DecoratedMemoryHandler extends MemoryHandler {
- public DecoratedMemoryHandler(FileHandler target, int size, Level pushLevel) {
- super(target, size, pushLevel);
- }
- public void push() {
- fileHandler.setFormatter(new LogFormatter());
- super.push();
- LogRecord emptyLine = new LogRecord(Level.INFO, "");
- emptyLine.setLoggerName("");
- fileHandler.publish(emptyLine);
- LogRecord line = new LogRecord(Level.INFO, "---- END OF TRIGGERED PUSH ---------------------------------------------------");
- line.setLoggerName("");
- fileHandler.publish(line);
- fileHandler.publish(emptyLine);
- fileHandler.publish(emptyLine);
- }
- }
-
- public void close() throws SecurityException {
- memoryHandler.close();
- }
-
- public void flush() {
- memoryHandler.flush();
- }
-
- public void publish(LogRecord record) {
- memoryHandler.publish(record);
- }
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14Log.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14Log.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.log;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.jbpm.log.Log;
-
-
-/**
- * @author Tom Baeyens
- */
-public class Jdk14Log extends Log {
-
- Logger log;
-
- public Jdk14Log(Logger logger) {
- this.log = logger;
- }
-
- public void error(String msg) {
- log.log(Level.SEVERE, msg);
- }
-
- public void error(String msg, Throwable exception) {
- log.log(Level.SEVERE, msg, exception);
- }
-
- public boolean isInfoEnabled() {
- return log.isLoggable(Level.INFO);
- }
-
- public void info(String msg) {
- log.log(Level.INFO, msg);
- }
-
- public void info(String msg, Throwable exception) {
- log.log(Level.INFO, msg, exception);
- }
-
- public boolean isDebugEnabled() {
- return log.isLoggable(Level.FINE);
- }
-
- public void debug(String msg) {
- log.log(Level.FINE, msg);
- }
-
- public void debug(String msg, Throwable exception) {
- log.log(Level.FINE, msg, exception);
- }
-
- public boolean isTraceEnabled() {
- return log.isLoggable(Level.FINEST);
- }
-
- public void trace(String msg) {
- log.log(Level.FINEST, msg);
- }
-
- public void trace(String msg, Throwable exception) {
- log.log(Level.FINEST, msg, exception);
- }
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.log;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
-
-
-/**
- * @author Tom Baeyens
- */
-public class Jdk14LogFactory implements LogFactory {
-
- public Jdk14LogFactory() {
- initializeJdk14Logging();
- }
-
- public Log getLog(String name) {
- return new Jdk14Log(Logger.getLogger(name));
- }
-
- /** redirects commons logging to JDK 1.4 logging. This can be handy when
- * you have log4j on the classpath, but still want to use the JDK logging. */
- public static synchronized void redirectCommonsToJdk14() {
- System.setProperty("org.apache.commons.logging.Log",
- "org.apache.commons.logging.impl.Jdk14Logger" );
- }
-
- /** configures JDK 1.4 logging from the resource file <code>logging.properties</code> */
- public static synchronized void initializeJdk14Logging() {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- InputStream inputStream = classLoader.getResourceAsStream("logging.properties");
- try {
- if (inputStream != null) {
- LogManager.getLogManager().readConfiguration(inputStream);
-
- String redirectCommons = LogManager.getLogManager().getProperty("redirect.commons.logging");
- if ( (redirectCommons!=null)
- && (! redirectCommons.equalsIgnoreCase("disabled"))
- && (! redirectCommons.equalsIgnoreCase("off"))
- && (! redirectCommons.equalsIgnoreCase("false"))
- ) {
- redirectCommonsToJdk14();
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("couldn't initialize logging properly", e);
- } finally {
- if (inputStream != null) {
- try {
- inputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.log;
-
-
-/**
- * @author Tom Baeyens
- */
-public abstract class Log {
-
- static LogFactory logFactory;
-
- public static synchronized Log getLog(String name) {
- if (logFactory==null) {
-
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
- // if logging.properties is available on the classpath
- if (classLoader.getResource("logging.properties")!=null) {
- logFactory = new Jdk14LogFactory();
-
- // if log4j is available on the classpath
- } else if (isLog4jAvailable(classLoader)) {
- logFactory = new Log4jLogFactory();
-
- } else {
- logFactory = new Jdk14LogFactory();
-
- }
- }
- return logFactory.getLog(name);
- }
-
- static boolean isLog4jAvailable(ClassLoader classLoader) {
- try {
- Class.forName("org.apache.log4j.LogManager", false, classLoader);
- return true;
- } catch (ClassNotFoundException e) {
- return false;
- }
- }
-
-
- public abstract void error(String msg);
- public abstract void error(String msg, Throwable exception);
-
- public abstract boolean isInfoEnabled();
- public abstract void info(String msg);
- public abstract void info(String msg, Throwable exception);
-
- public abstract boolean isDebugEnabled();
- public abstract void debug(String msg);
- public abstract void debug(String msg, Throwable exception);
-
- public abstract boolean isTraceEnabled();
- public abstract void trace(String msg);
- public abstract void trace(String msg, Throwable exception);
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLog.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLog.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLog.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.log;
-
-/**
- * @author Tom Baeyens
- */
-public class Log4jLog extends Log {
-
- org.apache.log4j.Logger log;
-
- public Log4jLog(org.apache.log4j.Logger log) {
- this.log = log;
- }
-
- public void error(String msg) {
- log.error(msg);
- }
-
- public void error(String msg, Throwable exception) {
- log.error(msg, exception);
- }
-
- public boolean isInfoEnabled() {
- return log.isInfoEnabled();
- }
-
- public void info(String msg) {
- log.info(msg);
- }
-
- public void info(String msg, Throwable exception) {
- log.info(msg, exception);
- }
-
- public boolean isDebugEnabled() {
- return log.isDebugEnabled();
- }
-
- public void debug(String msg) {
- log.debug(msg);
- }
-
- public void debug(String msg, Throwable exception) {
- log.debug(msg, exception);
- }
-
- public boolean isTraceEnabled() {
- return log.isTraceEnabled();
- }
-
- public void trace(String msg) {
- log.trace(msg);
- }
-
- public void trace(String msg, Throwable exception) {
- log.trace(msg, exception);
- }
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLogFactory.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Log4jLogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.log;
-
-import org.apache.log4j.LogManager;
-
-
-/**
- * @author Tom Baeyens
- */
-public class Log4jLogFactory implements LogFactory {
-
- public Log getLog(String name) {
- return new Log4jLog(LogManager.getLogger(name));
- }
-
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFactory.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFactory.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.log;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface LogFactory {
-
- Log getLog(String name);
-
-}
Deleted: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,83 +0,0 @@
-package org.jbpm.log;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Formatter;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-
-public class LogFormatter extends Formatter {
-
- static final String NEWLINE = System.getProperty("line.separator");
- static final DateFormat dateTimeFormat = new SimpleDateFormat("HH:mm:ss,SSS");
- static final Map<Level, String> levels = new HashMap<Level, String>();
- private static Map<Integer, Integer> indentations = new HashMap<Integer, Integer>();
-
-
- static {
- levels.put(Level.ALL, "ALL");
- levels.put(Level.CONFIG, "CFG");
- levels.put(Level.FINE, "FIN");
- levels.put(Level.FINER, "FNR");
- levels.put(Level.FINEST, "FST");
- levels.put(Level.INFO, "INF");
- levels.put(Level.OFF, "OFF");
- levels.put(Level.SEVERE, "SEV");
- levels.put(Level.WARNING, "WRN");
- }
-
- public String format(LogRecord logRecord) {
- StringWriter msg = new StringWriter();
- if (logRecord.getThrown()!=null) {
- msg.append("### EXCEPTION ###########################################");
- msg.append(NEWLINE);
- }
- msg.append(dateTimeFormat.format(new Date()));
- msg.append(" ");
- msg.append(levels.get(logRecord.getLevel()));
- msg.append(" ");
-
- int threadId = logRecord.getThreadID();
- for (int i=0; i<getIndentation(threadId); i++) {
- msg.append(" ");
- }
-
- msg.append("| [");
-
- String loggerName = logRecord.getLoggerName();
- int dotIndex = loggerName.lastIndexOf('.');
- if (dotIndex!=-1) {
- loggerName = loggerName.substring(dotIndex+1);
- }
- msg.append(loggerName);
-
- msg.append("] ");
-
- msg.append(logRecord.getMessage());
- if (logRecord.getThrown()!=null) {
- msg.append(NEWLINE);
- logRecord.getThrown().printStackTrace(new PrintWriter(msg));
- msg.append("### EXCEPTION ###########################################");
- }
- msg.append(NEWLINE);
- return msg.toString();
- }
-
- private int getIndentation(int threadId) {
- Integer indentation = indentations.get(threadId);
- if (indentation==null) {
- indentation = indentations.size();
- indentations.put(threadId, indentation);
- }
- return indentation;
- }
-
- public static void resetIndentation() {
- indentations = new HashMap<Integer, Integer>();
- }
-}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -37,7 +37,7 @@
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.PvmEnvironment;
import org.jbpm.pvm.internal.env.PvmEnvironmentFactoryParser;
import org.jbpm.pvm.internal.stream.FileStreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,8 +28,8 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Job;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.jobexecutor.JobExceptionHandler;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblemsDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblemsDeployer.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblemsDeployer.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.JbpmException;
import org.jbpm.Problem;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jbpm.ProcessDefinition;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
import org.jbpm.pvm.internal.wire.binding.CheckProcessBinding;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import java.util.List;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jbpm.ProcessDefinition;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
import org.jbpm.session.PvmDbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,7 +28,7 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.env;
import org.jbpm.env.Context;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.util.Closable;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -12,7 +12,7 @@
import org.hibernate.usertype.ParameterizedType;
import org.hibernate.usertype.UserType;
import org.jbpm.Execution;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,10 +30,10 @@
import org.jbpm.client.ClientExecution;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Job;
import org.jbpm.job.Message;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl;
import org.jbpm.pvm.internal.svc.DefaultCommandService;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/PvmNamingStrategy.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/PvmNamingStrategy.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/PvmNamingStrategy.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import org.hibernate.cfg.ImprovedNamingStrategy;
import org.hibernate.util.StringHelper;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -29,7 +29,7 @@
import javax.jms.Queue;
import javax.jms.Topic;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** message printing and destination name extraction.
* @author Tom Baeyens, Jim Rigsbee
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,8 +27,8 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.model.ObservableElement;
import org.jbpm.pvm.internal.cal.BusinessCalendar;
import org.jbpm.pvm.internal.cal.Duration;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,7 +30,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -26,7 +26,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** this thread is responsible for acquiring jobs in the job that need to be
* executed and then let the JobExecutor dispatch the acquired ids to one of the
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import javax.transaction.Synchronization;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** listener that can be registered as a listener to the transaction
* to notify the job executor of added jobs so that the dispatcher
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -32,7 +32,7 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -33,7 +33,7 @@
import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** manager for job execution threads and their configuration.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,8 +24,8 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Message;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.session.DbSession;
import org.jbpm.session.MessageSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import java.util.concurrent.BlockingQueue;
import org.jbpm.cmd.CommandService;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -15,8 +15,8 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.session.TimerSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.Execution;
import org.jbpm.ProcessDefinition;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.IdGenerator;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,8 +30,8 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.listener.EventListener;
-import org.jbpm.log.Log;
import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.model.op.MoveToChildActivity;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -42,9 +42,9 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.Transaction;
+import org.jbpm.internal.log.Log;
import org.jbpm.listener.EventListener;
import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.log.Log;
import org.jbpm.model.Activity;
import org.jbpm.model.Comment;
import org.jbpm.model.Event;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -31,7 +31,7 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.IdGenerator;
import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.lob.Lob;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -34,8 +34,8 @@
import org.jbpm.Execution;
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
+import org.jbpm.internal.log.Log;
import org.jbpm.job.Timer;
-import org.jbpm.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.type.Converter;
import org.jbpm.pvm.internal.type.Type;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.model.op;
import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.JbpmException;
import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.Condition;
import org.jbpm.model.Event;
import org.jbpm.pvm.internal.job.MessageImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,7 +30,7 @@
import org.jbpm.Execution;
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.ExecutionContext;
import org.jbpm.pvm.internal.env.ExecutionEnvironment;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -38,7 +38,7 @@
import org.jbpm.Deployment;
import org.jbpm.JbpmException;
import org.jbpm.ProcessDefinition;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.ByteArrayStreamInput;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.InputStreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.svc;
import org.jbpm.cmd.CommandService;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.hibernate.StaleStateException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/HibernateSessionResource.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/HibernateSessionResource.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/HibernateSessionResource.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.tx;
import org.hibernate.Session;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,7 +28,7 @@
import javax.transaction.Synchronization;
import org.jbpm.env.Transaction;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/** simple 2 phase commit transaction.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,7 +24,7 @@
import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.Interceptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.type.Type;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.type.Matcher;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -11,7 +11,7 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
public abstract class ReflectUtil {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,7 +30,7 @@
import java.util.StringTokenizer;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.xml.Parse;
import javax.xml.namespace.QName;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -33,7 +33,7 @@
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.model.ProcessElementImpl;
import org.jbpm.pvm.internal.util.Closable;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,7 +28,7 @@
import java.util.List;
import org.hibernate.cfg.Configuration;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.ResourceStreamInput;
import org.jbpm.pvm.internal.stream.StreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CollectionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CollectionDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CollectionDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -8,7 +8,7 @@
import java.util.SortedMap;
import java.util.SortedSet;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextTypeRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextTypeRefDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextTypeRefDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.WireContext;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.wire.descriptor;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -30,7 +30,7 @@
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.hibernate.util.JDBCExceptionReporter;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import org.hibernate.SessionFactory;
import org.hibernate.impl.SessionImpl;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.tx.HibernateSessionResource;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -14,7 +14,7 @@
package org.jbpm.pvm.internal.wire.descriptor;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -9,7 +9,7 @@
import org.jbpm.JbpmException;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ArrayUtil;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -1,7 +1,7 @@
package org.jbpm.pvm.internal.wire.operation;
import org.jbpm.env.Transaction;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.tx.StandardResource;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/FieldOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/FieldOperation.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/FieldOperation.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -2,7 +2,7 @@
import java.lang.reflect.Field;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/MethodInvokerListener.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/MethodInvokerListener.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/MethodInvokerListener.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -4,7 +4,7 @@
import java.lang.reflect.Method;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.util.Observable;
import org.jbpm.pvm.internal.util.ReflectUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -6,7 +6,7 @@
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.FilterListener;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.util.Observable;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.xml.Binding;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -4,7 +4,7 @@
import java.util.Enumeration;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -32,7 +32,7 @@
import javax.xml.parsers.DocumentBuilder;
import org.jbpm.JbpmException;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.InputStreamInput;
import org.jbpm.pvm.internal.stream.ResourceStreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -31,7 +31,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.StreamInput;
import org.jbpm.pvm.internal.util.UrlEntity;
import org.jbpm.pvm.internal.util.XmlUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import java.util.List;
import org.jbpm.Problem;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.WireContext;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/pvm/src/test/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/task/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/task/src/test/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/task/src/test/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,9 +25,9 @@
import junit.framework.TestCase;
import org.jbpm.env.Environment;
-import org.jbpm.log.Jdk14LogFactory;
-import org.jbpm.log.Log;
-import org.jbpm.log.LogFormatter;
+import org.jbpm.internal.log.Jdk14LogFactory;
+import org.jbpm.internal.log.Log;
+import org.jbpm.internal.log.LogFormatter;
/** base class for jbpm test cases.
*
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -37,7 +37,7 @@
import org.hibernate.mapping.Table;
import org.jbpm.ProcessEngine;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/test-db/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-db/src/main/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/main/parked/JobExecutorIsolationDbTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -20,7 +20,7 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.job.Message;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -29,7 +29,7 @@
import org.jbpm.Execution;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.wire.descriptor.LongDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -28,7 +28,7 @@
import org.hibernate.Session;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.CommentImpl;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -23,7 +23,7 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -25,7 +25,7 @@
import java.util.List;
import org.jbpm.Execution;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.test.load.LoadTestCase;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-02-15 13:22:37 UTC (rev 3880)
@@ -27,7 +27,7 @@
import org.hibernate.Session;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.log.Log;
+import org.jbpm.internal.log.Log;
import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.cmd.CompositeCmd;
import org.jbpm.pvm.internal.cmd.SendMessageCmd;
Modified: jbpm4/trunk/modules/test-load/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-load/src/test/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging=enabled
java.util.logging.ConsoleHandler.level=FINEST
-java.util.logging.ConsoleHandler.formatter=org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter=org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
Modified: jbpm4/trunk/modules/test-pojo/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/resources/logging.properties 2009-02-14 10:15:54 UTC (rev 3879)
+++ jbpm4/trunk/modules/test-pojo/src/main/resources/logging.properties 2009-02-15 13:22:37 UTC (rev 3880)
@@ -5,7 +5,7 @@
redirect.commons.logging = enabled
java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
More information about the jbpm-commits
mailing list