You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2011/02/04 10:05:55 UTC
svn commit: r1067118 [1/7] - in /servicemix/components/trunk: ./
bindings/servicemix-cxf-bc/ bindings/servicemix-file/
bindings/servicemix-file/src/main/java/org/apache/servicemix/file/
bindings/servicemix-file/src/test/java/org/apache/servicemix/file/...
Author: jbonofre
Date: Fri Feb 4 09:05:47 2011
New Revision: 1067118
URL: http://svn.apache.org/viewvc?rev=1067118&view=rev
Log:
[SMXCOMP-852] Switch to use SLF4J as default logger.
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml
servicemix/components/trunk/bindings/servicemix-file/pom.xml
servicemix/components/trunk/bindings/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java
servicemix/components/trunk/bindings/servicemix-file/src/test/java/org/apache/servicemix/file/FilePollerEndpointTest.java
servicemix/components/trunk/bindings/servicemix-ftp/pom.xml
servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
servicemix/components/trunk/bindings/servicemix-http/pom.xml
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpConsumerMarshaler.java
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpProviderMarshaler.java
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/SerializedMarshaler.java
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JCLLogger.java
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ConsumerEndpointTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpConsumerTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpEndpointLoadWsdlTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpProviderTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSoapTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpURITest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpWsdlTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpXBeanDeployerTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ManagedContextManagerTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ServerManagerTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/addressing/AddressingConsumerTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/JaasUserRealmTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/SmxHttpExchangeTest.java
servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java
servicemix/components/trunk/bindings/servicemix-jms/pom.xml
servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java
servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java
servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java
servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java
servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java
servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerToProviderEndpointTest.java
servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java
servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java
servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsStandardConsumerEndpointTest.java
servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsURITest.java
servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java
servicemix/components/trunk/bindings/servicemix-ldap/pom.xml
servicemix/components/trunk/bindings/servicemix-mail/pom.xml
servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java
servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java
servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java
servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java
servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java
servicemix/components/trunk/bindings/servicemix-rmi/pom.xml
servicemix/components/trunk/bindings/servicemix-rmi/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java
servicemix/components/trunk/bindings/servicemix-rmi/src/test/java/org/apache/servicemix/rmi/RmiXBeanTest.java
servicemix/components/trunk/bindings/servicemix-smpp/pom.xml
servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java
servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java
servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java
servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java
servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java
servicemix/components/trunk/bindings/servicemix-snmp/pom.xml
servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java
servicemix/components/trunk/bindings/servicemix-truezip/pom.xml
servicemix/components/trunk/bindings/servicemix-vfs/pom.xml
servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java
servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java
servicemix/components/trunk/bindings/servicemix-xmpp/pom.xml
servicemix/components/trunk/engines/servicemix-bean/pom.xml
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java
servicemix/components/trunk/engines/servicemix-camel/pom.xml
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TwoServicemixCamelSusTest.java
servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml
servicemix/components/trunk/engines/servicemix-drools/pom.xml
servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/model/JbiHelper.java
servicemix/components/trunk/engines/servicemix-drools/src/test/resources/chained.drl
servicemix/components/trunk/engines/servicemix-drools/src/test/resources/fibonacci.drl
servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java
servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java
servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java
servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/SwitchPredicate.java
servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/XPathPredicate.java
servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerEngine.java
servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/SequenceReader.java
servicemix/components/trunk/engines/servicemix-eip/src/test/java/org/apache/servicemix/eip/MessageFilterSwitchPredicateTest.java
servicemix/components/trunk/engines/servicemix-exec/pom.xml
servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/marshaler/DefaultExecMarshaler.java
servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/utils/ExecUtils.java
servicemix/components/trunk/engines/servicemix-jsr181/pom.xml
servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java
servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiTransport.java
servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java
servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComponentTest.java
servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181MTOMTest.java
servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringProxyTest.java
servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java
servicemix/components/trunk/engines/servicemix-osworkflow/pom.xml
servicemix/components/trunk/engines/servicemix-osworkflow/src/main/java/org/apache/servicemix/osworkflow/OSWorkflow.java
servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowFailureTest.java
servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowSucessTest.java
servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/conditions/ExampleCondition.java
servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/functions/ExampleFunction.java
servicemix/components/trunk/engines/servicemix-pdf/pom.xml
servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java
servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java
servicemix/components/trunk/engines/servicemix-quartz/pom.xml
servicemix/components/trunk/engines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/QuartzSpringTest.java
servicemix/components/trunk/engines/servicemix-saxon/src/test/java/org/apache/servicemix/saxon/SaxonComponentTest.java
servicemix/components/trunk/engines/servicemix-script/pom.xml
servicemix/components/trunk/engines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
servicemix/components/trunk/engines/servicemix-scripting/pom.xml
servicemix/components/trunk/engines/servicemix-scripting/src/main/java/org/apache/servicemix/scripting/ScriptingEndpoint.java
servicemix/components/trunk/engines/servicemix-validation/pom.xml
servicemix/components/trunk/engines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java
servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiSubscription.java
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPullPoint.java
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsSubscription.java
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/spring/PublisherComponent.java
servicemix/components/trunk/pom.xml
servicemix/components/trunk/shared-libraries/servicemix-common/pom.xml
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/AbstractDeployer.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/AsyncBaseLifeCycle.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/BaseBootstrap.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/BaseComponent.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/BaseLifeCycle.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/BaseServiceUnitManager.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/BasicWorkManager.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/DefaultBootstrap.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/DefaultComponent.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/Deployer.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/Endpoint.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/EndpointDeliveryChannel.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/ManagementSupport.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/PersistentConfiguration.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/Registry.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/ResolvedEndpoint.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/ServiceMixComponent.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/ServiceUnit.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/SyncLifeCycleWrapper.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/AbstractEndpoint.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/ConsumerEndpoint.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/PollingEndpoint.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/ProviderEndpoint.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/SimpleEndpoint.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/DeployedAssembly.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/EndpointExporter.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/EndpointTracker.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/EndpointWrapper.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/packaging/Consumes.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/packaging/Provides.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/packaging/ServiceUnitAnalyzer.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/scheduler/ScheduleIterator.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/scheduler/Scheduler.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/scheduler/SchedulerTask.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/security/AuthenticationService.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/security/KeystoreInstance.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/security/KeystoreManager.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/tools/wsdl/Schema.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/tools/wsdl/SchemaCollection.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/util/DOMUtil.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/util/MessageUtil.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/util/URIResolver.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/util/URISupport.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/wsdl1/JbiEndpoint.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/BaseXBeanDeployer.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/ClassLoaderXmlPreprocessor.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/ParentBeanFactoryPostProcessor.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/XBeanServiceUnit.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/scheduler/SchedulerTest.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/tools/wsdl/WSDLFlattenerTest.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/wsdl1/JbiEndpointMarshallingTest.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/wsdl1/Wsdl1DeployerTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java
servicemix/components/trunk/shared-libraries/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/dom/DomHandlerTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/FaultTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap2/pom.xml
servicemix/components/trunk/shared-libraries/servicemix-soap2/src/main/java/org/apache/servicemix/soap/core/PhaseInterceptorChain.java
servicemix/components/trunk/shared-libraries/servicemix-soap2/src/test/java/org/apache/servicemix/soap/HelloWorldSoapTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap2/src/test/java/org/apache/servicemix/soap/PersonHttpTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap2/src/test/java/org/apache/servicemix/soap/bindings/soap/interceptors/SoapInInterceptorTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap2/src/test/java/org/apache/servicemix/soap/interceptors/jbi/JbiInWsdl1InterceptorTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap2/src/test/java/org/apache/servicemix/soap/ws/addressing/WsAddressingTest.java
servicemix/components/trunk/shared-libraries/servicemix-soap2/src/test/java/org/apache/servicemix/soap/wsdl/validator/WSIBPValidatorTest.java
Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml Fri Feb 4 09:05:47 2011
@@ -86,10 +86,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</dependency>
Modified: servicemix/components/trunk/bindings/servicemix-file/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-file/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-file/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-file/pom.xml Fri Feb 4 09:05:47 2011
@@ -69,10 +69,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
Modified: servicemix/components/trunk/bindings/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java Fri Feb 4 09:05:47 2011
@@ -506,7 +506,7 @@ public class FilePollerEndpoint extends
lock.unlock();
} catch (Exception ex) {
// can't release the lock
- logger.error(ex);
+ logger.error("", ex);
}
lockManager.removeLock(uri);
}
Modified: servicemix/components/trunk/bindings/servicemix-file/src/test/java/org/apache/servicemix/file/FilePollerEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-file/src/test/java/org/apache/servicemix/file/FilePollerEndpointTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-file/src/test/java/org/apache/servicemix/file/FilePollerEndpointTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-file/src/test/java/org/apache/servicemix/file/FilePollerEndpointTest.java Fri Feb 4 09:05:47 2011
@@ -37,13 +37,13 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.executors.Executor;
import org.apache.servicemix.tck.mock.MockExchangeFactory;
import org.apache.servicemix.tck.mock.MockMessageExchange;
import org.apache.servicemix.util.FileUtil;
import edu.emory.mathcs.backport.java.util.concurrent.Executors;
+import org.slf4j.LoggerFactory;
public class FilePollerEndpointTest extends TestCase {
@@ -57,7 +57,7 @@ public class FilePollerEndpointTest exte
exchanges.clear();
endpoint = new FilePollerEndpoint() {
{
- logger = LogFactory.getLog(this.getClass());
+ logger = LoggerFactory.getLogger(this.getClass());
}
@Override
Modified: servicemix/components/trunk/bindings/servicemix-ftp/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-ftp/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-ftp/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-ftp/pom.xml Fri Feb 4 09:05:47 2011
@@ -64,10 +64,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</dependency>
Modified: servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java Fri Feb 4 09:05:47 2011
@@ -588,7 +588,7 @@ public class FtpPollerEndpoint extends P
lock.unlock();
} catch (Exception ex) {
// can't release the lock
- logger.error(ex);
+ logger.error("Can't release the lock", ex);
}
lockManager.removeLock(file);
}
Modified: servicemix/components/trunk/bindings/servicemix-http/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-http/pom.xml Fri Feb 4 09:05:47 2011
@@ -76,10 +76,6 @@
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpConsumerMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpConsumerMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpConsumerMarshaler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpConsumerMarshaler.java Fri Feb 4 09:05:47 2011
@@ -28,30 +28,30 @@ import javax.jbi.messaging.MessageExchan
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mortbay.jetty.HttpHeaders;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractHttpConsumerMarshaler implements HttpConsumerMarshaler {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger logger = LoggerFactory.getLogger(getClass());
protected InputStream getRequestEncodingStream(String contentEncoding, InputStream dataStream) throws IOException {
if (contentEncoding != null && contentEncoding.toLowerCase().indexOf("gzip") >= 0) {
- log.debug("Using GZIP request content encoding.");
+ logger.debug("Using GZIP request content encoding.");
return new GZIPInputStream(new BufferedInputStream(dataStream));
} else {
- log.debug("Using default request content encoding.");
+ logger.debug("Using default request content encoding.");
return new BufferedInputStream(dataStream);
}
}
protected OutputStream getResponseEncodingStream(String acceptEncoding, OutputStream dataStream) throws IOException {
if (acceptEncoding != null && acceptEncoding.toLowerCase().indexOf("gzip") >= 0) {
- log.debug("Using GZIP response content encoding.");
+ logger.debug("Using GZIP response content encoding.");
return new GZIPOutputStream(new BufferedOutputStream(dataStream));
} else {
- log.debug("Using default response content encoding.");
+ logger.debug("Using default response content encoding.");
return new BufferedOutputStream(dataStream);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpProviderMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpProviderMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpProviderMarshaler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/AbstractHttpProviderMarshaler.java Fri Feb 4 09:05:47 2011
@@ -27,13 +27,13 @@ import java.util.Arrays;
import java.util.Set;
import java.util.HashSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mortbay.jetty.HttpHeaders;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractHttpProviderMarshaler implements HttpProviderMarshaler {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger logger = LoggerFactory.getLogger(getClass());
private static final Set<String> DEFAULT_HEADER_BLACKLIST =
new HashSet<String>(
@@ -71,20 +71,20 @@ public abstract class AbstractHttpProvid
protected OutputStream getRequestEncodingStream(String encoding, OutputStream dataStream) throws IOException {
if (encoding != null && encoding.toLowerCase().indexOf("gzip") >= 0) {
- log.debug("Using gzip request encoding in provider marshaller.");
+ logger.debug("Using gzip request encoding in provider marshaller.");
return new GZIPOutputStream(new BufferedOutputStream(dataStream));
} else {
- log.debug("Using default request encoding in provider marshaller.");
+ logger.debug("Using default request encoding in provider marshaller.");
return new BufferedOutputStream(dataStream);
}
}
protected InputStream getResponseEncodingStream(String encoding, InputStream dataStream) throws IOException {
if (encoding != null && encoding.toLowerCase().indexOf("gzip") >= 0) {
- log.debug("Using gzip response encoding in provider marshaller.");
+ logger.debug("Using gzip response encoding in provider marshaller.");
return new GZIPInputStream(new BufferedInputStream(dataStream));
} else {
- log.debug("Using default response encoding in provider marshaller.");
+ logger.debug("Using default response encoding in provider marshaller.");
return new BufferedInputStream(dataStream);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java Fri Feb 4 09:05:47 2011
@@ -16,16 +16,10 @@
*/
package org.apache.servicemix.http.endpoints;
-import java.io.BufferedInputStream;
-import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.OutputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
import java.net.URI;
-import java.util.zip.GZIPOutputStream;
-import java.util.zip.GZIPInputStream;
import javax.jbi.component.ComponentContext;
import javax.jbi.messaging.Fault;
@@ -40,8 +34,6 @@ import javax.xml.transform.stream.Stream
import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
import org.apache.servicemix.jbi.jaxp.XMLStreamHelper;
import org.apache.servicemix.common.JbiConstants;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
import org.mortbay.jetty.HttpHeaders;
/**
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/SerializedMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/SerializedMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/SerializedMarshaler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/SerializedMarshaler.java Fri Feb 4 09:05:47 2011
@@ -35,10 +35,10 @@ import javax.xml.transform.TransformerEx
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A marshaler that handles Java serialized content from the InputStream of the HttpServletRequest object and to the
@@ -59,7 +59,7 @@ import org.apache.servicemix.jbi.jaxp.St
*/
public class SerializedMarshaler extends DefaultHttpConsumerMarshaler {
- private static Log log = LogFactory.getLog(SerializedMarshaler.class);
+ private final Logger logger = LoggerFactory.getLogger(SerializedMarshaler.class);
public MessageExchange createExchange(HttpServletRequest request, ComponentContext context) throws Exception {
MessageExchange me = context.getDeliveryChannel().createExchangeFactory().createExchange(getDefaultMep());
@@ -109,9 +109,7 @@ public class SerializedMarshaler extends
xstream.toXML(obj, w);
String request = w.toString();
- if (log.isDebugEnabled()) {
- log.debug("Remote invocation request: " + request);
- }
+ logger.debug("Remote invocation request: " + request);
return new StringSource(request);
}
@@ -144,9 +142,7 @@ public class SerializedMarshaler extends
XStream xstream = new XStream(new DomDriver());
String result = transform.toString(content);
- if (log.isDebugEnabled()) {
- log.debug("Remote invocation result: " + result);
- }
+ logger.debug("Remote invocation result: " + result);
Object obj = xstream.fromXML(result);
ObjectOutputStream oos = new ObjectOutputStream(os);
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JCLLogger.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JCLLogger.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JCLLogger.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JCLLogger.java Fri Feb 4 09:05:47 2011
@@ -16,9 +16,8 @@
*/
package org.apache.servicemix.http.jetty;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mortbay.log.Logger;
+import org.slf4j.LoggerFactory;
/**
* A jetty6 logger implementation on top of commons-logging
@@ -31,7 +30,7 @@ public class JCLLogger implements Logger
static final char DELIM_STOP = '}';
private final String name;
- private final Log log;
+ private final org.slf4j.Logger logger;
public JCLLogger() {
this("org.mortbay.jetty");
@@ -39,7 +38,7 @@ public class JCLLogger implements Logger
public JCLLogger(String name) {
this.name = name;
- this.log = LogFactory.getLog(name);
+ this.logger = LoggerFactory.getLogger(name);
}
public static void init() {
@@ -62,13 +61,11 @@ public class JCLLogger implements Logger
}
public void debug(String msg, Throwable th) {
- log.debug(msg, th);
+ logger.debug(msg, th);
}
public void debug(String msg, Object arg0, Object arg1) {
- if (log.isDebugEnabled()) {
- log.debug(arrayFormat(msg, new Object[] {arg0, arg1}));
- }
+ logger.debug(arrayFormat(msg, new Object[] {arg0, arg1}));
}
public Logger getLogger(String loggerName) {
@@ -79,27 +76,23 @@ public class JCLLogger implements Logger
}
public void info(String msg, Object arg0, Object arg1) {
- if (log.isInfoEnabled()) {
- log.info(arrayFormat(msg, new Object[] {arg0, arg1}));
- }
+ logger.info(arrayFormat(msg, new Object[] {arg0, arg1}));
}
public boolean isDebugEnabled() {
- return log.isDebugEnabled();
+ return logger.isDebugEnabled();
}
public void setDebugEnabled(boolean enabled) {
- log.warn("setDebugEnabled not supported");
+ logger.warn("setDebugEnabled not supported");
}
public void warn(String msg, Throwable th) {
- log.warn(msg, th);
+ logger.warn(msg, th);
}
public void warn(String msg, Object arg0, Object arg1) {
- if (log.isWarnEnabled()) {
- log.warn(arrayFormat(msg, new Object[] {arg0, arg1}));
- }
+ logger.warn(arrayFormat(msg, new Object[] {arg0, arg1}));
}
public static String arrayFormat(String messagePattern, Object[] argArray) {
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java Fri Feb 4 09:05:47 2011
@@ -23,11 +23,11 @@ import java.util.concurrent.ConcurrentHa
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.security.AuthenticationService;
import org.mortbay.jetty.Request;
import org.mortbay.jetty.security.UserRealm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A JAAS based implementation of a realm for jetty 6.
@@ -36,7 +36,7 @@ import org.mortbay.jetty.security.UserRe
*/
public class JaasUserRealm implements UserRealm {
- private static final Log LOG = LogFactory.getLog(JaasUserRealm.class);
+ private final Logger logger = LoggerFactory.getLogger(JaasUserRealm.class);
private String name = getClass().getName();
private String domain = "servicemix-domain";
@@ -111,12 +111,12 @@ public class JaasUserRealm implements Us
return userPrincipal;
} else {
- LOG.debug("Login Failed - null userID");
+ logger.debug("Login Failed - null userID");
return null;
}
} catch (GeneralSecurityException e) {
- LOG.debug("Login Failed", e);
+ logger.debug("Login Failed", e);
return null;
}
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java Fri Feb 4 09:05:47 2011
@@ -31,8 +31,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.http.ContextManager;
import org.apache.servicemix.http.HttpBridgeServlet;
import org.apache.servicemix.http.HttpConfiguration;
@@ -67,11 +65,13 @@ import org.mortbay.thread.ThreadPool;
import org.mortbay.util.ByteArrayISO8859Writer;
import org.mortbay.util.LazyList;
import org.mortbay.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
public class JettyContextManager implements ContextManager {
- private static final Log LOGGER = LogFactory.getLog(JettyContextManager.class);
+ private final Logger logger = LoggerFactory.getLogger(JettyContextManager.class);
private Map<String, Server> servers;
private HttpConfiguration configuration;
@@ -268,11 +268,9 @@ public class JettyContextManager impleme
try {
connector = (Connector) Class.forName(connectorClassName).newInstance();
} catch (Exception e) {
- LOGGER.warn("Could not create a jetty connector of class '" + connectorClassName + "'. Defaulting to "
+ logger.warn("Could not create a jetty connector of class '" + connectorClassName + "'. Defaulting to "
+ HttpConfiguration.DEFAULT_JETTY_CONNECTOR_CLASS_NAME);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Reason: " + e.getMessage(), e);
- }
+ logger.debug("Reason: " + e.getMessage(), e);
connector = (Connector) Class.forName(HttpConfiguration.DEFAULT_JETTY_CONNECTOR_CLASS_NAME)
.newInstance();
}
@@ -466,9 +464,7 @@ public class JettyContextManager impleme
protected class ThreadPoolWrapper extends AbstractLifeCycle implements ThreadPool {
public boolean dispatch(Runnable job) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Dispatching job: " + job);
- }
+ logger.debug("Dispatching job: " + job);
return threadPool.dispatch(job);
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java Fri Feb 4 09:05:47 2011
@@ -35,10 +35,10 @@ import javax.xml.namespace.QName;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.EndpointComponentContext;
import org.apache.servicemix.http.ContextManager;
@@ -61,7 +61,7 @@ import org.mortbay.util.ajax.Continuatio
public class ConsumerProcessor extends AbstractProcessor implements SoapExchangeProcessor, HttpProcessor {
- private static Log log = LogFactory.getLog(ConsumerProcessor.class);
+ private final Logger logger = LoggerFactory.getLogger(ConsumerProcessor.class);
protected Object httpContext;
protected ComponentContext context;
@@ -106,15 +106,11 @@ public class ConsumerProcessor extends A
if (locks.remove(exchange.getExchangeId()) == null) {
throw new Exception("HTTP request has timed out");
}
- if (log.isDebugEnabled()) {
- log.debug("Resuming continuation for exchange: " + exchange.getExchangeId());
- }
+ logger.debug("Resuming continuation for exchange: " + exchange.getExchangeId());
exchanges.put(exchange.getExchangeId(), exchange);
cont.resume();
if (!cont.isResumed()) {
- if (log.isDebugEnabled()) {
- log.debug("Could not resume continuation for exchange: " + exchange.getExchangeId());
- }
+ logger.debug("Could not resume continuation for exchange: " + exchange.getExchangeId());
exchanges.remove(exchange.getExchangeId());
throw new Exception("HTTP request has timed out for exchange: " + exchange.getExchangeId());
}
@@ -142,9 +138,7 @@ public class ConsumerProcessor extends A
}
public void process(HttpServletRequest request, HttpServletResponse response) throws Exception {
- if (log.isDebugEnabled()) {
- log.debug("Receiving HTTP request: " + request);
- }
+ logger.debug("Receiving HTTP request: " + request);
if ("GET".equals(request.getMethod())) {
processGetRequest(request, response);
return;
@@ -176,9 +170,7 @@ public class ConsumerProcessor extends A
synchronized (cont) {
channel.send(exchange);
if (!isSTFlow) {
- if (log.isDebugEnabled()) {
- log.debug("Suspending continuation for exchange: " + exchange.getExchangeId());
- }
+ logger.debug("Suspending continuation for exchange: " + exchange.getExchangeId());
boolean result = cont.suspend(suspentionTime);
exchange = exchanges.remove(exchange.getExchangeId());
request.removeAttribute(MessageExchange.class.getName());
Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java Fri Feb 4 09:05:47 2011
@@ -48,8 +48,6 @@ import org.apache.commons.httpclient.met
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.security.KeystoreManager;
import org.apache.servicemix.http.HttpComponent;
@@ -60,6 +58,8 @@ import org.apache.servicemix.soap.SoapEx
import org.apache.servicemix.soap.marshalers.SoapMessage;
import org.apache.servicemix.soap.marshalers.SoapReader;
import org.apache.servicemix.soap.marshalers.SoapWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -69,7 +69,7 @@ import org.apache.servicemix.soap.marsha
*/
public class ProviderProcessor extends AbstractProcessor implements SoapExchangeProcessor {
- private static Log log = LogFactory.getLog(ProviderProcessor.class);
+ private final Logger logger = LoggerFactory.getLogger(ProviderProcessor.class);
protected SoapHelper soapHelper;
protected DeliveryChannel channel;
@@ -118,7 +118,7 @@ public class ProviderProcessor extends A
Object newDestinationURI = nm.getProperty(JbiConstants.HTTP_DESTINATION_URI);
if (newDestinationURI != null) {
locationURI = (String) newDestinationURI;
- log.debug("Location URI overridden: " + locationURI);
+ logger.debug("Location URI overridden: " + locationURI);
}
PostMethod method = new PostMethod(getRelUri(locationURI));
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ConsumerEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ConsumerEndpointTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ConsumerEndpointTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ConsumerEndpointTest.java Fri Feb 4 09:05:47 2011
@@ -41,6 +41,8 @@ import javax.wsdl.BindingOperation;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Document;
@@ -52,8 +54,6 @@ import org.apache.commons.httpclient.Htt
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.http.InvalidStatusResponseException;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.components.util.MockServiceComponent;
@@ -78,7 +78,8 @@ import org.springframework.core.io.Class
import org.mortbay.jetty.HttpHeaders;
public class ConsumerEndpointTest extends TestCase {
- private static transient Log log = LogFactory.getLog(ConsumerEndpointTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(ConsumerEndpointTest.class);
String port1 = System.getProperty("http.port1");
String port2 = System.getProperty("http.port2");
@@ -145,7 +146,7 @@ public class ConsumerEndpointTest extend
post.setRequestEntity(new StringRequestEntity("<hello>world</hello>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
assertEquals("", res);
if (post.getStatusCode() != 202) {
throw new InvalidStatusResponseException(post.getStatusCode());
@@ -192,7 +193,7 @@ public class ConsumerEndpointTest extend
post.setRequestEntity(new StringRequestEntity("<hello>world</hello>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
if (post.getStatusCode() != 500 || !res.contains("HTTP request has timed out for exchange")) {
throw new InvalidStatusResponseException(post.getStatusCode());
@@ -225,9 +226,9 @@ public class ConsumerEndpointTest extend
post.setRequestEntity(new StringRequestEntity("<hello>world</hello>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
Node node = transformer.toDOMNode(new StringSource(res));
- log.info(transformer.toString(node));
+ logger.info(transformer.toString(node));
assertEquals("world", textValueOfXPath(node, "/hello/text()"));
if (post.getStatusCode() != 200) {
throw new InvalidStatusResponseException(post.getStatusCode());
@@ -268,7 +269,7 @@ public class ConsumerEndpointTest extend
post.setRequestEntity(new StringRequestEntity("<hello>world</hello>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
Element elem = transformer.toDOMElement(new StringSource(res));
assertEquals(Soap11.getInstance().getEnvelope(), DomUtil.getQName(elem));
elem = DomUtil.getFirstChildElement(elem);
@@ -291,7 +292,7 @@ public class ConsumerEndpointTest extend
post.setRequestEntity(new StringRequestEntity("<hello>world</hello>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
Element elem = transformer.toDOMElement(new StringSource(res));
assertEquals(Soap12.getInstance().getEnvelope(), DomUtil.getQName(elem));
elem = DomUtil.getFirstChildElement(elem);
@@ -321,7 +322,7 @@ public class ConsumerEndpointTest extend
+ "<s:Body><hello>world</hello></s:Body>" + "</s:Envelope>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
Element elem = transformer.toDOMElement(new StringSource(res));
assertEquals(Soap11.getInstance().getEnvelope(), DomUtil.getQName(elem));
elem = DomUtil.getFirstChildElement(elem);
@@ -384,7 +385,7 @@ public class ConsumerEndpointTest extend
+ "</s:Envelope>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
Element elem = transformer.toDOMElement(new StringSource(res));
assertEquals(Soap11.getInstance().getEnvelope(), DomUtil.getQName(elem));
elem = DomUtil.getFirstChildElement(elem);
@@ -407,7 +408,7 @@ public class ConsumerEndpointTest extend
Element elem;
try {
elem = transformer.toDOMElement(in.getContent());
- log.info(transformer.toString(elem));
+ ConsumerEndpointTest.this.logger.info(transformer.toString(elem));
} catch (Exception e) {
throw new MessagingException(e);
}
@@ -431,7 +432,7 @@ public class ConsumerEndpointTest extend
+ "</s:Envelope>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
Element elem = transformer.toDOMElement(new StringSource(res));
assertEquals(Soap12.getInstance().getEnvelope(), DomUtil.getQName(elem));
elem = DomUtil.getFirstChildElement(elem);
@@ -454,7 +455,7 @@ public class ConsumerEndpointTest extend
Element elem;
try {
elem = transformer.toDOMElement(in.getContent());
- log.info(transformer.toString(elem));
+ ConsumerEndpointTest.this.logger.info(transformer.toString(elem));
} catch (Exception e) {
throw new MessagingException(e);
}
@@ -476,7 +477,7 @@ public class ConsumerEndpointTest extend
+ "</s:Envelope>"));
new HttpClient().executeMethod(post);
String res = post.getResponseBodyAsString();
- log.info(res);
+ logger.info(res);
Element elem = transformer.toDOMElement(new StringSource(res));
assertEquals(Soap12.getInstance().getEnvelope(), DomUtil.getQName(elem));
elem = DomUtil.getFirstChildElement(elem);
@@ -524,9 +525,9 @@ public class ConsumerEndpointTest extend
BufferedReader br = new BufferedReader(new InputStreamReader(gis));
String result = br.readLine();
- log.info(result);
+ logger.info(result);
Node node = transformer.toDOMNode(new StringSource(result));
- log.info(transformer.toString(node));
+ logger.info(transformer.toString(node));
assertEquals("world", textValueOfXPath(node, "/hello/text()"));
if (post.getStatusCode() != 200) {
throw new InvalidStatusResponseException(post.getStatusCode());
@@ -546,7 +547,7 @@ public class ConsumerEndpointTest extend
Element elem;
try {
elem = transformer.toDOMElement(in.getContent());
- log.info(transformer.toString(elem));
+ ConsumerEndpointTest.this.logger.info(transformer.toString(elem));
} catch (Exception e) {
throw new MessagingException(e);
}
@@ -584,7 +585,7 @@ public class ConsumerEndpointTest extend
BufferedReader br = new BufferedReader(new InputStreamReader(gis));
String result = br.readLine();
- log.info(result);
+ logger.info(result);
Element elem = transformer.toDOMElement(new StringSource(result));
assertEquals(Soap12.getInstance().getEnvelope(), DomUtil.getQName(elem));
elem = DomUtil.getFirstChildElement(elem);
@@ -662,7 +663,7 @@ public class ConsumerEndpointTest extend
throw new InvalidStatusResponseException(post.getStatusCode());
}
Node node = transformer.toDOMNode(new StreamSource(post.getResponseBodyAsStream()));
- log.info(transformer.toString(node));
+ logger.info(transformer.toString(node));
assertEquals("world", textValueOfXPath(node, "/hello/text()"));
} catch (Throwable t) {
throwables.add(t);
@@ -716,7 +717,7 @@ public class ConsumerEndpointTest extend
Definition def = reader.readWSDL("http://localhost:"+port2+"/ep1/?wsdl");
StringWriter writer = new StringWriter();
factory.newWSDLWriter().writeWSDL(def, writer);
- log.info(writer.toString());
+ logger.info(writer.toString());
Binding b = (Binding) def.getBindings().values().iterator().next();
BindingOperation bop = (BindingOperation) b.getBindingOperations().iterator().next();
assertEquals(1, bop.getExtensibilityElements().size());
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java Fri Feb 4 09:05:47 2011
@@ -27,10 +27,10 @@ import javax.jbi.messaging.InOut;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.util.FileUtil;
@@ -40,7 +40,7 @@ import org.springframework.context.suppo
public class HttpAddressingTest extends SpringTestSupport {
- private static transient Log log = LogFactory.getLog(HttpAddressingTest.class);
+ private final Logger logger = LoggerFactory.getLogger(HttpAddressingTest.class);
String port1 = System.getProperty("http.port1");
@@ -64,7 +64,7 @@ public class HttpAddressingTest extends
} else {
Node node = new SourceTransformer().toDOMNode(me.getOutMessage());
client.done(me);
- log.info(new SourceTransformer().toString(node));
+ logger.info(new SourceTransformer().toString(node));
assertEquals("myid", textValueOfXPath(node, "//*[local-name()='RelatesTo']"));
assertNotNull(textValueOfXPath(node, "//*[local-name()='MessageID']"));
}
@@ -82,7 +82,7 @@ public class HttpAddressingTest extends
InputStream is = connection.getInputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
FileUtil.copyInputStream(is, baos);
- log.info(baos.toString());
+ logger.info(baos.toString());
}
public void testBad() throws Exception {
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpConsumerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpConsumerTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpConsumerTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpConsumerTest.java Fri Feb 4 09:05:47 2011
@@ -31,8 +31,6 @@ import javax.xml.transform.stream.Stream
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.components.http.HttpInvoker;
import org.apache.servicemix.components.http.HttpSoapClientMarshaler;
@@ -42,9 +40,12 @@ import org.apache.servicemix.jbi.contain
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HttpConsumerTest extends TestCase {
- private static Log logger = LogFactory.getLog(HttpConsumerTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(HttpConsumerTest.class);
protected JBIContainer container;
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpEndpointLoadWsdlTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpEndpointLoadWsdlTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpEndpointLoadWsdlTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpEndpointLoadWsdlTest.java Fri Feb 4 09:05:47 2011
@@ -20,9 +20,8 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.common.ServiceUnit;
import org.apache.servicemix.common.DefaultServiceUnit;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
public class HttpEndpointLoadWsdlTest extends TestCase {
@@ -60,7 +59,7 @@ public class HttpEndpointLoadWsdlTest ex
}
// make the protected method public so I can call it.
public void loadWsdl() {
- logger = LogFactory.getLog(getClass());
+ logger = LoggerFactory.getLogger(getClass());
super.loadWsdl();
}
// this needs to work:
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpProviderTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpProviderTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpProviderTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpProviderTest.java Fri Feb 4 09:05:47 2011
@@ -29,8 +29,6 @@ import javax.xml.transform.stream.Stream
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.JbiConstants;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.components.http.HttpConnector;
@@ -40,10 +38,12 @@ import org.apache.servicemix.jbi.contain
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HttpProviderTest extends TestCase {
- private static transient Log log = LogFactory.getLog(HttpProviderTest.class);
+ private final Logger logger = LoggerFactory.getLogger(HttpProviderTest.class);
protected JBIContainer container;
Integer port1 = Integer.parseInt(System.getProperty("http.port1"));
@@ -221,8 +221,8 @@ public class HttpProviderTest extends Te
SourceTransformer sourceTransformer = new SourceTransformer();
String reply = sourceTransformer.toString(inout.getOutMessage().getContent());
String inputMesage = sourceTransformer.toString(new StreamSource(new ByteArrayInputStream(msg.getBytes())));
- log.info("Msg Sent [" + inputMesage + "]");
- log.info("Msg Recieved [" + reply + "]");
+ logger.info("Msg Sent [" + inputMesage + "]");
+ logger.info("Msg Recieved [" + reply + "]");
assertEquals(inputMesage.length(), reply.length());
assertEquals(inputMesage, reply);
@@ -231,7 +231,7 @@ public class HttpProviderTest extends Te
component.getServiceUnitManager().shutDown("provider");
component.getServiceUnitManager().undeploy("provider", path.getAbsolutePath());
- log.info("Executed in " + (t1 - t0) + "ms");
+ logger.info("Executed in " + (t1 - t0) + "ms");
return reply;
}
@@ -278,7 +278,7 @@ public class HttpProviderTest extends Te
for (int i = 0; i < nbRuns; i++) {
System.gc();
long dt = testInOnly(str, true);
- log.info("Streaming: " + dt);
+ logger.info("Streaming: " + dt);
tearDown();
setUp();
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSoapTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSoapTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSoapTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSoapTest.java Fri Feb 4 09:05:47 2011
@@ -35,6 +35,8 @@ import javax.servlet.http.HttpServletRes
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -49,8 +51,6 @@ import org.apache.commons.httpclient.met
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.components.util.EchoComponent;
@@ -69,7 +69,8 @@ import org.apache.servicemix.soap.marsha
import org.apache.servicemix.tck.ReceiverComponent;
public class HttpSoapTest extends TestCase {
- private static transient Log logger = LogFactory.getLog(HttpSoapTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(HttpSoapTest.class);
protected JBIContainer container;
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java Fri Feb 4 09:05:47 2011
@@ -32,18 +32,18 @@ import org.apache.commons.httpclient.met
import org.apache.commons.httpclient.methods.multipart.Part;
import org.apache.commons.httpclient.methods.multipart.StringPart;
import org.apache.commons.httpclient.util.EncodingUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
public class HttpSpringTest extends SpringTestSupport {
- private static transient Log logger = LogFactory.getLog(HttpSpringTest.class);
+ private final Logger logger = LoggerFactory.getLogger(HttpSpringTest.class);
String port9 = System.getProperty("http.port9");
@@ -51,9 +51,7 @@ public class HttpSpringTest extends Spri
String str = "Basic " + EncodingUtil.getAsciiString(
Base64.encodeBase64(EncodingUtil.getBytes("smx:smx", "UTF-8")));
System.err.println(str);
- if (logger.isDebugEnabled()) {
- System.setProperty("javax.net.debug", "all");
- }
+ System.setProperty("javax.net.debug", "all");
super.setUp();
}
@@ -102,7 +100,7 @@ public class HttpSpringTest extends Spri
RequestEntity entity = new MultipartRequestEntity(parts, filePost.getParams());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
entity.writeRequest(baos);
- logger.info(baos);
+ logger.info(baos.toString());
filePost.setRequestEntity(entity);
HttpClient client = new HttpClient();
int status = client.executeMethod(filePost);
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpURITest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpURITest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpURITest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpURITest.java Fri Feb 4 09:05:47 2011
@@ -24,13 +24,13 @@ import javax.jbi.messaging.MessageExchan
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.servicedesc.ServiceEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -40,7 +40,8 @@ import org.apache.servicemix.jbi.resolve
import org.apache.servicemix.tck.ReceiverComponent;
public class HttpURITest extends TestCase {
- private static Log logger = LogFactory.getLog(HttpURITest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(HttpURITest.class);
String port1 = System.getProperty("http.port1");
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpWsdlTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpWsdlTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpWsdlTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpWsdlTest.java Fri Feb 4 09:05:47 2011
@@ -21,9 +21,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.SocketAddress;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.servlet.ServletException;
@@ -41,14 +38,14 @@ import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import junit.framework.TestCase;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
@@ -61,7 +58,8 @@ import org.mortbay.jetty.handler.Abstrac
import org.springframework.core.io.UrlResource;
public class HttpWsdlTest extends TestCase {
- private static transient Log log = LogFactory.getLog(HttpWsdlTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(HttpWsdlTest.class);
private Integer port4 = Integer.parseInt(System.getProperty("http.port4"));
private Integer port5 = Integer.parseInt(System.getProperty("http.port5"));
@@ -133,7 +131,7 @@ public class HttpWsdlTest extends TestCa
ByteArrayOutputStream baos = new ByteArrayOutputStream();
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(definition, baos);
- log.info(baos.toString());
+ logger.info(baos.toString());
}
protected Definition createDefinition(boolean rpc) throws WSDLException {
@@ -183,7 +181,7 @@ public class HttpWsdlTest extends TestCa
ByteArrayOutputStream baos = new ByteArrayOutputStream();
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(def, baos);
- log.info(baos.toString());
+ logger.info(baos.toString());
return def;
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpXBeanDeployerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpXBeanDeployerTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpXBeanDeployerTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/HttpXBeanDeployerTest.java Fri Feb 4 09:05:47 2011
@@ -31,12 +31,12 @@ import javax.wsdl.Service;
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.jbi.container.ActivationSpec;
@@ -46,7 +46,7 @@ import org.apache.servicemix.jbi.jaxp.St
public class HttpXBeanDeployerTest extends TestCase {
- private static Log logger = LogFactory.getLog(HttpXBeanDeployerTest.class);
+ private final Logger logger = LoggerFactory.getLogger(HttpXBeanDeployerTest.class);
protected JBIContainer container;
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ManagedContextManagerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ManagedContextManagerTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ManagedContextManagerTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ManagedContextManagerTest.java Fri Feb 4 09:05:47 2011
@@ -20,13 +20,12 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ManagedContextManagerTest extends TestCase {
- private static transient Log log = LogFactory.getLog(ManagedContextManagerTest.class);
+ private final static Logger log = LoggerFactory.getLogger(ManagedContextManagerTest.class);
private ManagedContextManager server;
private HttpConfiguration config;
@@ -81,7 +80,7 @@ public class ManagedContextManagerTest e
}
public void process(HttpServletRequest request, HttpServletResponse response) throws Exception {
- log.info(request);
+ log.info(request.toString());
}
}