ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sath...@apache.org
Subject [5/5] ode git commit: ODE-983: Migrated to SLF4J and Log4j2
Date Thu, 26 Nov 2015 09:25:12 GMT
ODE-983: Migrated to SLF4J and Log4j2


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/573900b7
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/573900b7
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/573900b7

Branch: refs/heads/master
Commit: 573900b726e4b12c60ac6928a464821276ea06da
Parents: 536e52a
Author: sathwik <sathwik@apache.org>
Authored: Thu Nov 26 14:54:36 2015 +0530
Committer: sathwik <sathwik@apache.org>
Committed: Thu Nov 26 14:54:36 2015 +0530

----------------------------------------------------------------------
 Rakefile                                        |  54 ++--
 .../src/main/webapp/WEB-INF/classes/log4j2.xml  |  37 +++
 axis2-war/src/main/webapp/WEB-INF/web.xml       |  28 +-
 .../org/apache/ode/axis2/Axis2TestBase.java     |   6 +-
 .../java/org/apache/ode/axis2/DummyService.java |   6 +-
 .../org/apache/ode/axis2/SoapHeader2Test.java   |   8 +-
 .../ode/axis2/httpbinding/HttpBindingTest.java  |   6 +-
 .../instancecleanup/SystemCronCleanupTest.java  |   4 +-
 .../ode/axis2/management/DeploymentTest.java    |   6 +-
 .../dao/jpa/ProcessInstanceProfileDAOImpl.java  |   8 +-
 .../ode/dao/jpa/ProcessProfileDAOImpl.java      |   8 +-
 .../bpel/ProcessInstanceProfileDaoImpl.java     |   8 +-
 .../ode/daohib/bpel/ProcessProfileDaoImpl.java  |   8 +-
 axis2-war/src/test/resources/test-log4j2.xml    |  33 +++
 .../apache/ode/axis2/AuthenticationHelper.java  |   6 +-
 .../apache/ode/axis2/BindingContextImpl.java    |   6 +-
 .../ode/axis2/EndpointReferenceContextImpl.java |   6 +-
 .../ode/axis2/MessageExchangeContextImpl.java   |   6 +-
 .../org/apache/ode/axis2/ODEAxis2Server.java    |   6 +-
 .../java/org/apache/ode/axis2/ODEServer.java    |  10 +-
 .../java/org/apache/ode/axis2/ODEService.java   |   6 +-
 .../apache/ode/axis2/SoapExternalService.java   |   6 +-
 .../ode/axis2/deploy/DeploymentPoller.java      |  10 +-
 .../axis2/hooks/ODEAxisOperationDispatcher.java |   8 +-
 .../apache/ode/axis2/hooks/ODEAxisService.java  |   6 +-
 .../axis2/hooks/ODEAxisServiceDispatcher.java   |   6 +-
 .../ode/axis2/hooks/ODEMessageReceiver.java     |   6 +-
 .../ode/axis2/hooks/SessionInHandler.java       |   6 +-
 .../ode/axis2/hooks/SessionOutHandler.java      |   6 +-
 .../axis2/httpbinding/HttpBindingValidator.java |   4 +-
 .../axis2/httpbinding/HttpExternalService.java  |   8 +-
 .../ode/axis2/httpbinding/HttpHelper.java       |  12 +-
 .../axis2/httpbinding/HttpMethodConverter.java  |   6 +-
 .../ode/axis2/service/DeploymentWebService.java |   6 +-
 .../ode/axis2/service/ManagementService.java    |   6 +-
 .../apache/ode/axis2/util/Axis2UriResolver.java |   6 +-
 .../apache/ode/axis2/util/Axis2WSDLLocator.java |   6 +-
 .../org/apache/ode/axis2/util/AxisUtils.java    |   6 +-
 .../ode/axis2/util/ClusterUrlTransformer.java   |   6 +-
 .../ode/axis2/util/SoapMessageConverter.java    |   8 +-
 .../ode/axis2/util/URLEncodedTransformer.java   |   6 +-
 .../axis2/util/UrlReplacementTransformer.java   |   6 +-
 .../httpbinding/HttpBindingValidatorTest.java   |   6 +-
 .../apache/ode/bpel/common/InstanceFilter.java  |   8 +-
 .../ode/bpel/compiler/AssignGenerator.java      |   6 +-
 .../org/apache/ode/bpel/compiler/BpelC.java     |   8 +-
 .../apache/ode/bpel/compiler/BpelCompiler.java  |   6 +-
 .../bpel/compiler/DefaultResourceFinder.java    |   8 +-
 .../compiler/ExpressionValidatorFactory.java    |   6 +-
 .../ode/bpel/compiler/ForEachGenerator.java     |   6 +-
 .../ode/bpel/compiler/LocalEntityResolver.java  |   6 +-
 .../ode/bpel/compiler/WSDLLocatorImpl.java      |   6 +-
 .../apache/ode/bpel/compiler/WSDLRegistry.java  |   6 +-
 .../compiler/WsdlFinderXMLEntityResolver.java   |   7 +-
 .../bpel/compiler/bom/BpelObjectFactory.java    |  10 +-
 .../bpel/compiler/bom/LocalEntityResolver.java  |   6 +-
 .../compiler/XslCompilationErrorListener.java   |  16 +-
 .../compiler/XPath20ExpressionCompilerImpl.java |   8 +-
 .../XQuery10ExpressionCompilerImpl.java         |   8 +-
 .../compiler_2_0/AbstractCompileTestCase.java   |   6 +-
 .../ode/bpel/compiler_2_0/MigrationTest.java    |   6 +-
 .../apache/ode/bpel/compiler_2_0/XslTest.java   |   6 +-
 bpel-compiler/src/test/resources/log4j2.xml     |  37 +++
 .../bpel/common/evt/DebugBpelEventListener.java |   6 +-
 .../apache/ode/bpel/epr/EndpointFactory.java    |   6 +-
 .../org/apache/ode/bpel/epr/WSAEndpoint.java    |   6 +-
 .../java/org/apache/ode/il/DynamicService.java  |   6 +-
 .../apache/ode/il/EmbeddedGeronimoFactory.java  |   6 +-
 .../java/org/apache/ode/il/MockScheduler.java   |   6 +-
 .../main/java/org/apache/ode/il/OMUtils.java    |   6 +-
 .../ode/il/config/OdeConfigProperties.java      |   6 +-
 .../java/org/apache/ode/il/dbutil/Database.java |   8 +-
 .../il/dbutil/DatabaseConnectionManager.java    |   8 +-
 .../apache/ode/il/dbutil/DerbyEmbeddedDB.java   |   2 +-
 .../org/apache/ode/il/dbutil/InternalDB.java    |   2 +-
 .../bpel/obj/migrate/DeepEqualityHelper.java    |   6 +-
 .../bpel/obj/migrate/DomElementComparator.java  |   6 +-
 .../obj/migrate/ExtensibeImplEqualityComp.java  |   6 +-
 .../ode/bpel/obj/migrate/ObjectTraverser.java   |   6 +-
 .../apache/ode/bpel/obj/migrate/OmOld2new.java  |   6 +-
 .../ode/bpel/obj/migrate/UpgradeChecker.java    |   6 +-
 .../apache/ode/bpel/obj/serde/DeSerializer.java |   6 +-
 .../ode/bpel/obj/serde/JsonOmDeserializer.java  |   7 +-
 .../ode/bpel/obj/serde/JsonOmSerializer.java    |   7 +-
 .../ode/bpel/elang/XslRuntimeUriResolver.java   |   6 +-
 .../elang/xpath10/runtime/JaxenContexts.java    |  11 +-
 .../runtime/JaxenNamespaceContextAdapter.java   |   6 +-
 .../runtime/XPath10ExpressionRuntime.java       |   6 +-
 .../xpath20/runtime/JaxpFunctionResolver.java   |   9 +-
 .../xpath20/runtime/JaxpVariableResolver.java   |   6 +-
 .../runtime/XPath20ExpressionRuntime.java       |   6 +-
 .../runtime/XQuery10ExpressionRuntime.java      |   6 +-
 .../apache/ode/bpel/engine/BpelDatabase.java    |   6 +-
 .../apache/ode/bpel/engine/BpelEngineImpl.java  |   8 +-
 .../org/apache/ode/bpel/engine/BpelProcess.java |   6 +-
 .../ode/bpel/engine/BpelProcessDatabase.java    |   6 +-
 .../ode/bpel/engine/BpelRuntimeContextImpl.java |  22 +-
 .../apache/ode/bpel/engine/BpelServerImpl.java  |   6 +-
 .../bpel/engine/CustomProcessProperties.java    |   6 +-
 .../apache/ode/bpel/engine/DebuggerSupport.java |   6 +-
 .../org/apache/ode/bpel/engine/IMAManager.java  |  12 +-
 .../org/apache/ode/bpel/engine/IMAManager2.java |  12 +-
 .../ode/bpel/engine/InstanceLockManager.java    |   6 +-
 .../ode/bpel/engine/MessageExchangeImpl.java    |   6 +-
 .../bpel/engine/MyRoleMessageExchangeImpl.java  |   8 +-
 .../org/apache/ode/bpel/engine/NStateLatch.java |   6 +-
 .../bpel/engine/OutstandingRequestManager.java  |  14 +-
 .../ode/bpel/engine/PartnerLinkMyRoleImpl.java  |   6 +-
 .../bpel/engine/PartnerLinkPartnerRoleImpl.java |   6 +-
 .../engine/PartnerRoleMessageExchangeImpl.java  |   6 +-
 .../ProcessAndInstanceManagementImpl.java       |   6 +-
 .../ode/bpel/engine/ProcessCleanUpRunnable.java |   6 +-
 .../ode/bpel/engine/cron/CronScheduler.java     |   6 +-
 .../engine/cron/RuntimeDataCleanupRunnable.java |   6 +-
 .../bpel/engine/cron/SystemSchedulesConfig.java |   6 +-
 .../engine/extvar/ExternalVariableManager.java  |   6 +-
 .../migration/CorrelationKeyMigration.java      |   6 +-
 .../CorrelationKeySetDataMigration.java         |   6 +-
 .../migration/CorrelationKeySetMigration.java   |   6 +-
 .../engine/migration/CorrelatorsMigration.java  |   6 +-
 .../engine/migration/IMAManagerMigration.java   |   6 +-
 .../bpel/engine/migration/MigrationHandler.java |   6 +-
 .../migration/OutstandingRequestsMigration.java |   6 +-
 .../ode/bpel/engine/replayer/Replayer.java      |   6 +-
 .../ReplayerBpelRuntimeContextImpl.java         |   6 +-
 .../bpel/engine/replayer/ReplayerContext.java   |   7 +-
 .../bpel/engine/replayer/ReplayerScheduler.java |   6 +-
 .../bpel/extvar/jdbc/DbExternalVariable.java    |   6 +-
 .../extvar/jdbc/JdbcExternalVariableModule.java |   6 +-
 .../apache/ode/bpel/extvar/jdbc/RowSubset.java  |   8 +-
 .../ode/bpel/memdao/BpelDAOConnectionImpl.java  |   6 +-
 .../ode/bpel/memdao/CorrelatorDaoImpl.java      |   6 +-
 .../org/apache/ode/bpel/memdao/DaoBaseImpl.java |   6 +-
 .../apache/ode/bpel/memdao/ProcessDaoImpl.java  |   6 +-
 .../org/apache/ode/bpel/runtime/ACTIVITY.java   |   6 +-
 .../apache/ode/bpel/runtime/ACTIVITYGUARD.java  |   8 +-
 .../org/apache/ode/bpel/runtime/ASSIGN.java     |  11 +-
 .../ode/bpel/runtime/BpelJacobRunnable.java     |   8 +-
 .../org/apache/ode/bpel/runtime/EH_ALARM.java   |  14 +-
 .../org/apache/ode/bpel/runtime/EH_EVENT.java   |  12 +-
 .../java/org/apache/ode/bpel/runtime/EMPTY.java |   6 +-
 .../bpel/runtime/ExprEvaluationContextImpl.java |   7 +-
 .../org/apache/ode/bpel/runtime/FOREACH.java    |   8 +-
 .../org/apache/ode/bpel/runtime/INVOKE.java     |  12 +-
 .../ode/bpel/runtime/ORDEREDCOMPENSATOR.java    |   8 +-
 .../java/org/apache/ode/bpel/runtime/PICK.java  |  20 +-
 .../runtime/PropertyAliasEvaluationContext.java |   6 +-
 .../apache/ode/bpel/runtime/REPEATUNTIL.java    |  10 +-
 .../java/org/apache/ode/bpel/runtime/REPLY.java |   8 +-
 .../org/apache/ode/bpel/runtime/RETHROW.java    |   6 +-
 .../java/org/apache/ode/bpel/runtime/SCOPE.java |   8 +-
 .../org/apache/ode/bpel/runtime/SCOPEACT.java   |   6 +-
 .../org/apache/ode/bpel/runtime/SWITCH.java     |   8 +-
 .../org/apache/ode/bpel/runtime/ScopeFrame.java |   6 +-
 .../java/org/apache/ode/bpel/runtime/THROW.java |   8 +-
 .../java/org/apache/ode/bpel/runtime/WAIT.java  |   6 +-
 .../java/org/apache/ode/bpel/runtime/WHILE.java |  10 +-
 .../elang/xpath20/runtime/XsdTypesTest.java     |  10 +-
 bpel-runtime/src/test/resources/log4j2.xml      |  37 +++
 .../ode/store/ClusterProcessStoreImpl.java      |   6 +-
 .../org/apache/ode/store/DeploymentUnitDir.java |   6 +-
 .../org/apache/ode/store/DocumentRegistry.java  |   6 +-
 .../ode/store/ProcessCleanupConfImpl.java       |   6 +-
 .../org/apache/ode/store/ProcessConfImpl.java   |   8 +-
 .../org/apache/ode/store/ProcessStoreImpl.java  |   6 +-
 .../ode/store/hib/ConfStoreConnectionHib.java   |   6 +-
 .../store/hib/DbConfStoreConnectionFactory.java |   8 +-
 .../ode/store/jpa/ConfStoreConnectionJpa.java   |   6 +-
 .../store/jpa/DbConfStoreConnectionFactory.java |  10 +-
 bpel-store/src/test/resources/log4j2.xml        |  37 +++
 .../org/apache/ode/test/BPELTestAbstract.java   |   6 +-
 bpel-test/src/test/resources/log4j2.xml         |  37 +++
 .../hazelcast/HazelcastClusterImpl.java         |   8 +-
 .../hazelcast/HazelcastDeploymentLock.java      |   6 +-
 .../hazelcast/HazelcastInstanceLock.java        |   6 +-
 .../apache/ode/daohib/NativeHiLoGenerator.java  |   6 +-
 .../org/apache/ode/daohib/SessionManager.java   |   6 +-
 .../bpel/BpelDAOConnectionFactoryImpl.java      |  10 +-
 .../ode/daohib/bpel/BpelDAOConnectionImpl.java  |  10 +-
 .../ode/daohib/bpel/CorrelatorDaoImpl.java      |   8 +-
 .../apache/ode/daohib/bpel/CriteriaBuilder.java |   6 +-
 .../apache/ode/daohib/bpel/HibernateDao.java    |   6 +-
 .../ode/daohib/bpel/MessageExchangeDaoImpl.java |   6 +-
 .../apache/ode/daohib/bpel/ProcessDaoImpl.java  |   6 +-
 .../ode/daohib/bpel/ProcessInstanceDaoImpl.java |   6 +-
 .../ode/daohib/bpel/hobj/GZipDataType.java      |   6 +-
 dao-hibernate/src/test/resources/log4j2.xml     |  37 +++
 .../dao/jpa/BPELDAOConnectionFactoryImpl.java   |   6 +-
 .../ode/dao/jpa/BPELDAOConnectionImpl.java      |   6 +-
 .../apache/ode/dao/jpa/CorrelatorDAOImpl.java   |   6 +-
 .../org/apache/ode/dao/jpa/MessageDAOImpl.java  |   6 +-
 .../ode/dao/jpa/MessageExchangeDAOImpl.java     |   6 +-
 .../java/org/apache/ode/dao/jpa/OpenJPADAO.java |   8 +-
 .../org/apache/ode/dao/jpa/ProcessDAOImpl.java  |   8 +-
 .../ode/dao/jpa/ProcessInstanceDAOImpl.java     |   6 +-
 .../ode/dao/jpa/ProcessManagementDAOImpl.java   |   6 +-
 dependencies.rb                                 |   3 +-
 .../ode/karaf/commands/OdeListCommand.java      |   6 +-
 .../commands/OdeRecoverActivityCommand.java     |   6 +-
 .../ode/karaf/commands/OdeResumeCommand.java    |   6 +-
 .../ode/karaf/commands/OdeSuspendCommand.java   |   6 +-
 .../ode/karaf/commands/OdeTerminateCommand.java |   6 +-
 .../ode/jbi/BaseMessageExchangeProcessor.java   |   6 +-
 .../org/apache/ode/jbi/BindingContextImpl.java  |   6 +-
 .../ode/jbi/EndpointReferenceContextImpl.java   |   6 +-
 .../ode/jbi/JbiMessageExchangeEventRouter.java  |   6 +-
 .../ode/jbi/MessageExchangeContextImpl.java     |   7 +-
 .../java/org/apache/ode/jbi/OdeConsumer.java    |   8 +-
 .../org/apache/ode/jbi/OdeConsumerAsync.java    |   6 +-
 .../org/apache/ode/jbi/OdeConsumerSync.java     |   6 +-
 .../java/org/apache/ode/jbi/OdeContext.java     |   6 +-
 .../java/org/apache/ode/jbi/OdeLifeCycle.java   |  14 +-
 .../java/org/apache/ode/jbi/OdeSUManager.java   |   6 +-
 .../java/org/apache/ode/jbi/OdeService.java     |   8 +-
 .../java/org/apache/ode/jbi/OdeServiceUnit.java |   6 +-
 .../main/java/org/apache/ode/jbi/Receiver.java  |  12 +-
 .../java/org/apache/ode/jbi/ServiceBridge.java  |   6 +-
 .../apache/ode/jbi/msgmap/BaseXmlMapper.java    |   6 +-
 .../apache/ode/jbi/util/SchemaCollection.java   |   6 +-
 .../org/apache/ode/jbi/util/WSDLFlattener.java  |   6 +-
 .../java/org/apache/ode/jbi/JbiTestBase.java    |   6 +-
 .../jbi/msgmap/JbiWsdl11WrapperMapperTest.java  |   6 +-
 jbi/src/test/resources/log4j2.xml               |  37 +++
 .../jca/server/rmi/RmiTransportServerImpl.java  |   6 +-
 .../ode/scheduler/simple/JdbcDelegate.java      |   6 +-
 .../ode/scheduler/simple/SchedulerThread.java   |   6 +-
 .../ode/scheduler/simple/SimpleScheduler.java   |   6 +-
 .../ode/scheduler/simple/RetriesTest.java       |   6 +-
 scheduler-simple/src/test/resources/log4j2.xml  |  37 +++
 .../apache/ode/tools/ClineCommandContext.java   |   6 +-
 .../org/apache/ode/tools/CommandContext.java    |  16 +-
 .../org/apache/ode/tools/bpelc/cline/BpelC.java |   6 +-
 .../java/org/apache/ode/utils/DOMUtils.java     |  10 +-
 .../java/org/apache/ode/utils/DbIsolation.java  |   6 +-
 .../ode/utils/HierarchicalProperties.java       |   6 +-
 .../apache/ode/utils/LoggingInterceptor.java    |   8 +-
 .../java/org/apache/ode/utils/NSContext.java    |   6 +-
 .../java/org/apache/ode/utils/Properties.java   |   6 +-
 .../apache/ode/utils/SerializableElement.java   |   6 +-
 .../java/org/apache/ode/utils/URITemplate.java  |   6 +-
 .../java/org/apache/ode/utils/WatchDog.java     |   6 +-
 .../ode/utils/cli/BaseCommandlineTool.java      | 291 ++++++++++---------
 .../java/org/apache/ode/utils/fs/FileUtils.java |   6 +-
 .../apache/ode/utils/fs/TempFileManager.java    |   6 +-
 .../org/apache/ode/utils/jmx/SimpleMBean.java   |  10 +-
 .../org/apache/ode/utils/rmi/RMIConstants.java  |   6 +-
 .../ode/utils/sax/LoggingErrorHandler.java      |  10 +-
 .../apache/ode/utils/trax/LogErrorListener.java |   8 +-
 .../apache/ode/utils/xml/capture/Tracker.java   |   6 +-
 .../ode/utils/xml/capture/Wsdl11Tracker.java    |   6 +-
 .../ode/utils/xml/capture/XmlSchemaTracker.java |   6 +-
 .../utils/xsd/CapturingXMLEntityResolver.java   |   8 +-
 .../ode/utils/xsd/LoggingXmlErrorHandler.java   |   8 +-
 .../apache/ode/utils/xsd/SchemaModelImpl.java   |  10 +-
 .../java/org/apache/ode/utils/xsd/XSUtils.java  |  16 +-
 .../ode/utils/xsl/XslTransformHandler.java      |   6 +-
 .../apache/ode/utils/xsd/SchemaCaptureTest.java |   6 +-
 utils/src/test/resources/log4j2.xml             |  37 +++
 258 files changed, 1425 insertions(+), 1036 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 4018b9f..800e543 100644
--- a/Rakefile
+++ b/Rakefile
@@ -88,7 +88,7 @@ define "ode" do
       "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents", "clustering"),
       AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.collections, COMMONS.httpclient, COMMONS.lang,
       DERBY, GERONIMO.kernel, GERONIMO.transaction, JAVAX.activation, JAVAX.servlet, JAVAX.stream,
-      JAVAX.transaction, JENCKS, WSDL4J, WS_COMMONS, XMLBEANS, AXIS2_MODULES.libs, SLF4J, LOG4J
+      JAVAX.transaction, JENCKS, WSDL4J, WS_COMMONS, XMLBEANS, AXIS2_MODULES.libs, SLF4J, LOG4J2
 
     test.exclude 'org.apache.ode.axis2.management.*'
     test.with project("tools"), AXIOM, JAVAX.javamail, COMMONS.codec, COMMONS.httpclient, XERCES, WOODSTOX, JACKSON
@@ -105,8 +105,8 @@ define "ode" do
       AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, COMMONS.beanutils,
       COMMONS.lang, COMMONS.pool, DERBY, DERBY_TOOLS, JACOB, JAXEN, JAVAX.activation, JAVAX.ejb, JAVAX.javamail,
       JAVAX.connector, JAVAX.jms, JAVAX.persistence, JAVAX.transaction, JAVAX.stream,  JIBX,
-      GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, LOG4J, OPENJPA, SAXON, TRANQL,
-      WOODSTOX, WSDL4J, WS_COMMONS, XALAN, XERCES, XMLBEANS, SPRING, AXIS2_MODULES.libs, SLF4J, LOG4J, HAZELCAST
+      GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, LOG4J2, OPENJPA, SAXON, TRANQL,
+      WOODSTOX, WSDL4J, WS_COMMONS, XALAN, XERCES, XMLBEANS, SPRING, AXIS2_MODULES.libs, SLF4J, HAZELCAST
 
     package(:war).with(:libs=>libs).path("WEB-INF").tap do |web_inf|
       web_inf.merge project("dao-jpa-ojpa-derby").package(:zip)
@@ -132,7 +132,7 @@ define "ode" do
       end
     end
 
-    test.using :testng, :forkmode=>'perTest', :properties=>{ "org.apache.commons.logging.LogFactory" => "org.apache.commons.logging.impl.LogFactoryImpl", "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", "org.apache.ode.autoRetireProcess"=>"true" } , :java_args=>['-Xmx2048m', '-XX:MaxPermSize=256m'] #'-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001',
+    test.using :testng, :forkmode=>'perTest', :properties=>{ "log4j.configurationFile"=>"test-log4j2.xml", "test.ports" => ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", "org.apache.ode.autoRetireProcess"=>"true" } , :java_args=>['-Xmx2048m', '-XX:MaxPermSize=256m'] #'-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001',
     test.with [projects("tools", 'bpel-obj'), libs, AXIS2_MODULES.mods, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, H2::REQUIRES, SPRING_TEST, JACKSON].uniq
     webapp_dir = "#{test.compile.target}/webapp"
     test.setup task(:prepare_webapp) do |task|
@@ -168,7 +168,7 @@ define "ode" do
 
   desc "ODE APIs"
   define "bpel-api" do
-    compile.with projects("utils", "bpel-nobj", "bpel-schemas"), WSDL4J, XERCES, SLF4J, LOG4J
+    compile.with projects("utils", "bpel-nobj", "bpel-schemas"), WSDL4J, XERCES, SLF4J, LOG4J2
     package :jar
   end
 
@@ -181,9 +181,9 @@ define "ode" do
   desc "ODE BPEL Compiler"
   define "bpel-compiler" do
     compile.with projects("bpel-api", "bpel-nobj", "bpel-schemas", "utils"),
-      JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES, COMMONS.collections, SLF4J, LOG4J, JACKSON, OBJECT_DIFF
+      JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES, COMMONS.collections, SLF4J, LOG4J2, JACKSON, OBJECT_DIFF
     test.resources { filter(project("bpel-scripts").path_to("src/main/resources")).into(test.resources.target).run }
-    test.with LOG4J, projects("bpel-obj")
+    test.with LOG4J2, projects("bpel-obj")
     package :jar
   end
 
@@ -203,14 +203,14 @@ define "ode" do
   define "bpel-epr" do
     compile.with projects("utils", "bpel-dao", "bpel-api"),
       AXIOM, COMMONS.lang, COMMONS.beanutils, DERBY, JAVAX.connector, JAVAX.stream, JAVAX.transaction, 
-      GERONIMO.transaction, GERONIMO.connector, TRANQL, XMLBEANS, SLF4J, LOG4J, H2::REQUIRES
+      GERONIMO.transaction, GERONIMO.connector, TRANQL, XMLBEANS, SLF4J, LOG4J2, H2::REQUIRES
     test.with XERCES
     package :jar
   end
 
   desc "ODE Clustering"
    define "clustering" do
-     compile.with projects("bpel-api","bpel-store"),HAZELCAST, COMMONS.logging
+     compile.with projects("bpel-api","bpel-store"),HAZELCAST, SLF4J
      package :jar
    end
 
@@ -222,7 +222,7 @@ define "ode" do
 
   desc "New ODE BPEL Object Model"
   define "bpel-nobj" do
-    compile.with projects("utils", "bpel-obj"), JACKSON, LOG4J, SAXON, WSDL4J, COMMONS.collections, COMMONS.logging, OBJECT_DIFF
+    compile.with projects("utils", "bpel-obj"), JACKSON, LOG4J2, SAXON, WSDL4J, COMMONS.collections, SLF4J, OBJECT_DIFF
     package :jar
 	test.with XERCES
   end
@@ -242,7 +242,7 @@ define "ode" do
 
     compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-nobj", "bpel-schemas",
       "bpel-store", "utils", "agents","clustering"),
-      COMMONS.collections, COMMONS.httpclient, JACOB, JAVAX.persistence, JAVAX.stream, JAXEN, SAXON, WSDL4J, XMLBEANS, SPRING, SLF4J, LOG4J,
+      COMMONS.collections, COMMONS.httpclient, JACOB, JAVAX.persistence, JAVAX.stream, JAXEN, SAXON, WSDL4J, XMLBEANS, SPRING, SLF4J, LOG4J2,
 	  JACKSON, JAVAX.connector
 
     test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", "bpel-epr", "bpel-obj"),
@@ -256,7 +256,7 @@ define "ode" do
 
   desc "ODE Simple Scheduler"
   define "scheduler-simple" do
-    compile.with projects("bpel-api", "utils"), COMMONS.collections, JAVAX.transaction, SLF4J, LOG4J
+    compile.with projects("bpel-api", "utils"), COMMONS.collections, JAVAX.transaction, SLF4J, LOG4J2
     test.compile.with H2::REQUIRES, HSQLDB, GERONIMO.kernel, GERONIMO.transaction
     test.with H2::REQUIRES, HSQLDB, JAVAX.transaction, JAVAX.resource, JAVAX.connector, 
           GERONIMO.kernel, GERONIMO.transaction, GERONIMO.connector, TRANQL, BACKPORT, JAVAX.ejb
@@ -281,7 +281,7 @@ define "ode" do
   define "bpel-store" do
     compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-nobj", "bpel-schemas", "bpel-epr",
       "dao-hibernate", "dao-jpa", "utils"),
-      JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J, OPENJPA, SPRING, SLF4J, LOG4J, JACKSON, H2::REQUIRES
+      JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J, OPENJPA, SPRING, SLF4J, LOG4J2, JACKSON, H2::REQUIRES
     compile { open_jpa_enhance }
     resources hibernate_doclet(:package=>"org.apache.ode.store.hib", :excludedtags=>"@version,@author,@todo")
 
@@ -297,7 +297,7 @@ define "ode" do
       "bpel-store", "utils", "bpel-epr", "dao-hibernate", "agents", "scheduler-simple"),
       DERBY, JUnit.dependencies, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient, COMMONS.io,
       GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb, JAVAX.transaction, TRANQL, "tranql:tranql-connector-derby-common:jar:1.1",
-      SPRING_TEST, COMMONS.codec, SLF4J, LOG4J
+      SPRING_TEST, COMMONS.codec, SLF4J, LOG4J2
 
     test.using :properties=>{ "org.apache.ode.autoRetireProcess"=>"true" }
     test.with projects("bpel-nobj", "bpel-obj", "bpel-schemas", "bpel-scripts"),
@@ -310,7 +310,7 @@ define "ode" do
   desc "ODE Hibernate DAO Implementation"
   define "dao-hibernate" do
     compile.with projects("bpel-api", "bpel-dao", "bpel-ql", "utils"),
-      COMMONS.lang, JAVAX.transaction, HIBERNATE, DOM4J, SLF4J, LOG4J
+      COMMONS.lang, JAVAX.transaction, HIBERNATE, DOM4J, SLF4J, LOG4J2
     resources hibernate_doclet(:package=>"org.apache.ode.daohib.bpel.hobj", :excludedtags=>"@version,@author,@todo")
 
     # doclet does not support not-found="ignore"
@@ -381,7 +381,7 @@ define "ode" do
   desc "ODE OpenJPA DAO Implementation"
   define "dao-jpa" do
     compile.with projects("bpel-api", "bpel-dao", "utils"),
-      COMMONS.collections, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, OPENJPA, XERCES, COMMONS.logging, SLF4J, LOG4J
+      COMMONS.collections, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, OPENJPA, XERCES, SLF4J, LOG4J2
     compile { open_jpa_enhance }
     package :jar
   end
@@ -404,9 +404,9 @@ define "ode" do
     h2_db = H2.create("ode-jpa-h2", _("target/h2-jpadb")=>_("target/h2.sql"))
 
     test.with projects("bpel-api", "bpel-dao", "bpel-nobj", "bpel-epr", "dao-jpa", "utils"),
-      BACKPORT, COMMONS.collections, COMMONS.lang, COMMONS.logging, GERONIMO.transaction,
+      BACKPORT, COMMONS.collections, COMMONS.lang, GERONIMO.transaction,
       GERONIMO.kernel, GERONIMO.connector, HSQLDB, JAVAX.connector, JAVAX.ejb, JAVAX.persistence,
-      JAVAX.transaction, LOG4J, OPENJPA, XERCES, WSDL4J, H2::REQUIRES
+      JAVAX.transaction, LOG4J2, OPENJPA, XERCES, WSDL4J, H2::REQUIRES, SLF4J
 
     build derby_db
     build h2_db
@@ -420,7 +420,7 @@ define "ode" do
   define "jbi" do
     compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-nobj", 
       "bpel-runtime", "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents"),
-      AXIOM, COMMONS.logging, COMMONS.pool, JAVAX.transaction, GERONIMO.transaction, JBI, SLF4J, LOG4J, WSDL4J, XERCES
+      AXIOM, COMMONS.pool, JAVAX.transaction, GERONIMO.transaction, JBI, SLF4J, LOG4J2, WSDL4J, XERCES
 
     package(:jar)
     package(:jbi).tap do |jbi|
@@ -448,7 +448,7 @@ define "ode" do
       JAVAX.transaction, JAXEN, JBI, OPENJPA, SAXON, SERVICEMIX, SPRING, TRANQL,
       XALAN, XBEAN, XMLBEANS,
       SLF4J,
-      LOG4J,
+      LOG4J2,
       DOM4J,
       HIBERNATE,
 	  JACKSON
@@ -465,8 +465,8 @@ define "ode" do
 
   desc "ODE Commmands for Karaf"
   define "jbi-karaf-commands" do
-    compile.with projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, SLF4J, LOG4J
-    libs = artifacts(projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, SLF4J, LOG4J)
+    compile.with projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, SLF4J, LOG4J2
+    libs = artifacts(projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, SLF4J, LOG4J2)
     package(:bundle).tap do |bnd|
       bnd.classpath = [_("target/classes"), libs].flatten
       BUNDLE_VERSIONS.each {|key, value| bnd[key] = value }
@@ -563,7 +563,7 @@ define "ode" do
                                   "bpel-schemas", "bpel-store", "dao-hibernate", "dao-jpa", "utils", "agents"))
     libs = artifacts(ANT, AXIOM, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.dbcp, COMMONS.lang, COMMONS.pool,
                      COMMONS.primitives, COMMONS.io, DERBY, GERONIMO.connector, GERONIMO.transaction, JACOB, JAVAX.connector, 
-                     JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, JAXEN, LOG4J, OPENJPA, 
+                     JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, JAXEN, LOG4J2, OPENJPA, 
                      SAXON, TRANQL, XALAN, XERCES, XMLBEANS, WSDL4J, KARAF)
     compile.with projects("bpel-schemas", "jbi", "bpel-api"), JBI, libs, KARAF, SPRING, SPRING_OSGI
 
@@ -606,19 +606,19 @@ define "ode" do
 
   desc "ODE JCA Server"
   define "jca-server" do
-    compile.with projects("jca-ra", "utils"), SLF4J, LOG4J
+    compile.with projects("jca-ra", "utils"), SLF4J, LOG4J2
     package :jar
   end
 
   desc "ODE Tools"
   define "tools" do
-    compile.with projects("bpel-compiler", "utils", "bpel-nobj"), ANT, COMMONS.httpclient, SLF4J, LOG4J
+    compile.with projects("bpel-compiler", "utils", "bpel-nobj"), ANT, COMMONS.httpclient, SLF4J, LOG4J2
     package :jar
   end
 
   desc "ODE Utils"
   define "utils" do
-    compile.with AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.collections, COMMONS.pool, COMMONS.httpclient, COMMONS.codec, XERCES, JAVAX.stream, WSDL4J, SAXON, SLF4J, LOG4J
+    compile.with AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.collections, COMMONS.pool, COMMONS.httpclient, COMMONS.codec, XERCES, JAVAX.stream, WSDL4J, SAXON, SLF4J, LOG4J2
     # env variable required by HierarchicalPropertiesTest
     test.using :environment=>{ 'TEST_DUMMY_ENV_VAR'=>42}
     test.exclude "*TestResources"
@@ -669,7 +669,7 @@ define "apache-ode" do
 
         # Libraries
         zip.path("lib").include artifacts(COMMONS.codec, COMMONS.httpclient,
-          COMMONS.pool, COMMONS.collections, JAXEN, SAXON, WSDL4J, XALAN, XERCES, SLF4J, LOG4J)
+          COMMONS.pool, COMMONS.collections, JAXEN, SAXON, WSDL4J, XALAN, XERCES, SLF4J, LOG4J2)
         project("ode").projects("utils", "tools", "bpel-compiler", "bpel-api", "bpel-nobj", "bpel-schemas").
           map(&:packages).flatten.each do |pkg|
             zip.include(pkg.to_s, :as=>"#{pkg.id}.#{pkg.type}", :path=>"lib") unless ['sources', 'javadoc'].include?(pkg.classifier)

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/main/webapp/WEB-INF/classes/log4j2.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/main/webapp/WEB-INF/classes/log4j2.xml b/axis2-war/src/main/webapp/WEB-INF/classes/log4j2.xml
new file mode 100644
index 0000000..0ebc603
--- /dev/null
+++ b/axis2-war/src/main/webapp/WEB-INF/classes/log4j2.xml
@@ -0,0 +1,37 @@
+<Configuration>
+    <Appenders>
+        <File name="FILE" fileName="ode.log" append="false">
+            <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+        </File>
+        <Console name="STDOUT" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+        </Console>
+        <Async name="Async">
+            <!--<AppenderRef ref="FILE"/> -->
+            <AppenderRef ref="STDOUT"/>
+        </Async>
+    </Appenders>
+
+    <Loggers>
+        <Logger name="org.apache.ode" level="info" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.apache.axis2" level="info" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.hibernate" level="info" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.apache.openjpa" level="info" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.springframework" level="error" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+
+        <Root level="error">
+            <AppenderRef ref="Async"/>
+        </Root>
+    </Loggers>
+
+</Configuration>

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/main/webapp/WEB-INF/web.xml b/axis2-war/src/main/webapp/WEB-INF/web.xml
index 5912dcd..62d1fd2 100644
--- a/axis2-war/src/main/webapp/WEB-INF/web.xml
+++ b/axis2-war/src/main/webapp/WEB-INF/web.xml
@@ -19,10 +19,32 @@
   ~ under the License.
   -->
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+          http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+          version="2.5">
+     <display-name>Apache-Axis2</display-name>
+
+    <listener>
+        <listener-class>org.apache.logging.log4j.web.Log4jServletContextListener</listener-class>
+    </listener>
+
+    <filter>
+        <filter-name>log4jServletFilter</filter-name>
+        <filter-class>org.apache.logging.log4j.web.Log4jServletFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>log4jServletFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
+        <dispatcher>INCLUDE</dispatcher>
+        <dispatcher>ERROR</dispatcher>
+        <dispatcher>ASYNC</dispatcher><!-- Servlet 3.0 w/ disabled auto-initialization only; not supported in 2.5 -->
+    </filter-mapping>
 
-<web-app>
-    <display-name>Apache-Axis2</display-name>
     <servlet>
         <servlet-name>AxisServlet</servlet-name>
         <display-name>Apache-Axis Servlet</display-name>

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java b/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
index a718462..e57b8ef 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
@@ -29,8 +29,8 @@ import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
 import org.apache.axis2.engine.AxisServer;
 import org.apache.axis2.engine.MessageReceiver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ode.axis2.hooks.ODEAxisService;
 import org.apache.ode.axis2.util.Axis2UriResolver;
@@ -71,7 +71,7 @@ public abstract class Axis2TestBase {
     private static final int DEFAULT_TEST_PORT_1 = 7070;
     private static final String DEFAULT_TEST_PORTS = DEFAULT_TEST_PORT_0+","+DEFAULT_TEST_PORT_1;
 
-    private static final Log log = LogFactory.getLog(Axis2TestBase.class);
+    private static final Logger log = LoggerFactory.getLogger(Axis2TestBase.class);
 
     protected ODEAxis2Server server;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/axis2/DummyService.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/DummyService.java b/axis2-war/src/test/java/org/apache/ode/axis2/DummyService.java
index ff89390..e3e2629 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/DummyService.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/DummyService.java
@@ -23,8 +23,8 @@ import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.xml.namespace.QName;
 
@@ -33,7 +33,7 @@ import javax.xml.namespace.QName;
  */
 public class DummyService {
 
-    private static final Log log = LogFactory.getLog(DummyService.class);
+    private static final Logger log = LoggerFactory.getLogger(DummyService.class);
 
     public String hello(String in) {
         log.debug("#### IN HELLO ####");

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java b/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java
index 42e8853..ff89168 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.axis2;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.Axis2TestBase;
 import org.apache.ode.axis2.JettyWrapper;
 import org.apache.ode.axis2.httpbinding.HttpBindingTest;
@@ -58,7 +58,7 @@ import java.io.StringReader;
  */
 public class SoapHeader2Test extends Axis2TestBase {
 
-    private static final Log log = LogFactory.getLog(SoapHeader2Test.class);
+    private static final Logger log = LoggerFactory.getLogger(SoapHeader2Test.class);
 
     protected JettyWrapper jettyWrapper;
 
@@ -119,4 +119,4 @@ public class SoapHeader2Test extends Axis2TestBase {
         }
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
index 8ecb64c..10b1c92 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.axis2.httpbinding;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.Axis2TestBase;
 import org.apache.ode.axis2.JettyWrapper;
 import static org.testng.AssertJUnit.assertTrue;
@@ -45,7 +45,7 @@ import java.util.concurrent.CountDownLatch;
  */
 public class HttpBindingTest extends Axis2TestBase {
 
-    private static final Log log = LogFactory.getLog(HttpBindingTest.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpBindingTest.class);
 
     protected JettyWrapper jettyWrapper;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
index b567b9f..f67f34e 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.ode.axis2.instancecleanup;
 
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.dao.ProcessDAO;
 import org.apache.ode.bpel.dao.ProcessInstanceDAO;
 import org.apache.ode.bpel.engine.cron.SystemSchedulesConfig;
@@ -64,7 +64,7 @@ public class SystemCronCleanupTest extends CleanTestBase {
             sendRequestFile("http://localhost:8888/processes/FirstProcess/FirstProcess/FirstProcess/Client", bundleName, "testRequest.soap");
             // every second, clean up cron job kicks in
             Thread.sleep(2000);
-            LogFactory.getLog(SystemCronCleanupTest.class).debug("============ASSERT INSTANCE CLEANUP===============");
+            LoggerFactory.getLogger(SystemCronCleanupTest.class).debug("============ASSERT INSTANCE CLEANUP===============");
             process = assertInstanceCleanup(instances, activityRecoveries, correlationSets, faults, exchanges, routes, messsages, partnerLinks, scopes, variables, events, largeData);
         } finally {
             server.undeployProcess(bundleName);

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
index 37bb43a..c23f927 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
@@ -33,8 +33,8 @@ import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.xml.namespace.QName;
 import java.io.ByteArrayOutputStream;
@@ -43,7 +43,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 public class DeploymentTest extends Axis2TestBase {
-    private static final Log __log = LogFactory.getLog(DeploymentTest.class);
+    private static final Logger __log = LoggerFactory.getLogger(DeploymentTest.class);
 
     private OMFactory _factory;
     private ServiceClientUtil _client;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java b/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
index dd4b6d2..7a10cf4 100644
--- a/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
+++ b/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.dao.jpa;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
 import org.apache.ode.bpel.dao.CorrelationSetDAO;
 import org.apache.ode.bpel.dao.FaultDAO;
@@ -43,7 +43,7 @@ import javax.persistence.Query;
  */
 public class ProcessInstanceProfileDAOImpl extends ProcessProfileDAOImpl implements ProcessInstanceProfileDAO {
     @SuppressWarnings("unused")
-    private static final Log __log = LogFactory.getLog(ProcessInstanceProfileDAOImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(ProcessInstanceProfileDAOImpl.class);
 
     private ProcessInstanceDAOImpl instance;
 
@@ -106,4 +106,4 @@ public class ProcessInstanceProfileDAOImpl extends ProcessProfileDAOImpl impleme
 
         return query.getResultList();
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java b/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java
index a9fbbb1..98d8846 100644
--- a/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java
+++ b/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java
@@ -21,8 +21,8 @@ package org.apache.ode.dao.jpa;
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
 import org.apache.ode.bpel.dao.CorrelationSetDAO;
 import org.apache.ode.bpel.dao.CorrelatorDAO;
@@ -44,7 +44,7 @@ import javax.persistence.Query;
  */
 public class ProcessProfileDAOImpl extends OpenJPADAO implements ProcessProfileDAO {
     @SuppressWarnings("unused")
-    private static final Log __log = LogFactory.getLog(ProcessProfileDAOImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(ProcessProfileDAOImpl.class);
 
     protected EntityManager em;
     protected ProcessDAOImpl process;
@@ -119,4 +119,4 @@ public class ProcessProfileDAOImpl extends OpenJPADAO implements ProcessProfileD
 
         return query.getResultList();
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java b/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java
index 9fda7b0..de900d0 100644
--- a/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java
+++ b/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.daohib.bpel;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
 import org.apache.ode.bpel.dao.CorrelationSetDAO;
 import org.apache.ode.bpel.dao.FaultDAO;
@@ -54,7 +54,7 @@ import java.util.List;
  */
 public class ProcessInstanceProfileDaoImpl extends ProcessProfileDaoImpl implements ProcessInstanceProfileDAO {
     @SuppressWarnings("unused")
-    private static final Log __log = LogFactory.getLog(ProcessInstanceProfileDaoImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(ProcessInstanceProfileDaoImpl.class);
 
     private ProcessInstanceDaoImpl instance;
 
@@ -132,4 +132,4 @@ public class ProcessInstanceProfileDaoImpl extends ProcessProfileDaoImpl impleme
 
         return results;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java b/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
index a660c45..3f6be94 100644
--- a/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
+++ b/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.daohib.bpel;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
 import org.apache.ode.bpel.dao.CorrelationSetDAO;
 import org.apache.ode.bpel.dao.CorrelatorDAO;
@@ -58,7 +58,7 @@ import java.util.List;
  */
 public class ProcessProfileDaoImpl extends HibernateDao implements ProcessProfileDAO {
     @SuppressWarnings("unused")
-    private static final Log __log = LogFactory.getLog(ProcessProfileDaoImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(ProcessProfileDaoImpl.class);
 
     protected ProcessDaoImpl process;
 
@@ -153,4 +153,4 @@ public class ProcessProfileDaoImpl extends HibernateDao implements ProcessProfil
 
         return results;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2-war/src/test/resources/test-log4j2.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/test-log4j2.xml b/axis2-war/src/test/resources/test-log4j2.xml
new file mode 100644
index 0000000..ed2b83d
--- /dev/null
+++ b/axis2-war/src/test/resources/test-log4j2.xml
@@ -0,0 +1,33 @@
+<Configuration>
+    <Appenders>
+        <File name="FILE" fileName="target/test/test.log" append="false">
+            <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+        </File>
+        <Console name="STDOUT" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+        </Console>
+        <Async name="Async">
+            <AppenderRef ref="FILE"/>
+            <AppenderRef ref="STDOUT"/>
+        </Async>
+    </Appenders>
+
+    <Loggers>
+        <Logger name="org.apache.ode" level="info" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.apache.axis2" level="info" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.hibernate" level="warn" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.apache.openjpa" level="warn" additivity="false">
+           <AppenderRef ref="FILE"/>
+        </Logger>
+
+        <Root level="info">
+            <AppenderRef ref="Async"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java b/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java
index b1bf1a7..d29c58e 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/AuthenticationHelper.java
@@ -22,8 +22,8 @@ package org.apache.ode.axis2;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.transport.http.HttpTransportProperties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
 import org.apache.ode.utils.DOMUtils;
 import org.w3c.dom.Element;
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
  */
 public class AuthenticationHelper {
 
-    private static final Log __log = LogFactory.getLog(AuthenticationHelper.class);
+    private static final Logger __log = LoggerFactory.getLogger(AuthenticationHelper.class);
 
     private static final String AUTHENTICATE_ELEMENT = "authenticate";
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java b/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
index 0941904..13b5b44 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
@@ -36,8 +36,8 @@ import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisConfigurator;
 import org.apache.commons.collections.map.MultiKeyMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.agents.memory.SizingAgent;
 import org.apache.ode.axis2.hooks.ODEAxisService;
 import org.apache.ode.axis2.hooks.ODEMessageReceiver;
@@ -58,7 +58,7 @@ import org.apache.ode.utils.wsdl.WsdlUtils;
  *
  */
 public class BindingContextImpl implements BindingContext {
-    protected final Log __log = LogFactory.getLog(getClass());
+    protected final Logger __log = LoggerFactory.getLogger(getClass());
 
     private ODEServer _server;
     private MultiKeyMap _services = new MultiKeyMap();

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/EndpointReferenceContextImpl.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/EndpointReferenceContextImpl.java b/axis2/src/main/java/org/apache/ode/axis2/EndpointReferenceContextImpl.java
index 5eb3f04..2f74e33 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/EndpointReferenceContextImpl.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/EndpointReferenceContextImpl.java
@@ -21,8 +21,8 @@ package org.apache.ode.axis2;
 
 import javax.xml.namespace.QName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.epr.EndpointFactory;
 import org.apache.ode.bpel.epr.MutableEndpoint;
 import org.apache.ode.bpel.iapi.EndpointReference;
@@ -35,7 +35,7 @@ import java.util.HashMap;
 
 public class EndpointReferenceContextImpl implements EndpointReferenceContext {
 
-  private static final Log __log = LogFactory.getLog(EndpointReferenceContextImpl.class);
+  private static final Logger __log = LoggerFactory.getLogger(EndpointReferenceContextImpl.class);
 
   public EndpointReferenceContextImpl(ODEServer server) {
   }

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java b/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java
index b64faff..ca80c28 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/MessageExchangeContextImpl.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.axis2;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.iapi.BpelEngineException;
 import org.apache.ode.bpel.iapi.ContextException;
 import org.apache.ode.bpel.iapi.MessageExchangeContext;
@@ -34,7 +34,7 @@ import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
  */
 public class MessageExchangeContextImpl implements MessageExchangeContext {
 
-    private static final Log __log = LogFactory.getLog(MessageExchangeContextImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(MessageExchangeContextImpl.class);
 
     private ODEServer _server;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java b/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
index ebc86f3..5458cbb 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
@@ -45,15 +45,15 @@ import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
 import org.apache.axis2.engine.AxisServer;
 import org.apache.axis2.engine.MessageReceiver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.hooks.ODEAxisService;
 import org.apache.ode.axis2.util.Axis2UriResolver;
 import org.apache.ode.axis2.util.Axis2WSDLLocator;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
 
 public class ODEAxis2Server extends AxisServer {
-    private static final Log log = LogFactory.getLog(ODEAxis2Server.class);
+    private static final Logger log = LoggerFactory.getLogger(ODEAxis2Server.class);
 
         ODEServer _ode;
         String odeRootDir;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java b/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
index 0a13c4a..e002695 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
@@ -24,8 +24,8 @@ import org.apache.axis2.context.ConfigurationContext;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
 import org.apache.commons.httpclient.util.IdleConnectionTimeoutThread;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.deploy.DeploymentPoller;
 import org.apache.ode.axis2.service.DeploymentWebService;
 import org.apache.ode.axis2.service.ManagementService;
@@ -74,8 +74,8 @@ import java.util.concurrent.ThreadFactory;
  */
 public class ODEServer {
 
-    protected final Log __log = LogFactory.getLog(getClass());
-    protected final Log __logTx = LogFactory.getLog("org.apache.ode.tx");
+    protected final Logger __log = LoggerFactory.getLogger(getClass());
+    protected final Logger __logTx = LoggerFactory.getLogger("org.apache.ode.tx");
 
     private static final Messages __msgs = Messages.getMessages(Messages.class);
 
@@ -444,7 +444,7 @@ public class ODEServer {
             if (__logTx.isDebugEnabled() && System.getProperty("ode.debug.tx") != null)
                 _txMgr = new DebugTxMgr(_txMgr);
         } catch (Exception e) {
-            __log.fatal("Couldn't initialize a transaction manager with factory: " + txFactoryName, e);
+            __log.error("Couldn't initialize a transaction manager with factory: " + txFactoryName, e);
             throw new ServletException("Couldn't initialize a transaction manager with factory: " + txFactoryName, e);
         }
     }

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/ODEService.java b/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
index f7e9b9a..92b5d60 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
@@ -43,8 +43,8 @@ import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.TwoChannelAxisOperation;
 import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.util.SoapMessageConverter;
 import org.apache.ode.bpel.engine.BpelServerImpl;
 import org.apache.ode.bpel.epr.EndpointFactory;
@@ -69,7 +69,7 @@ import org.w3c.dom.Element;
  */
 public class ODEService {
 
-    private static final Log __log = LogFactory.getLog(ODEService.class);
+    private static final Logger __log = LoggerFactory.getLogger(ODEService.class);
 
     public static final String CALLBACK_SESSION_ENDPOINT = "callbackSessionEndpoint";
     public static final String TARGET_SESSION_ENDPOINT = "targetSessionEndpoint";

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java b/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
index 6a785ed..4468bdc 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
@@ -32,8 +32,8 @@ import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.transport.jms.JMSConstants;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyEngine;
@@ -81,7 +81,7 @@ import java.lang.reflect.Field;
  */
 public class SoapExternalService implements ExternalService {
 
-    private static final Log __log = LogFactory.getLog(ExternalService.class);
+    private static final Logger __log = LoggerFactory.getLogger(ExternalService.class);
 
     private static final org.apache.ode.utils.wsdl.Messages msgs = Messages.getMessages(Messages.class);
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java b/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java
index 169ca4f..0ae7ea0 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/deploy/DeploymentPoller.java
@@ -38,8 +38,8 @@
 
 package org.apache.ode.axis2.deploy;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.ODEServer;
 import org.apache.ode.bpel.clapi.ClusterLock;
 import org.apache.ode.bpel.engine.cron.CronScheduler;
@@ -59,7 +59,7 @@ import java.util.Map;
  */
 public class DeploymentPoller {
 
-    private static Log __log = LogFactory.getLog(DeploymentPoller.class);
+    private static Logger __log = LoggerFactory.getLogger(DeploymentPoller.class);
 
     /** The polling interval. */
     private static final long POLL_TIME = 3000;
@@ -294,7 +294,7 @@ public class DeploymentPoller {
             try {
                 join();
             } catch (InterruptedException ie) {
-                __log.fatal("Thread unexpectedly interrupted.", ie);
+                __log.error("Thread unexpectedly interrupted.", ie);
             }
         }
 
@@ -311,7 +311,7 @@ public class DeploymentPoller {
                     }
                 }
             } catch (Throwable t) {
-                __log.fatal("Encountered an unexpected error.  Exiting poller...", t);
+                __log.error("Encountered an unexpected error.  Exiting poller...", t);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisOperationDispatcher.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisOperationDispatcher.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisOperationDispatcher.java
index c6872a4..03a6808 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisOperationDispatcher.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisOperationDispatcher.java
@@ -30,8 +30,8 @@ import org.apache.axis2.engine.AbstractDispatcher;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.i18n.Messages;
 import org.apache.commons.collections.map.MultiKeyMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.xml.namespace.QName;
 
@@ -44,7 +44,7 @@ public class ODEAxisOperationDispatcher extends AbstractDispatcher {
 
     /** Field NAME */
     public static final String NAME = "ODEAxisOperationDispatcher";
-    private static final Log log = LogFactory.getLog(ODEAxisOperationDispatcher.class);
+    private static final Logger log = LoggerFactory.getLogger(ODEAxisOperationDispatcher.class);
     QName operationName = null;
 
     public AxisOperation findOperation(AxisService service, MessageContext messageContext)
@@ -134,4 +134,4 @@ public class ODEAxisOperationDispatcher extends AbstractDispatcher {
         _elmtToOperation.put(axisServiceName, elmtName, operationName);
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
index 01d6dd4..5d83c81 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
@@ -46,8 +46,8 @@ import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.OdeFault;
 import org.apache.ode.axis2.util.Axis2UriResolver;
 import org.apache.ode.axis2.util.Axis2WSDLLocator;
@@ -67,7 +67,7 @@ import org.w3c.dom.Element;
  */
 public class ODEAxisService {
 
-    private static final Log LOG = LogFactory.getLog(ODEAxisService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ODEAxisService.class);
 
     public static AxisService createService(AxisConfiguration axisConfig, ProcessConf pconf, QName wsdlServiceName, String portName) throws AxisFault {
         Definition wsdlDefinition = pconf.getDefinitionForService(wsdlServiceName);

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java
index 0d59b64..00c55a7 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisServiceDispatcher.java
@@ -31,8 +31,8 @@ import org.apache.axis2.engine.AbstractDispatcher;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.i18n.Messages;
 import org.apache.commons.collections.map.MultiKeyMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.rampart.RampartMessageData;
 import org.apache.neethi.Policy;
 
@@ -46,7 +46,7 @@ public class ODEAxisServiceDispatcher extends AbstractDispatcher {
 
     /** Field NAME */
     public static final String NAME = "ODEAxisServiceDispatcher";
-    private static final Log log = LogFactory.getLog(ODEAxisServiceDispatcher.class);
+    private static final Logger log = LoggerFactory.getLogger(ODEAxisServiceDispatcher.class);
     QName operationName = null;
 
     public AxisOperation findOperation(AxisService service, MessageContext messageContext)

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
index 9f245c3..a594469 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
@@ -26,8 +26,8 @@ import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.ODEService;
 
 /**
@@ -35,7 +35,7 @@ import org.apache.ode.axis2.ODEService;
  */
 public class ODEMessageReceiver extends AbstractMessageReceiver {
 
-    private static final Log __log = LogFactory.getLog(ODEMessageReceiver.class);
+    private static final Logger __log = LoggerFactory.getLogger(ODEMessageReceiver.class);
 
     private ODEService _service;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java
index bd1e74e..8f3a6cb 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java
@@ -24,8 +24,8 @@ import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.ODEService;
 import org.apache.ode.utils.DOMUtils;
 import org.apache.ode.utils.Namespaces;
@@ -41,7 +41,7 @@ import javax.xml.namespace.QName;
 public class SessionInHandler extends AbstractHandler {
     private static final long serialVersionUID = -806564877582696569L;
 
-    private static final Log __log = LogFactory.getLog(SessionInHandler.class);
+    private static final Logger __log = LoggerFactory.getLogger(SessionInHandler.class);
 
     public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {
         SOAPHeader header = messageContext.getEnvelope().getHeader();

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java b/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
index 6b8f41e..f3496d0 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
@@ -27,8 +27,8 @@ import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.ODEService;
 import org.apache.ode.bpel.epr.EndpointFactory;
 import org.apache.ode.bpel.epr.MutableEndpoint;
@@ -43,7 +43,7 @@ import org.apache.ode.utils.Namespaces;
 public class SessionOutHandler extends AbstractHandler {
 
     private static final long serialVersionUID = 1L;
-    private static final Log __log = LogFactory.getLog(SessionOutHandler.class);
+    private static final Logger __log = LoggerFactory.getLogger(SessionOutHandler.class);
 
 
     public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java b/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java
index b58714c..7dcc527 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java
@@ -20,8 +20,8 @@
 package org.apache.ode.axis2.httpbinding;
 
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ode.utils.wsdl.WsdlUtils;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java b/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java
index 6a28dc1..fcec4f5 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java
@@ -24,8 +24,8 @@ import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.URIException;
 import org.apache.commons.httpclient.params.HttpParams;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.ExternalService;
 import org.apache.ode.axis2.ODEService;
 import org.apache.ode.utils.Properties;
@@ -66,7 +66,7 @@ import java.net.MalformedURLException;
  */
 public class HttpExternalService implements ExternalService {
 
-    private static final Log log = LogFactory.getLog(ExternalService.class);
+    private static final Logger log = LoggerFactory.getLogger(ExternalService.class);
     private static final Messages msgs = Messages.getMessages(Messages.class);
 
     private MultiThreadedHttpConnectionManager connections;
@@ -395,4 +395,4 @@ public class HttpExternalService implements ExternalService {
             odeMex.replyWithFailure(MessageExchange.FailureType.OTHER, errmsg, HttpHelper.prepareDetailsElement(method));
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java b/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java
index a7a7d11..20101f7 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java
@@ -33,8 +33,8 @@ import org.apache.commons.httpclient.methods.EntityEnclosingMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.apache.commons.httpclient.params.HttpParams;
 import org.apache.commons.httpclient.params.HostParams;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ode.utils.Properties;
 import org.apache.ode.utils.DOMUtils;
@@ -50,7 +50,7 @@ import java.util.Collections;
 
 public class HttpHelper {
 
-    private static final Log log = LogFactory.getLog(HttpHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpHelper.class);
 
 
     public static void configure(HttpClient client, URI targetURI, Element authPart, HttpParams params) throws URIException {
@@ -269,7 +269,7 @@ public class HttpHelper {
             sb.append("HTTP Request Details: \n").append(m.getName()).append(" ").append(m.getURI());
         } catch (URIException e) {
             // not that important
-            if (log.isDebugEnabled()) log.debug(e);
+            if (log.isDebugEnabled()) log.debug("",e);
         }
         sb.append("\nRequest Headers:");
         Header[] headers = m.getRequestHeaders();
@@ -302,7 +302,7 @@ public class HttpHelper {
             sb.append("HTTP Response Details: \n").append(m.getName()).append(" ").append(m.getURI());
         } catch (URIException e) {
             // not that important
-            if (log.isDebugEnabled()) log.debug(e);
+            if (log.isDebugEnabled()) log.debug("",e);
         }
         sb.append("\nStatus-Line: ").append(m.getStatusLine());
         Header[] headers = m.getResponseHeaders();
@@ -316,7 +316,7 @@ public class HttpHelper {
                 sb.append("\nResponse Entity:\n").append(m.getResponseBodyAsString());
             }
         } catch (IOException e) {
-            log.error(e);
+            log.error("",e);
         }
         Header[] footers = m.getResponseFooters();
         if (footers.length != 0) sb.append("\nResponse Footers: ");

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java b/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
index 2397666..35ac339 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
@@ -31,8 +31,8 @@ import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.apache.commons.httpclient.params.HostParams;
 import org.apache.commons.httpclient.params.HttpParams;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.utils.Properties;
 import org.apache.ode.axis2.util.URLEncodedTransformer;
 import org.apache.ode.axis2.util.UrlReplacementTransformer;
@@ -74,7 +74,7 @@ import java.util.HashSet;
 
 public class HttpMethodConverter {
 
-    private static final Log log = LogFactory.getLog(HttpMethodConverter.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpMethodConverter.class);
 
     protected static final Messages msgs = Messages.getMessages(Messages.class);
     protected Definition definition;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java b/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
index 01e003b..1fbd1f2 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
@@ -34,8 +34,8 @@ import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.ODEServer;
 import org.apache.ode.axis2.OdeFault;
 import org.apache.ode.axis2.deploy.DeploymentPoller;
@@ -64,7 +64,7 @@ import java.util.zip.ZipInputStream;
  */
 public class DeploymentWebService {
 
-    private static final Log __log = LogFactory.getLog(DeploymentWebService.class);
+    private static final Logger __log = LoggerFactory.getLogger(DeploymentWebService.class);
 
     private final OMNamespace _pmapi;
     private final OMNamespace _deployapi;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java b/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
index 3b4833f..8a88993 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
@@ -44,8 +44,8 @@ import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.hooks.ODEAxisService;
 import org.apache.ode.bpel.engine.ProcessAndInstanceManagementImpl;
 import org.apache.ode.bpel.iapi.BpelServer;
@@ -60,7 +60,7 @@ import org.apache.ode.utils.Namespaces;
  */
 public class ManagementService {
 
-    private static final Log __log = LogFactory.getLog(ManagementService.class);
+    private static final Logger __log = LoggerFactory.getLogger(ManagementService.class);
 
     public static final QName PM_SERVICE_NAME = new QName("http://www.apache.org/ode/pmapi", "ProcessManagementService");
     public static final String PM_PORT_NAME = "ProcessManagementPort";

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/util/Axis2UriResolver.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/Axis2UriResolver.java b/axis2/src/main/java/org/apache/ode/axis2/util/Axis2UriResolver.java
index 3ba02db..23241ed 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/Axis2UriResolver.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/Axis2UriResolver.java
@@ -21,13 +21,13 @@ package org.apache.ode.axis2.util;
 import java.io.InputStream;
 import java.net.URI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.hooks.ODEAxisService;
 import org.xml.sax.InputSource;
 
 public class Axis2UriResolver implements org.apache.ws.commons.schema.resolver.URIResolver {
-    private static final Log LOG = LogFactory.getLog(ODEAxisService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ODEAxisService.class);
 
     public InputSource resolveEntity(String targetNamespace, String schemaLocation, String baseUri) {
         if (LOG.isDebugEnabled()) {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/util/Axis2WSDLLocator.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/Axis2WSDLLocator.java b/axis2/src/main/java/org/apache/ode/axis2/util/Axis2WSDLLocator.java
index 00ace7e..733552a 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/Axis2WSDLLocator.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/Axis2WSDLLocator.java
@@ -27,12 +27,12 @@ import java.net.URISyntaxException;
 
 import javax.wsdl.xml.WSDLLocator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
 public class Axis2WSDLLocator implements WSDLLocator {
-    private static final Log LOG = LogFactory.getLog(Axis2WSDLLocator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Axis2WSDLLocator.class);
     private URI _baseUri;
     private String _latest;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java b/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java
index d6a85de..8e6b149 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/AxisUtils.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.axis2.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.axis2.deployment.ServiceBuilder;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisService;
@@ -46,7 +46,7 @@ import java.net.URI;
  */
 public class AxisUtils {
 
-    private static final Log log = LogFactory.getLog(AxisUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(AxisUtils.class);
 
     public static void configureService(AxisService axisService, URL service_file) throws IOException, XMLStreamException, AxisFault {
         configureService(new ConfigurationContext(axisService.getAxisConfiguration()), axisService, service_file);

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/util/ClusterUrlTransformer.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/ClusterUrlTransformer.java b/axis2/src/main/java/org/apache/ode/axis2/util/ClusterUrlTransformer.java
index 31f5f44..beaba72 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/ClusterUrlTransformer.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/ClusterUrlTransformer.java
@@ -21,11 +21,11 @@ package org.apache.ode.axis2.util;
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ClusterUrlTransformer {
-    private static final Log __log = LogFactory.getLog(ClusterUrlTransformer.class);
+    private static final Logger __log = LoggerFactory.getLogger(ClusterUrlTransformer.class);
 
     private final List<String> targets;
     private final String base;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java b/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
index b13980d..38cd9a5 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
@@ -58,8 +58,8 @@ import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.namespace.Constants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.axis2.OdeFault;
 import org.apache.ode.il.OMUtils;
 import org.apache.ode.utils.DOMUtils;
@@ -78,7 +78,7 @@ public class SoapMessageConverter {
 
     private static final Messages __msgs = Messages.getMessages(Messages.class);
 
-    private static final Log __log = LogFactory.getLog(SoapMessageConverter.class);
+    private static final Logger __log = LoggerFactory.getLogger(SoapMessageConverter.class);
 
     SOAPFactory _soapFactory;
 
@@ -156,7 +156,7 @@ public class SoapMessageConverter {
         BindingInput bi = bop.getBindingInput();
         if (bi == null)
             //throw new OdeFault(__msgs.msgBindingInputNotFound(_serviceName, _portName, op.getName()));
-            __log.warn(__msgs.msgBindingInputNotFound(_serviceName, _portName, op.getName()));
+            __log.warn("",__msgs.msgBindingInputNotFound(_serviceName, _portName, op.getName()));
 
         SOAPEnvelope soapEnv = msgCtx.getEnvelope();
         if (soapEnv == null) {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java b/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java
index 985e324..087a446 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java
@@ -21,8 +21,8 @@ package org.apache.ode.axis2.util;
 
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.util.EncodingUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.utils.DOMUtils;
 import org.apache.ode.axis2.httpbinding.Messages;
 import org.w3c.dom.Element;
@@ -39,7 +39,7 @@ import java.util.ArrayList;
 public class URLEncodedTransformer {
 
 
-    private static final Log log = LogFactory.getLog(URLEncodedTransformer.class);
+    private static final Logger log = LoggerFactory.getLogger(URLEncodedTransformer.class);
 
     /**
      * @param values - a map<String, Element>, the key is a part name (without curly braces), the value the replacement value for the part name. If the value is not a simple type, it will be skipped.


Mime
View raw message