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/5e73553c Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/5e73553c Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/5e73553c Branch: refs/heads/ode-1.3.x Commit: 5e73553c913682dfa8145dfc3a1e2dae10ce3194 Parents: a916894 Author: sathwik <[email protected]> Authored: Thu Aug 20 22:46:23 2015 +0530 Committer: sathwik <[email protected]> Committed: Thu Aug 20 22:46:23 2015 +0530 ---------------------------------------------------------------------- Rakefile | 81 +++++++++----------- .../src/main/webapp/WEB-INF/classes/log4j2.xml | 37 +++++++++ axis2-war/src/main/webapp/WEB-INF/web.xml | 27 ++++++- .../org/apache/ode/axis2/Axis2TestBase.java | 10 +-- .../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 | 34 ++++++++ .../apache/ode/axis2/AuthenticationHelper.java | 6 +- .../apache/ode/axis2/BindingContextImpl.java | 6 +- .../ode/axis2/EndpointReferenceContextImpl.java | 6 +- .../ode/axis2/MessageExchangeContextImpl.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 | 8 +- .../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 | 6 +- .../bpel/compiler/bom/LocalEntityResolver.java | 6 +- .../compiler/XslCompilationErrorListener.java | 14 ++-- .../compiler/XPath20ExpressionCompilerImpl.java | 10 +-- .../XQuery10ExpressionCompilerImpl.java | 9 +-- .../ode/bpel/compiler_2_0/GoodCompileTCase.java | 8 +- .../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 | 8 +- .../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 | 8 +- .../java/org/apache/ode/il/dbutil/Database.java | 10 +-- .../il/dbutil/DatabaseConnectionManager.java | 8 +- .../apache/ode/il/dbutil/DerbyEmbeddedDB.java | 2 +- .../org/apache/ode/il/dbutil/InternalDB.java | 2 +- .../ode/bpel/elang/XslRuntimeUriResolver.java | 6 +- .../elang/xpath10/runtime/JaxenContexts.java | 9 +-- .../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 | 8 +- .../apache/ode/bpel/engine/DebuggerSupport.java | 6 +- .../org/apache/ode/bpel/engine/IMAManager.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 | 12 +-- .../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 +- .../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 | 13 ++-- .../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 ++--- .../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/SWITCH.java | 10 +-- .../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 +-- .../ode/bpel/engine/cron/CronSchedulerTest.java | 3 - bpel-runtime/src/test/resources/log4j2.xml | 37 +++++++++ .../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 | 10 +-- .../org/apache/ode/store/ProcessStoreImpl.java | 6 +- .../ode/store/hib/ConfStoreConnectionHib.java | 6 +- .../store/hib/DbConfStoreConnectionFactory.java | 10 +-- .../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 | 8 +- bpel-test/src/test/resources/log4j2.xml | 37 +++++++++ .../apache/ode/daohib/NativeHiLoGenerator.java | 6 +- .../org/apache/ode/daohib/SessionManager.java | 6 +- .../bpel/BpelDAOConnectionFactoryImpl.java | 12 +-- .../ode/daohib/bpel/BpelDAOConnectionImpl.java | 10 +-- .../ode/daohib/bpel/CorrelatorDaoImpl.java | 8 +- .../apache/ode/daohib/bpel/CriteriaBuilder.java | 8 +- .../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 | 8 +- .../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 +- .../ap/ChannelTypeAnnotationProcessor.java | 8 +- .../org/apache/ode/jacob/ChannelListener.java | 8 +- .../ode/jacob/vpu/ExecutionQueueImpl.java | 6 +- .../java/org/apache/ode/jacob/vpu/JacobVPU.java | 6 +- .../ode/karaf/commands/OdeListCommand.java | 10 +-- .../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 +- .../ode/jbi/msgmap/JbiWsdl11WrapperMapper.java | 2 +- .../apache/ode/jbi/util/SchemaCollection.java | 6 +- .../org/apache/ode/jbi/util/WSDLFlattener.java | 6 +- .../java/org/apache/ode/jbi/JbiTestBase.java | 8 +- .../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 | 8 +- .../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 | 78 +++++++++++-------- .../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 | 10 +-- .../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 | 7 +- .../ode/utils/xsd/LoggingXmlErrorHandler.java | 8 +- .../apache/ode/utils/xsd/SchemaModelImpl.java | 10 +-- .../java/org/apache/ode/utils/xsd/XSUtils.java | 16 ++-- .../org/apache/ode/utils/xsd/XsdMessages.java | 4 +- .../ode/utils/xsl/XslTransformHandler.java | 6 +- .../apache/ode/utils/xsd/SchemaCaptureTest.java | 6 +- utils/src/test/resources/log4j2.xml | 37 +++++++++ 245 files changed, 1300 insertions(+), 916 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/Rakefile ---------------------------------------------------------------------- diff --git a/Rakefile b/Rakefile index 75fab41..8f4234c 100644 --- a/Rakefile +++ b/Rakefile @@ -85,9 +85,9 @@ define "ode" do define "axis2" do compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-runtime", "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents"), - AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.logging, COMMONS.collections, COMMONS.httpclient, COMMONS.lang, + 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 + JAVAX.transaction, JENCKS, WSDL4J, WS_COMMONS, XMLBEANS, AXIS2_MODULES.libs, SLF4J test.exclude 'org.apache.ode.axis2.management.*' test.with project("tools"), AXIOM, JAVAX.javamail, COMMONS.codec, COMMONS.httpclient, XERCES, WOODSTOX @@ -102,11 +102,11 @@ define "ode" do "bpel-schemas", "bpel-store", "dao-hibernate", "jacob", "jca-ra", "jca-server", "utils", "dao-jpa", "agents"), AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, COMMONS.beanutils, - COMMONS.lang, COMMONS.logging, COMMONS.pool, DERBY, DERBY_TOOLS, JAXEN, JAVAX.activation, JAVAX.ejb, JAVAX.javamail, + COMMONS.lang, COMMONS.pool, DERBY, DERBY_TOOLS, 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, + GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, LOG4J2, OPENJPA, SAXON, TRANQL, WOODSTOX, WSDL4J, WS_COMMONS, XALAN, XERCES, XMLBEANS, SPRING, - AXIS2_MODULES.libs, H2::REQUIRES + AXIS2_MODULES.libs, H2::REQUIRES, SLF4J package(:war).with(:libs=>libs).path("WEB-INF").tap do |web_inf| web_inf.merge project("dao-jpa-ojpa-derby").package(:zip) @@ -132,8 +132,8 @@ 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'] } #, :java_args=>['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx2048m', '-XX:MaxPermSize=256m'] - test.with [projects("tools"), libs, AXIS2_MODULES.mods, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, H2::REQUIRES, SPRING_TEST].uniq + test.using :testng, :forkmode=>'perTest', :properties=>{ "log4j.configurationFile"=>"test-log4j2.xml", "test.ports" => ENV['TEST_PORTS'] } #, :java_args=>['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx2048m', '-XX:MaxPermSize=256m'] + test.with [projects("tools"), libs, AXIS2_MODULES.mods, AXIOM, JAVAX.servlet, transitive(Buildr::Jetty::REQUIRES).reject { |a| a.group == 'org.slf4j' && a.id == 'slf4j-simple' }, HIBERNATE, DOM4J, H2::REQUIRES, SPRING_TEST, LOG4J2].uniq webapp_dir = "#{test.compile.target}/webapp" test.setup task(:prepare_webapp) do |task| cp_r _("src/main/webapp"), test.compile.target.to_s @@ -168,7 +168,7 @@ define "ode" do desc "ODE APIs" define "bpel-api" do - compile.with projects("utils", "bpel-obj", "bpel-schemas"), WSDL4J, COMMONS.logging + compile.with projects("utils", "bpel-obj", "bpel-schemas"), WSDL4J, SLF4J package :jar end @@ -181,11 +181,10 @@ define "ode" do desc "ODE BPEL Compiler" define "bpel-compiler" do compile.with projects("bpel-api", "bpel-obj", "bpel-schemas", "utils"), - COMMONS.logging, JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES, COMMONS.collections + JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES, COMMONS.collections, SLF4J test.resources { filter(project("bpel-scripts").path_to("src/main/resources")).into(test.resources.target).run } - test.with LOG4J + test.with SLF4J, LOG4J2 package :jar - test.with SLF4J, LOG4J end desc "ODE JCA Connector Implementation" @@ -203,7 +202,7 @@ define "ode" do desc "ODE Interface Layers Common" define "bpel-epr" do compile.with projects("utils", "bpel-dao", "bpel-api"), - AXIOM, COMMONS.lang, COMMONS.logging, COMMONS.beanutils, DERBY, JAVAX.connector, JAVAX.stream, JAVAX.transaction, GERONIMO.transaction, GERONIMO.connector, TRANQL, XMLBEANS, LOG4J, H2::REQUIRES + AXIOM, COMMONS.lang, COMMONS.beanutils, DERBY, JAVAX.connector, JAVAX.stream, JAVAX.transaction, GERONIMO.transaction, GERONIMO.connector, TRANQL, XMLBEANS, LOG4J2, H2::REQUIRES, SLF4J test.with XERCES package :jar end @@ -229,14 +228,14 @@ define "ode" do compile.from apt compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-schemas", "bpel-store", "jacob", "jacob-ap", "utils", "agents"), - COMMONS.logging, COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS, - SPRING + COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS, + SPRING, SLF4J test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", "bpel-epr"), BACKPORT, COMMONS.pool, COMMONS.lang, COMMONS.io, DERBY, JAVAX.connector, JAVAX.transaction, GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, HSQLDB, H2::REQUIRES, JAVAX.ejb, - OPENJPA, XERCES, XALAN, LOG4J, SLF4J, + OPENJPA, XERCES, XALAN, LOG4J2, SLF4J, DOM4J, HIBERNATE, H2::REQUIRES, SPRING_TEST, "tranql:tranql-connector-derby-common:jar:1.1" @@ -245,9 +244,9 @@ define "ode" do desc "ODE Simple Scheduler" define "scheduler-simple" do - compile.with projects("bpel-api", "utils"), COMMONS.collections, COMMONS.logging, JAVAX.transaction, LOG4J + compile.with projects("bpel-api", "utils"), COMMONS.collections, JAVAX.transaction, LOG4J2, SLF4J test.compile.with HSQLDB, H2::REQUIRES, GERONIMO.kernel, GERONIMO.transaction - test.with HSQLDB, H2::REQUIRES, JAVAX.transaction, JAVAX.resource, JAVAX.connector, LOG4J, + test.with HSQLDB, H2::REQUIRES, JAVAX.transaction, JAVAX.resource, JAVAX.connector, LOG4J2, GERONIMO.kernel, GERONIMO.transaction, GERONIMO.connector, TRANQL, BACKPORT, JAVAX.ejb package :jar end @@ -269,11 +268,11 @@ define "ode" do define "bpel-store" do compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-obj", "bpel-schemas", "bpel-epr", "dao-hibernate", "dao-jpa", "utils"), - COMMONS.logging, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, H2::REQUIRES, XMLBEANS, XERCES, WSDL4J, OPENJPA, SPRING + JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, H2::REQUIRES, XMLBEANS, XERCES, WSDL4J, OPENJPA, SPRING, SLF4J compile { open_jpa_enhance } resources hibernate_doclet(:package=>"org.apache.ode.store.hib", :excludedtags=>"@version,@author,@todo") - test.with COMMONS.collections, COMMONS.lang, JAVAX.connector, JAVAX.transaction, DOM4J, LOG4J, + test.with COMMONS.collections, COMMONS.lang, JAVAX.connector, JAVAX.transaction, DOM4J, LOG4J2, XERCES, XALAN, JAXEN, SAXON, OPENJPA, GERONIMO.transaction, SLF4J, SPRING_TEST, DERBY, GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb, H2::REQUIRES package :jar @@ -285,12 +284,12 @@ 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.with projects("bpel-obj", "jacob", "bpel-schemas", "bpel-scripts", "scheduler-simple"), - COMMONS.collections, COMMONS.lang, COMMONS.logging, DERBY, JAVAX.connector, - JAVAX.stream, JAVAX.transaction, JAXEN, HSQLDB, H2::REQUIRES, LOG4J, SAXON, XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING, HIBERNATE, SLF4J, DOM4J + COMMONS.collections, COMMONS.lang, DERBY, JAVAX.connector, + JAVAX.stream, JAVAX.transaction, JAXEN, HSQLDB, H2::REQUIRES, LOG4J2, SAXON, XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING, HIBERNATE, SLF4J, DOM4J package :jar end @@ -298,7 +297,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" @@ -369,8 +368,8 @@ define "ode" do desc "ODE OpenJPA DAO Implementation" define "dao-jpa" do compile.with projects("bpel-api", "bpel-dao", "utils"), - COMMONS.collections, COMMONS.logging, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, - OPENJPA, XERCES + COMMONS.collections, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, + OPENJPA, XERCES, SLF4J compile { open_jpa_enhance } package :jar end @@ -393,9 +392,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-obj", "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, H2::REQUIRES, JAVAX.connector, JAVAX.ejb, JAVAX.persistence, - JAVAX.transaction, LOG4J, OPENJPA, XERCES, WSDL4J + JAVAX.transaction, LOG4J2, OPENJPA, XERCES, WSDL4J, SLF4J build derby_db build h2_db @@ -407,7 +406,7 @@ define "ode" do desc "ODE JAva Concurrent OBjects" define "jacob" do - compile.with projects("utils", "jacob-ap"), COMMONS.logging + compile.with projects("utils", "jacob-ap"), SLF4J compile.from apt package :jar @@ -422,7 +421,7 @@ define "ode" do define "jbi" do compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-runtime", "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents"), - AXIOM, COMMONS.logging, COMMONS.pool, JAVAX.transaction, GERONIMO.transaction, JBI, LOG4J, WSDL4J, XERCES + AXIOM, COMMONS.pool, JAVAX.transaction, GERONIMO.transaction, JBI, LOG4J2, WSDL4J, XERCES, SLF4J package(:jar) package(:jbi).tap do |jbi| @@ -433,7 +432,7 @@ define "ode" do "jacob", "jacob-ap", "utils", "agents"), ANT, AXIOM, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.dbcp, COMMONS.lang, COMMONS.pool, COMMONS.primitives, DERBY, GERONIMO.connector, GERONIMO.transaction, JAXEN, JAVAX.connector, - JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J, OPENJPA, + JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J2, OPENJPA, SAXON, TRANQL, XALAN, XERCES, XMLBEANS, WSDL4J) jbi.component :type=>:service_engine, :name=>"OdeBpelEngine", :description=>self.comment @@ -450,11 +449,7 @@ define "ode" do BACKPORT, COMMONS.lang, COMMONS.io, COMMONS.collections, DERBY, GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, JAVAX.connector, JAVAX.ejb, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, JAXEN, JBI, OPENJPA, SAXON, SERVICEMIX, SPRING, TRANQL, - XALAN, XBEAN, XMLBEANS, - SLF4J, - LOG4J, - DOM4J, - HIBERNATE + XALAN, XBEAN, XMLBEANS, SLF4J, LOG4J2, DOM4J, HIBERNATE test.exclude '*TestBase', 'org.apache.ode.jbi.OdeJbiComponentLifeCycleTest', 'org.apache.ode.jbi.ReplayerJbiTest' test.setup unzip(_("target/test/smx/ode")=>project("dao-jpa-ojpa-derby").package(:zip)) test.setup unzip(_("target/test/smx/ode")=>project("dao-hibernate-db").package(:zip)) @@ -468,8 +463,8 @@ define "ode" do desc "ODE Commmands for Karaf" define "jbi-karaf-commands" do - compile.with projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, COMMONS.logging - libs = artifacts(projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, COMMONS.logging) + compile.with projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, SLF4J + libs = artifacts(projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, ) package(:bundle).tap do |bnd| bnd.classpath = [_("target/classes"), libs].flatten BUNDLE_VERSIONS.each {|key, value| bnd[key] = value } @@ -567,7 +562,7 @@ define "ode" do "jacob", "jacob-ap", "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, JAXEN, JAVAX.connector, - JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J, OPENJPA, + JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J2, OPENJPA, SAXON, TRANQL, XALAN, XERCES, XMLBEANS, WSDL4J, KARAF) compile.with projects("bpel-schemas", "jbi", "bpel-api"), JBI, libs, KARAF, SPRING, SPRING_OSGI @@ -610,19 +605,19 @@ define "ode" do desc "ODE JCA Server" define "jca-server" do - compile.with projects("jca-ra", "utils"), COMMONS.logging + compile.with projects("jca-ra", "utils"), SLF4J package :jar end desc "ODE Tools" define "tools" do - compile.with projects("bpel-compiler", "utils", "bpel-obj"), ANT, COMMONS.httpclient, COMMONS.logging + compile.with projects("bpel-compiler", "utils", "bpel-obj"), ANT, COMMONS.httpclient, SLF4J package :jar end desc "ODE Utils" define "utils" do - compile.with AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.collections, COMMONS.logging, COMMONS.pool, COMMONS.httpclient, COMMONS.codec, LOG4J, XERCES, JAVAX.stream, WSDL4J, SAXON + compile.with AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.collections, COMMONS.pool, COMMONS.httpclient, COMMONS.codec, LOG4J2, XERCES, JAVAX.stream, WSDL4J, SAXON, SLF4J, LOG4J2 # env variable required by HierarchicalPropertiesTest test.using :environment=>{ 'TEST_DUMMY_ENV_VAR'=>42} test.exclude "*TestResources" @@ -657,8 +652,8 @@ define "apache-ode" do zip.path("examples").include(project.path_to("src/examples"+postfix), :as=>".").exclude "**/target" # Libraries - zip.path("lib").include artifacts(COMMONS.logging, COMMONS.codec, COMMONS.httpclient, - COMMONS.pool, COMMONS.collections, JAXEN, SAXON, LOG4J, WSDL4J, XALAN, XERCES) + zip.path("lib").include artifacts( COMMONS.codec, COMMONS.httpclient, + COMMONS.pool, COMMONS.collections, JAXEN, SAXON, LOG4J2, WSDL4J, XALAN, XERCES, SLF4J) project("ode").projects("utils", "tools", "bpel-compiler", "bpel-api", "bpel-obj", "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/5e73553c/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..f7fc5da --- /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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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..8791586 100644 --- a/axis2-war/src/main/webapp/WEB-INF/web.xml +++ b/axis2-war/src/main/webapp/WEB-INF/web.xml @@ -19,10 +19,33 @@ ~ 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> +<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> + <servlet> <servlet-name>AxisServlet</servlet-name> <display-name>Apache-Axis Servlet</display-name> http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 c1e2ef1..d4f3dd6 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 @@ -52,8 +52,8 @@ import org.apache.axis2.engine.AxisServer; import org.apache.axis2.engine.MessageReceiver; import org.apache.axis2.transport.http.SimpleHTTPServer; 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.hooks.ODEAxisService; import org.apache.ode.axis2.util.Axis2UriResolver; import org.apache.ode.axis2.util.Axis2WSDLLocator; @@ -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; @@ -271,7 +271,7 @@ public abstract class Axis2TestBase { try { _ode.init(odeRootDir, new ConfigurationContext(configContext.getAxisConfiguration())); } catch (ServletException e) { - log.error(e); + log.error("",e); } } @@ -359,7 +359,7 @@ public abstract class Axis2TestBase { try { fos = new FileOutputStream(fileName); } catch (FileNotFoundException e) { - log.error(e); + log.error("",e); } configContext.getAxisConfiguration().getService(serviceName).printWSDL(fos); } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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/5e73553c/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 6e4f837..f746fff 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/5e73553c/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 01f6097..cfe902b 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/5e73553c/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 c647485..eecf868 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 { server.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/5e73553c/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 fe6a7a1..3337311 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/5e73553c/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 ab19239..30e1398 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/5e73553c/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 4b17508..9b80b50 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/5e73553c/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 39dafbc..91d27a1 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/5e73553c/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 5775f60..76e8caf 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/5e73553c/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..c4e3025 --- /dev/null +++ b/axis2-war/src/test/resources/test-log4j2.xml @@ -0,0 +1,34 @@ +<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/5e73553c/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/5e73553c/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 07f017a..33fdc1f 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/5e73553c/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/5e73553c/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/5e73553c/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 839babc..04c3820 100644 --- a/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java +++ b/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java @@ -52,8 +52,8 @@ import org.apache.axis2.engine.AxisConfiguration; 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; @@ -89,8 +89,8 @@ import org.apache.ode.utils.fs.TempFileManager; */ 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); @@ -419,7 +419,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/5e73553c/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 af57039..f3876d4 100644 --- a/axis2/src/main/java/org/apache/ode/axis2/ODEService.java +++ b/axis2/src/main/java/org/apache/ode/axis2/ODEService.java @@ -41,8 +41,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.epr.EndpointFactory; import org.apache.ode.bpel.epr.MutableEndpoint; @@ -66,7 +66,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); private AxisService _axisService; private BpelServer _server; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 77d85d6..cfd7e34 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/5e73553c/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 6bb44c8..9f4632f 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.engine.cron.CronScheduler; import org.apache.ode.bpel.engine.cron.SystemSchedulesConfig; @@ -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; @@ -240,7 +240,7 @@ public class DeploymentPoller { try { join(); } catch (InterruptedException ie) { - __log.fatal("Thread unexpectedly interrupted.", ie); + __log.error("Thread unexpectedly interrupted.", ie); } } @@ -257,7 +257,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/5e73553c/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 5354872..021a620 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.description.HandlerDescription; import org.apache.axis2.engine.AbstractDispatcher; 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; /** * Dispatches the service based on the information from the target endpoint URL. @@ -42,7 +42,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) @@ -131,4 +131,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/5e73553c/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 f2bed5b..c14441e 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 @@ -44,8 +44,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; @@ -63,7 +63,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/5e73553c/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 e52d971..4e3037a 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 @@ -32,8 +32,8 @@ import org.apache.axis2.description.HandlerDescription; import org.apache.axis2.engine.AbstractDispatcher; import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.util.PolicyUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.neethi.Policy; import org.apache.neethi.PolicyComponent; import org.apache.rampart.RampartMessageData; @@ -45,7 +45,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/5e73553c/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/5e73553c/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 9dd6a88..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(); @@ -119,4 +119,4 @@ public class SessionInHandler extends AbstractHandler { return InvocationResponse.CONTINUE; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 e58c45e..b162763 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; @@ -44,7 +44,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/5e73553c/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/5e73553c/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 aa2ae5d..1443258 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/5e73553c/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 c2ebb49..fc607d2 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/5e73553c/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 20e824e..68dd786 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/5e73553c/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 f2b4176..87eebd9 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 @@ -52,8 +52,8 @@ import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.engine.AxisEngine; import org.apache.axis2.receivers.AbstractMessageReceiver; import org.apache.axis2.util.Utils; -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.OdeFault; import org.apache.ode.axis2.deploy.DeploymentPoller; @@ -70,7 +70,7 @@ import org.apache.ode.utils.Namespaces; */ 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/5e73553c/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 714ec51..08a8d96 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/5e73553c/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/5e73553c/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/5e73553c/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 313d3ea..c3eaa4b 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/5e73553c/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 76c76e0..4c54d45 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/5e73553c/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 6d18326..49bc67d 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()).toString()); SOAPEnvelope soapEnv = msgCtx.getEnvelope(); if (soapEnv == null) {
