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/07/19 23:04:03 UTC
svn commit: r1148530 [6/6] - in /servicemix/smx3/trunk: ./
common/servicemix-components/
common/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/
common/servicemix-components/src/main/java/org/apache/servicemix/components...
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java Tue Jul 19 21:03:14 2011
@@ -212,9 +212,9 @@ public class SedaFlow extends AbstractFl
queue.shutDown();
unregisterQueue(queue);
} catch (JBIException e) {
- log.error("Failed to stop SedaQueue: " + queue + ": " + e);
- if (log.isDebugEnabled()) {
- log.debug("Failed to stop SedaQueue: " + queue, e);
+ LOGGER.error("Failed to stop SedaQueue: " + queue + ": " + e);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Failed to stop SedaQueue: " + queue, e);
}
}
}
@@ -250,9 +250,9 @@ public class SedaFlow extends AbstractFl
queue.setObjectName(objectName);
broker.getContainer().getManagementContext().registerMBean(objectName, queue, LifeCycleMBean.class);
} catch (JMException e) {
- log.error("Failed to register SedaQueue: " + queue + " with the ManagementContext: " + e);
- if (log.isDebugEnabled()) {
- log.debug("Failed to register SedaQueue: " + queue + " with the ManagementContext", e);
+ LOGGER.error("Failed to register SedaQueue: " + queue + " with the ManagementContext: " + e);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Failed to register SedaQueue: " + queue + " with the ManagementContext", e);
}
}
}
@@ -261,9 +261,9 @@ public class SedaFlow extends AbstractFl
try {
broker.getContainer().getManagementContext().unregisterMBean(queue.getObjectName());
} catch (JBIException e) {
- log.error("Failed to unregister SedaQueue: " + queue + " from the ManagementContext");
- if (log.isDebugEnabled()) {
- log.debug("Failed to unregister SedaQueue: " + queue + " with the ManagementContext", e);
+ LOGGER.error("Failed to unregister SedaQueue: " + queue + " from the ManagementContext");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Failed to unregister SedaQueue: " + queue + " with the ManagementContext", e);
}
}
}
@@ -289,8 +289,8 @@ public class SedaFlow extends AbstractFl
if (oldTx != null) {
TransactionManager tm = (TransactionManager) getBroker().getContainer().getTransactionManager();
if (tm != null) {
- if (log.isDebugEnabled()) {
- log.debug("Suspending transaction for " + me.getExchangeId() + " in " + this);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Suspending transaction for " + me.getExchangeId() + " in " + this);
}
Transaction tx = tm.suspend();
if (tx != oldTx) {
@@ -313,8 +313,8 @@ public class SedaFlow extends AbstractFl
if (oldTx != null) {
TransactionManager tm = (TransactionManager) getBroker().getContainer().getTransactionManager();
if (tm != null) {
- if (log.isDebugEnabled()) {
- log.debug("Resuming transaction for " + me.getExchangeId() + " in " + this);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Resuming transaction for " + me.getExchangeId() + " in " + this);
}
tm.resume(oldTx);
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java Tue Jul 19 21:03:14 2011
@@ -24,13 +24,13 @@ import javax.management.JMException;
import javax.management.MBeanAttributeInfo;
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.executors.Executor;
import org.apache.servicemix.jbi.framework.ComponentNameSpace;
import org.apache.servicemix.jbi.management.AttributeInfoHelper;
import org.apache.servicemix.jbi.management.BaseLifeCycle;
import org.apache.servicemix.jbi.messaging.MessageExchangeImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A simple Straight through flow
@@ -39,7 +39,7 @@ import org.apache.servicemix.jbi.messagi
*/
public class SedaQueue extends BaseLifeCycle {
- private static final Log LOG = LogFactory.getLog(SedaQueue.class);
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(SedaQueue.class);
protected SedaFlow flow;
protected ComponentNameSpace name;
@@ -120,7 +120,7 @@ public class SedaQueue extends BaseLifeC
/**
* Enqueue a Packet for processing
*
- * @param packet
+ * @param me
* @throws InterruptedException
* @throws MessagingException
*/
@@ -128,12 +128,10 @@ public class SedaQueue extends BaseLifeC
executor.execute(new Runnable() {
public void run() {
try {
- if (LOG.isDebugEnabled()) {
- LOG.debug(this + " dequeued exchange: " + me);
- }
+ LOGGER.debug("{} dequeued exchange: {}", this, me);
flow.doRouting(me);
} catch (Throwable e) {
- LOG.error(this + " got error processing " + me, e);
+ LOGGER.error(this + " got error processing " + me, e);
}
}
});
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilder.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilder.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilder.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilder.java Tue Jul 19 21:03:14 2011
@@ -22,16 +22,17 @@ import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.util.DOMUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public final class EndpointReferenceBuilder {
public static final String JBI_NAMESPACE = "http://java.sun.com/jbi/end-point-reference";
public static final String XMLNS_NAMESPACE = "http://www.w3.org/2000/xmlns/";
- private static final Log LOG = LogFactory.getLog(EndpointReferenceBuilder.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(EndpointReferenceBuilder.class);
private EndpointReferenceBuilder() {
}
@@ -47,7 +48,7 @@ public final class EndpointReferenceBuil
fragment.appendChild(epr);
return fragment;
} catch (Exception e) {
- LOG.warn("Unable to create reference for ServiceEndpoint " + endpoint, e);
+ LOGGER.warn("Unable to create reference for ServiceEndpoint {}", endpoint, e);
return null;
}
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/DOMUtil.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/DOMUtil.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/DOMUtil.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/DOMUtil.java Tue Jul 19 21:03:14 2011
@@ -31,6 +31,8 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -38,9 +40,6 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* A collection of W3C DOM helper methods
*
@@ -48,7 +47,8 @@ import org.apache.commons.logging.LogFac
*/
public final class DOMUtil {
- private static final Log LOG = LogFactory.getLog(DOMUtil.class);
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(DOMUtil.class);
+
private static DocumentBuilderFactory dbf;
private static Queue builders = new ConcurrentLinkedQueue();
@@ -161,8 +161,8 @@ public final class DOMUtil {
try {
answer = element.getAttribute(attributeName);
} catch (Exception e) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Caught exception looking up attribute: " + attributeName + " on element: " + element + ". Cause: " + e, e);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Caught exception looking up attribute: " + attributeName + " on element: " + element + ". Cause: " + e, e);
}
}
if (answer == null || answer.length() == 0) {
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileVersionUtil.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileVersionUtil.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileVersionUtil.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileVersionUtil.java Tue Jul 19 21:03:14 2011
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.jbi.util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Supports a simple versioning scheme using the file system
*
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFac
*/
public final class FileVersionUtil {
- private static final Log LOG = LogFactory.getLog(FileVersionUtil.class);
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(FileVersionUtil.class);
private static final String VERSION_PREFIX = "version_";
@@ -133,7 +133,7 @@ public final class FileVersionUtil {
File[] files = rootDirectory.listFiles();
for (int i = 0; i < files.length; i++) {
if (!isReserved(files[i].getName())) {
- LOG.info(rootDirectory.getPath() + ": moving non-versioned file " + files[i].getName() + " to " + newRoot.getName());
+ LOGGER.info(rootDirectory.getPath() + ": moving non-versioned file " + files[i].getName() + " to " + newRoot.getName());
File moveTo = FileUtil.getDirectoryPath(newRoot, files[i].getName());
FileUtil.moveFile(files[i], moveTo);
}
@@ -179,4 +179,5 @@ public final class FileVersionUtil {
}
return result;
}
+
}
\ No newline at end of file
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java Tue Jul 19 21:03:14 2011
@@ -26,14 +26,14 @@ 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.jbi.api.Destination;
import org.apache.servicemix.jbi.api.Message;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.tck.MessageList;
import org.apache.servicemix.tck.Receiver;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
/**
@@ -41,7 +41,7 @@ import org.springframework.context.suppo
*/
public class ClientDestinationTest extends TestCase {
- private static final transient Log LOG = LogFactory.getLog(ClientDestinationTest.class);
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(ClientDestinationTest.class);
protected AbstractXmlApplicationContext context;
protected ServiceMixClient client;
@@ -90,7 +90,7 @@ public class ClientDestinationTest exten
assertNotNull("Should have returned a non-null response!", response);
- LOG.info("Received result: " + response);
+ LOGGER.info("Received result: {}", response);
}
@@ -146,4 +146,5 @@ public class ClientDestinationTest exten
protected AbstractXmlApplicationContext createBeanFactory() {
return new ClassPathXmlApplicationContext("org/apache/servicemix/client/example.xml");
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java Tue Jul 19 21:03:14 2011
@@ -30,13 +30,13 @@ 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.jbi.api.EndpointResolver;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.tck.Receiver;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
/**
@@ -44,7 +44,7 @@ import org.springframework.context.suppo
*/
public class ServiceMixClientTest extends TestCase {
- private static final transient Log LOG = LogFactory.getLog(ServiceMixClientTest.class);
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(ServiceMixClientTest.class);
protected AbstractXmlApplicationContext context;
protected ServiceMixClient client;
@@ -95,8 +95,6 @@ public class ServiceMixClientTest extend
}
public void testSendUsingMapAndPOJOsUsingContainerRoutingWithNoConfiguration() throws Exception {
-
-
try {
Map properties = new HashMap();
properties.put("name", "James");
@@ -104,12 +102,11 @@ public class ServiceMixClientTest extend
client.send(null, null, properties, "<hello>world</hello>");
fail("Should have thrown an exception as we have not wired in any container routing information to this client");
} catch (JBIException e) {
- LOG.info("Caught expected exception as we have specified no endpoint resolver: " + e);
+ LOGGER.info("Caught expected exception as we have specified no endpoint resolver", e);
assertNotNull(e);
}
}
-
// Request methods
//-------------------------------------------------------------------------
public void testRequestUsingJbiAPIsByServiceName() throws Exception {
@@ -140,11 +137,9 @@ public class ServiceMixClientTest extend
assertNotNull("Should have returned a non-null response!", response);
- LOG.info("Received result: " + response);
+ LOGGER.info("Received result: {}", response);
}
-
-
// Implementation methods
//-------------------------------------------------------------------------
protected void assertRequestUsingJBIAPIs(QName service) throws Exception {
@@ -162,8 +157,8 @@ public class ServiceMixClientTest extend
assertNotNull("outMessage is null!", outMessage);
assertEquals("foo header", "hello", outMessage.getProperty("foo"));
- LOG.info("Received result: " + outMessage.getContent());
- LOG.info("XML is: " + transformer.toString(outMessage.getContent()));
+ LOGGER.info("Received result: {}", outMessage.getContent());
+ LOGGER.info("XML is: {}", transformer.toString(outMessage.getContent()));
}
protected void assertRequestUsingMapAndPOJOByServiceName(QName service) throws Exception {
@@ -175,7 +170,7 @@ public class ServiceMixClientTest extend
assertNotNull("Should have returned a non-null response!", response);
- LOG.info("Received result: " + response);
+ LOGGER.info("Received result: {}", response);
}
protected void setUp() throws Exception {
@@ -213,4 +208,5 @@ public class ServiceMixClientTest extend
protected AbstractXmlApplicationContext createBeanFactory() {
return new ClassPathXmlApplicationContext("org/apache/servicemix/client/example.xml");
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java Tue Jul 19 21:03:14 2011
@@ -27,18 +27,18 @@ 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.components.util.OutBinding;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class SimpleClientTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(SimpleClientTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SimpleClientTest.class);
protected JBIContainer container;
protected OutBinding out;
@@ -51,7 +51,7 @@ public class SimpleClientTest extends Te
container.start();
out = new OutBinding() {
protected void process(MessageExchange exchange, NormalizedMessage message) throws MessagingException {
- LOG.info("Received: " + message);
+ LOGGER.info("Received: {}", message);
done(exchange);
}
};
@@ -79,4 +79,5 @@ public class SimpleClientTest extends Te
exchange.setService(service);
client.sendSync(exchange);
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ComponentTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ComponentTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ComponentTest.java Tue Jul 19 21:03:14 2011
@@ -24,16 +24,17 @@ import org.w3c.dom.DocumentFragment;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* @version $Revision$
*/
public class ComponentTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(ComponentTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ComponentTest.class);
protected SourceTransformer transformer = new SourceTransformer();
@@ -66,8 +67,8 @@ public class ComponentTest extends TestC
DocumentFragment fragment = descriptorExtension.getDescriptorExtension();
assertNotNull("fragment is null", fragment);
- LOG.info("Created document fragment: " + fragment);
- LOG.info("XML: " + transformer.toString(new DOMSource(fragment)));
+ LOGGER.info("Created document fragment: {}", fragment);
+ LOGGER.info("XML: {}", transformer.toString(new DOMSource(fragment)));
}
protected void assertArrayEquals(String text, Object[] expected, Object[] actual) {
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java Tue Jul 19 21:03:14 2011
@@ -32,14 +32,14 @@ import javax.xml.stream.XMLStreamWriter;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractManagementTest extends TestCase {
- protected Log logger = LogFactory.getLog(getClass());
+ protected static final transient Logger LOGGER = LoggerFactory.getLogger(AbstractManagementTest.class);
protected JBIContainer container;
@@ -58,7 +58,7 @@ public abstract class AbstractManagement
try {
shutdownContainer();
} catch (Exception e) {
- logger.info("Error shutting down container", e);
+ LOGGER.info("Error shutting down container", e);
}
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentMessageTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentMessageTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentMessageTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentMessageTest.java Tue Jul 19 21:03:14 2011
@@ -23,8 +23,6 @@ import javax.xml.transform.TransformerEx
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.framework.ManagementSupport;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
@@ -33,8 +31,12 @@ import org.apache.xml.utils.PrefixResolv
import org.apache.xpath.CachedXPathAPI;
import org.apache.xpath.objects.XObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class DeploymentMessageTest extends AbstractManagementTest {
- private static transient Log log = LogFactory.getLog(DeploymentMessageTest.class);
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(DeploymentMessageTest.class);
protected void initContainer() {
container.setCreateMBeanServer(false);
@@ -50,7 +52,7 @@ public class DeploymentMessageTest exten
} catch (Exception e) {
assertTrue(e instanceof Exception);
String str = e.getMessage();
- log.info(str);
+ LOGGER.info(str);
Node node = new SourceTransformer().toDOMNode(new StringSource(str));
assertNotNull(node);
assertEquals("FAILED", textValueOfXPath(node, "//jbi:frmwk-task-result//jbi:task-result"));
@@ -67,7 +69,7 @@ public class DeploymentMessageTest exten
} catch (Exception e) {
assertTrue(e instanceof Exception);
String str = e.getMessage();
- log.info(str);
+ LOGGER.info(str);
Node node = new SourceTransformer().toDOMNode(new StringSource(str));
assertNotNull(node);
assertEquals("FAILED", textValueOfXPath(node, "//jbi:frmwk-task-result//jbi:task-result"));
@@ -85,7 +87,7 @@ public class DeploymentMessageTest exten
} catch (Exception e) {
assertTrue(e instanceof Exception);
String str = e.getMessage();
- log.info(str);
+ LOGGER.info(str);
Node node = new SourceTransformer().toDOMNode(new StringSource(str));
assertNotNull(node);
assertEquals("FAILED", textValueOfXPath(node, "//jbi:frmwk-task-result//jbi:task-result"));
@@ -103,7 +105,7 @@ public class DeploymentMessageTest exten
} catch (Exception e) {
assertTrue(e instanceof Exception);
String str = e.getMessage();
- log.info(str);
+ LOGGER.info(str);
Node node = new SourceTransformer().toDOMNode(new StringSource(str));
assertNotNull(node);
assertEquals("FAILED", textValueOfXPath(node, "//jbi:frmwk-task-result//jbi:task-result"));
@@ -116,13 +118,13 @@ public class DeploymentMessageTest exten
DummyComponent component = new DummyComponent();
String deployResult = DOMUtil.asXML(ManagementSupport.createComponentSuccess("deploy", "component1"));
component.setResult(deployResult);
- log.info(deployResult);
+ LOGGER.info(deployResult);
startContainer(true);
getContainer().activateComponent(component, "component1");
getContainer().getEnvironmentContext().createComponentRootDir("component1");
File installSaUrl = createServiceAssemblyArchive("sa", "su", "component1");
String result = getDeploymentService().deploy(installSaUrl.getAbsolutePath());
- log.info(result);
+ LOGGER.info(result);
Node node = new SourceTransformer().toDOMNode(new StringSource(result));
assertNotNull(node);
// main task
@@ -138,11 +140,11 @@ public class DeploymentMessageTest exten
String deployResult1 = DOMUtil.asXML(ManagementSupport.createComponentFailure("deploy", "component1", "xxx", null));
component1.setResult(deployResult1);
component1.setException(true);
- log.info(deployResult1);
+ LOGGER.info(deployResult1);
DummyComponent component2 = new DummyComponent();
String deployResult2 = DOMUtil.asXML(ManagementSupport.createComponentSuccess("deploy", "component2"));
component2.setResult(deployResult2);
- log.info(deployResult2);
+ LOGGER.info(deployResult2);
startContainer(true);
getContainer().activateComponent(component1, "component1");
getContainer().getEnvironmentContext().createComponentRootDir("component1");
@@ -156,7 +158,7 @@ public class DeploymentMessageTest exten
} catch (Exception e) {
result = e.getMessage();
}
- log.info(result);
+ LOGGER.info(result);
Node node = new SourceTransformer().toDOMNode(new StringSource(result));
assertNotNull(node);
// main task
@@ -179,7 +181,7 @@ public class DeploymentMessageTest exten
} catch (Exception e) {
assertTrue(e instanceof Exception);
String str = e.getMessage();
- log.info(str);
+ LOGGER.info(str);
Node node = new SourceTransformer().toDOMNode(new StringSource(str));
assertNotNull(node);
assertEquals("FAILED", textValueOfXPath(node, "//jbi:frmwk-task-result//jbi:task-result"));
@@ -196,7 +198,7 @@ public class DeploymentMessageTest exten
} catch (Exception e) {
assertTrue(e instanceof Exception);
String str = e.getMessage();
- log.info(str);
+ LOGGER.info(str);
Node node = new SourceTransformer().toDOMNode(new StringSource(str));
assertNotNull(node);
assertEquals("FAILED", textValueOfXPath(node, "//jbi:frmwk-task-result//jbi:task-result"));
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java Tue Jul 19 21:03:14 2011
@@ -140,7 +140,7 @@ public class DeploymentTest extends Abst
assertTrue(getDeploymentService().canDeployToComponent("component1"));
File installSaUrl = createServiceAssemblyArchive("sa", "su", "component1");
String result = getDeploymentService().deploy(installSaUrl.getAbsolutePath());
- logger.debug(result);
+ LOGGER.debug(result);
String[] sas = getDeploymentService().getDeployedServiceAssemblies();
assertNotNull(sas);
assertEquals(1, sas.length);
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java Tue Jul 19 21:03:14 2011
@@ -26,16 +26,16 @@ import javax.management.remote.JMXServic
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.container.JBIContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ManagementContextTest
*/
public class AdminServiceTest extends TestCase {
- private Log log = LogFactory.getLog(getClass());
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(AdminServiceTest.class);
private JBIContainer container;
@@ -70,11 +70,12 @@ public class AdminServiceTest extends Te
Object proxy = MBeanServerInvocationHandler.newProxyInstance(connection, asmName, AdminServiceMBean.class, true);
AdminServiceMBean asm = (AdminServiceMBean) proxy;
- log.info(asm.getBindingComponents());
- log.info(asm.getComponentByName("toto"));
+ LOGGER.info(asm.getBindingComponents().toString());
+ LOGGER.info(asm.getComponentByName("toto").toString());
}
protected ObjectName getObjectName(Class systemClass) {
return ManagementContext.getSystemObjectName(ManagementContext.DEFAULT_DOMAIN, JBIContainer.DEFAULT_NAME, systemClass);
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java Tue Jul 19 21:03:14 2011
@@ -31,16 +31,16 @@ import javax.management.remote.JMXServic
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.container.JBIContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ManagementContextTest
*/
public class ManagementAttributesTest extends TestCase {
- private Log log = LogFactory.getLog(getClass());
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(ManagementAttributesTest.class);
private JBIContainer container;
@@ -72,28 +72,26 @@ public class ManagementAttributesTest ex
// connector server is bound to
MBeanServerConnection connection = connector.getMBeanServerConnection();
- log.info(connection.getMBeanCount());
+ LOGGER.info(connection.getMBeanCount().toString());
Set set = connection.queryNames(new ObjectName(connection.getDefaultDomain() + ":*"), null);
for (Iterator iter = set.iterator(); iter.hasNext();) {
ObjectName name = (ObjectName) iter.next();
- log.info(name.toString());
+ LOGGER.info(name.toString());
MBeanInfo info = connection.getMBeanInfo(name);
MBeanAttributeInfo[] mia = info.getAttributes();
String[] attrNames = new String[mia.length];
for (int i = 0; i < mia.length; i++) {
attrNames[i] = mia[i].getName();
- log.info("attr " + mia[i].getName() + " " + mia[i].getType() + " " + connection.getAttribute(name, mia[i].getName()));
+ LOGGER.info("attr " + mia[i].getName() + " " + mia[i].getType() + " " + connection.getAttribute(name, mia[i].getName()));
}
AttributeList attributeList = (AttributeList) connection.getAttributes(name, attrNames);
for (int i = 0; i < attributeList.size(); i++) {
Attribute attribute = (Attribute) attributeList.get(i);
- log.info("bulk " + attribute.getName() + " " + attribute.getValue() + " " + attribute.toString());
+ LOGGER.info("bulk " + attribute.getName() + " " + attribute.getValue() + " " + attribute.toString());
}
-
}
-
}
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java Tue Jul 19 21:03:14 2011
@@ -29,17 +29,17 @@ import javax.management.remote.JMXServic
import junit.framework.TestCase;
-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.JBIContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ManagementContextTest
*/
public class ManagementContextTest extends TestCase {
- private Log log = LogFactory.getLog(getClass());
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(ManagementContextTest.class);
// The host, port and path where the rmiregistry runs.
private String namingHost = "localhost";
@@ -86,17 +86,17 @@ public class ManagementContextTest exten
// The magic of JDK 1.3 dynamic proxy and JSR 160:
// delegate.getImplementationVendor() is actually a remote JMX call,
// but it looks like a local, old-style, java call.
- log.info(delegate.getImplementationVendor() + " is cool !");
+ LOGGER.info("{} is cool !", delegate.getImplementationVendor());
ObjectName objName = context.createObjectName(context);
proxy = MBeanServerInvocationHandler.newProxyInstance(connection, objName, LifeCycleMBean.class, true);
LifeCycleMBean mc = (LifeCycleMBean) proxy;
- log.info("STATE = " + mc.getCurrentState());
+ LOGGER.info("STATE = {}", mc.getCurrentState());
mc.start();
- log.info("STATE = " + mc.getCurrentState());
+ LOGGER.info("STATE = {}", mc.getCurrentState());
mc.stop();
- log.info("STATE = " + mc.getCurrentState());
+ LOGGER.info("STATE = {}", mc.getCurrentState());
}
public void testComponent() throws Exception {
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java Tue Jul 19 21:03:14 2011
@@ -19,17 +19,17 @@ package org.apache.servicemix.jbi.manage
import java.io.File;
import java.net.URL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.util.FileUtil;
import org.apache.tools.ant.Project;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- *
* InstallComponentTaskTest
*/
public class DeployAndListServiceAssemblyTasksTest extends JbiTaskSupport {
- private static transient Log log = LogFactory.getLog(DeployAndListServiceAssemblyTasksTest.class);
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(DeployAndListServiceAssemblyTasksTest.class);
private static final String XML_OUTPUT_PROPERTY = "test.xml.output";
@@ -73,7 +73,7 @@ public class DeployAndListServiceAssembl
listServiceAssembliesTask.setXmlOutput(XML_OUTPUT_PROPERTY);
listServiceAssembliesTask.execute();
- log.info(project.getProperty(XML_OUTPUT_PROPERTY));
+ LOGGER.info(project.getProperty(XML_OUTPUT_PROPERTY));
if (url != null) {
String file = url.getFile();
@@ -88,9 +88,9 @@ public class DeployAndListServiceAssembl
listServiceAssembliesTask.setXmlOutput(XML_OUTPUT_PROPERTY);
listServiceAssembliesTask.execute();
- log.info(project.getProperty(XML_OUTPUT_PROPERTY));
+ LOGGER.info(project.getProperty(XML_OUTPUT_PROPERTY));
FileUtil.deleteFile(rootDir);
-
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractPersistenceTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractPersistenceTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractPersistenceTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractPersistenceTest.java Tue Jul 19 21:03:14 2011
@@ -24,8 +24,6 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.RuntimeJBIException;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
@@ -34,6 +32,8 @@ import org.apache.servicemix.tck.AsyncRe
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.ReceiverComponent;
import org.apache.servicemix.tck.SenderComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
@@ -41,7 +41,8 @@ import org.springframework.transaction.s
* @version $Revision$
*/
public abstract class AbstractPersistenceTest extends AbstractTransactionTest {
- private static transient Log log = LogFactory.getLog(AbstractPersistenceTest.class);
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(AbstractPersistenceTest.class);
protected JBIContainer createJbiContainer(String name) throws Exception {
JBIContainer container = new JBIContainer();
@@ -67,11 +68,11 @@ public abstract class AbstractPersistenc
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
try {
if (delivered.get(exchange.getExchangeId()) == null) {
- log.info("Message delivery rolled back: " + exchange.getExchangeId());
+ AbstractPersistenceTest.LOGGER.info("Message delivery rolled back: {}", exchange.getExchangeId());
delivered.put(exchange.getExchangeId(), Boolean.TRUE);
tm.setRollbackOnly();
} else {
- log.info("Message delivery accepted: " + exchange.getExchangeId());
+ AbstractPersistenceTest.LOGGER.info("Message delivery accepted: {}", exchange.getExchangeId());
super.onMessageExchange(exchange);
}
} catch (Exception e) {
@@ -84,13 +85,13 @@ public abstract class AbstractPersistenc
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
try {
if (delivered.get(exchange.getExchangeId()) == null) {
- log.info("Message delivery rolled back: " + exchange.getExchangeId());
+ LOGGER.info("Message delivery rolled back: {}", exchange.getExchangeId());
delivered.put(exchange.getExchangeId(), Boolean.TRUE);
tm.setRollbackOnly();
exchange.setStatus(ExchangeStatus.DONE);
getContext().getDeliveryChannel().send(exchange);
} else {
- log.info("Message delivery accepted: " + exchange.getExchangeId());
+ LOGGER.info("Message delivery accepted: {}", exchange.getExchangeId());
super.onMessageExchange(exchange);
}
} catch (Exception e) {
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java Tue Jul 19 21:03:14 2011
@@ -36,19 +36,19 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.framework.ComponentMBeanImpl;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.easymock.EasyMock.*;
public class DeliveryChannelImplTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(DeliveryChannelImplTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DeliveryChannelImplTest.class);
protected JBIContainer container;
@@ -111,7 +111,7 @@ public class DeliveryChannelImplTest ext
success.set(true);
done.set(true);
} catch (MessagingException e) {
- LOG.error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
success.set(false);
done.set(true);
}
@@ -236,7 +236,7 @@ public class DeliveryChannelImplTest ext
channel.sendSync(me);
} catch (MessagingException e) {
- LOG.error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
}
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java Tue Jul 19 21:03:14 2011
@@ -32,16 +32,16 @@ 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.jbi.jaxp.BytesSource;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.util.StreamDataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageExchangeImplTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(MessageExchangeImplTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MessageExchangeImplTest.class);
protected void testSerializeDeserialize(Source src) throws Exception {
MessageExchange me = new InOnlyImpl("exchangeId");
@@ -76,7 +76,7 @@ public class MessageExchangeImplTest ext
String outStr = new SourceTransformer().toString(outSrc);
assertNotNull(outStr);
assertNotNull(((NormalizedMessageImpl) msgOut).getBody());
- LOG.info(outStr);
+ LOGGER.info(outStr);
assertNotNull(msgOut.getAttachment("myAttachment"));
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java Tue Jul 19 21:03:14 2011
@@ -21,18 +21,18 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.container.SubscriptionSpec;
import org.apache.servicemix.jbi.resolver.SubscriptionFilter;
import org.apache.servicemix.tck.ReceiverComponent;
import org.apache.servicemix.tck.SenderComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PubSubTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(PubSubTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PubSubTest.class);
private SenderComponent sender;
@@ -92,9 +92,10 @@ public class PubSubTest extends TestCase
public static class Filter implements SubscriptionFilter {
public boolean matches(MessageExchange arg0) {
- LOG.info("Matches");
+ LOGGER.info("Matches");
return true;
}
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java Tue Jul 19 21:03:14 2011
@@ -20,15 +20,16 @@ import junit.framework.TestCase;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.nmr.flow.Flow;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
public class MultipleJMSFlowTest extends TestCase {
- private static transient Log log = LogFactory.getLog(MultipleJMSFlowTest.class);
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(MultipleJMSFlowTest.class);
protected BrokerService broker;
@@ -64,7 +65,7 @@ public class MultipleJMSFlowTest extends
printNodes(containers);
}
long t1 = System.currentTimeMillis();
- log.info(t1 - t0);
+ LOGGER.info(Long.toString(t1 - t0));
for (int i = 0; i < containers.length; i++) {
containers[i].activateComponent(new ReceiverComponent(), "receiver");
}
@@ -94,7 +95,7 @@ public class MultipleJMSFlowTest extends
}
msg += ((JMSFlow) containers[j].getFlow()).numberInNetwork();
}
- log.info(msg);
+ LOGGER.info(msg);
}
protected Flow createFlow() {
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/PingService.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/PingService.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/PingService.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/PingService.java Tue Jul 19 21:03:14 2011
@@ -21,29 +21,30 @@ import javax.jbi.messaging.MessageExchan
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.MessageExchangeListener;
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- * Test service from SM-174 - (Craig Wall orginal author)
+ * Test service from SM-174
*/
public class PingService extends ComponentSupport implements MessageExchangeListener {
- private static transient Log log = LogFactory.getLog(PingService.class);
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(PingService.class);
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
if (exchange.getStatus() == ExchangeStatus.ACTIVE) {
- log.info("GOT A MESSAGE; exchange.status=" + exchange.getStatus());
+ LOGGER.info("GOT A MESSAGE; exchange.status={}", exchange.getStatus());
NormalizedMessage out = exchange.createMessage();
out.setContent(new StringSource("<response>Ping back at ya!</response>"));
- log.info("SENDING RESPONSE; exchange.status=" + exchange.getStatus());
+ LOGGER.info("SENDING RESPONSE; exchange.status={}", exchange.getStatus());
exchange.setMessage(out, "out");
getDeliveryChannel().sendSync(exchange);
- log.info("RESPONSE SENT; exchange.status=" + exchange.getStatus());
+ LOGGER.info("RESPONSE SENT; exchange.status={}", exchange.getStatus());
} else {
- log.info("GOT A MESSAGE; exchange.status=" + exchange.getStatus());
+ LOGGER.info("GOT A MESSAGE; exchange.status={}", exchange.getStatus());
}
}
}
\ No newline at end of file
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java Tue Jul 19 21:03:14 2011
@@ -22,20 +22,21 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* JMSCluster Test for SendSync
*/
public class SimpleClusterSendSyncTest extends TestCase {
- private static transient Log log = LogFactory.getLog(SimpleClusterSendSyncTest.class);
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(SimpleClusterSendSyncTest.class);
protected SpringJBIContainer jbi;
protected AbstractXmlApplicationContext context;
@@ -63,10 +64,10 @@ public class SimpleClusterSendSyncTest e
exchange.setService(new QName("http://www.habuma.com/foo", "pingService"));
NormalizedMessage in = exchange.getInMessage();
in.setContent(new StringSource("<ping>Pinging you</ping>"));
- log.info("SENDING; exchange.status=" + exchange.getStatus());
+ LOGGER.info("SENDING; exchange.status={}", exchange.getStatus());
client.sendSync(exchange);
assertNotNull(exchange.getOutMessage());
- log.info("GOT RESPONSE; exchange.out=" + new SourceTransformer().toString(exchange.getOutMessage().getContent()));
+ LOGGER.info("GOT RESPONSE; exchange.out={}", new SourceTransformer().toString(exchange.getOutMessage().getContent()));
client.done(exchange);
// Wait for done to be delivered
Thread.sleep(50);
@@ -74,4 +75,5 @@ public class SimpleClusterSendSyncTest e
ctx.close();
}
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java Tue Jul 19 21:03:14 2011
@@ -32,16 +32,12 @@ import javax.security.auth.login.LoginCo
import javax.security.auth.login.LoginException;
import junit.framework.TestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
-/**
- *
- */
public class PropertiesLoginModuleTest extends TestCase {
- private static transient Log log = LogFactory.getLog(PropertiesLoginModuleTest.class);
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(PropertiesLoginModuleTest.class);
static {
String path = System.getProperty("java.security.auth.login.config");
@@ -52,7 +48,7 @@ public class PropertiesLoginModuleTest e
System.setProperty("java.security.auth.login.config", path);
}
}
- log.info("Path to login config: " + path);
+ LOGGER.info("Path to login config: {}", path);
//
// This test depends on the "policy.allowSystemProperty" security
// property being set to true. If we don't ensure it is set here,
@@ -62,7 +58,7 @@ public class PropertiesLoginModuleTest e
try {
if (!"true".equals(Security.getProperty("policy.allowSystemProperty"))) {
Security.setProperty("policy.allowSystemProperty", "true");
- log.info("Reset security property 'policy.allowSystemProperty' to 'true'");
+ LOGGER.info("Reset security property 'policy.allowSystemProperty' to 'true'");
}
} catch (SecurityException e) {
// Ignore.
@@ -139,4 +135,5 @@ public class PropertiesLoginModuleTest e
// Expected
}
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java Tue Jul 19 21:03:14 2011
@@ -34,8 +34,6 @@ import javax.security.auth.login.LoginCo
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.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.JBIContainer;
@@ -44,10 +42,12 @@ import org.apache.servicemix.jbi.securit
import org.apache.servicemix.jbi.security.acl.impl.AuthorizationEntry;
import org.apache.servicemix.jbi.security.acl.impl.DefaultAuthorizationMap;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SecuredBrokerTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(SecuredBrokerTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SecuredBrokerTest.class);
static {
String path = System.getProperty("java.security.auth.login.config");
@@ -58,7 +58,7 @@ public class SecuredBrokerTest extends T
System.setProperty("java.security.auth.login.config", path);
}
}
- LOG.info("Path to login config: " + path);
+ LOGGER.info("Path to login config: {}", path);
//
// This test depends on the "policy.allowSystemProperty" security
// property being set to true. If we don't ensure it is set here,
@@ -68,7 +68,7 @@ public class SecuredBrokerTest extends T
try {
if (!"true".equals(Security.getProperty("policy.allowSystemProperty"))) {
Security.setProperty("policy.allowSystemProperty", "true");
- LOG.info("Reset security property 'policy.allowSystemProperty' to 'true'");
+ LOGGER.info("Reset security property 'policy.allowSystemProperty' to 'true'");
}
} catch (SecurityException e) {
// Ignore.
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java Tue Jul 19 21:03:14 2011
@@ -31,19 +31,19 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.LoginContext;
import javax.xml.namespace.QName;
-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.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.Receiver;
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 SpringSecuredBrokerTest extends SpringTestSupport {
- private static final Log LOG = LogFactory.getLog(SpringSecuredBrokerTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpringSecuredBrokerTest.class);
static {
String path = System.getProperty("java.security.auth.login.config");
@@ -54,7 +54,7 @@ public class SpringSecuredBrokerTest ext
System.setProperty("java.security.auth.login.config", path);
}
}
- LOG.info("Path to login config: " + path);
+ LOGGER.info("Path to login config: {}", path);
//
// This test depends on the "policy.allowSystemProperty" security
// property being set to true. If we don't ensure it is set here,
@@ -64,7 +64,7 @@ public class SpringSecuredBrokerTest ext
try {
if (!"true".equals(Security.getProperty("policy.allowSystemProperty"))) {
Security.setProperty("policy.allowSystemProperty", "true");
- LOG.info("Reset security property 'policy.allowSystemProperty' to 'true'");
+ LOGGER.info("Reset security property 'policy.allowSystemProperty' to 'true'");
}
} catch (Exception e) {
// Ignore.
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredRemoteBrokerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredRemoteBrokerTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredRemoteBrokerTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredRemoteBrokerTest.java Tue Jul 19 21:03:14 2011
@@ -34,20 +34,19 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
-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.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.core.io.ClassPathResource;
-
public class SpringSecuredRemoteBrokerTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(SpringSecuredRemoteBrokerTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpringSecuredRemoteBrokerTest.class);
static {
String path = System.getProperty("java.security.auth.login.config");
@@ -58,7 +57,7 @@ public class SpringSecuredRemoteBrokerTe
System.setProperty("java.security.auth.login.config", path);
}
}
- LOG.info("Path to login config: " + path);
+ LOGGER.info("Path to login config: {}", path);
//
// This test depends on the "policy.allowSystemProperty" security
// property being set to true. If we don't ensure it is set here,
@@ -68,7 +67,7 @@ public class SpringSecuredRemoteBrokerTe
try {
if (!"true".equals(Security.getProperty("policy.allowSystemProperty"))) {
Security.setProperty("policy.allowSystemProperty", "true");
- LOG.info("Reset security property 'policy.allowSystemProperty' to 'true'");
+ LOGGER.info("Reset security property 'policy.allowSystemProperty' to 'true'");
}
} catch (SecurityException e) {
// Ignore.
@@ -99,7 +98,7 @@ public class SpringSecuredRemoteBrokerTe
protected void tearDown() throws Exception {
if (context != null) {
- LOG.info("Closing down the spring context");
+ LOGGER.info("Closing down the spring context");
context.destroy();
}
broker.stop();
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java Tue Jul 19 21:03:14 2011
@@ -23,14 +23,15 @@ 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.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.util.DOMUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class EndpointReferenceBuilderTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(EndpointReferenceBuilderTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(EndpointReferenceBuilderTest.class);
/*
* Test method for
@@ -40,7 +41,7 @@ public class EndpointReferenceBuilderTes
InternalEndpoint endpoint = new InternalEndpoint(null, "myEndpoint", new QName("http://foo.bar.com", "myService"));
DocumentFragment df = EndpointReferenceBuilder.getReference(endpoint);
assertNotNull(df);
- LOG.info(new SourceTransformer().toString(df));
+ LOGGER.info(new SourceTransformer().toString(df));
Element e = (Element) df.getFirstChild();
assertEquals("http://java.sun.com/jbi/end-point-reference", e.getNamespaceURI());
assertEquals("end-point-reference", e.getLocalName());
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java Tue Jul 19 21:03:14 2011
@@ -24,17 +24,19 @@ 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.ServiceMixClient;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class RemoteServiceMixClientTest extends TestCase {
- private static transient Log log = LogFactory.getLog(RemoteServiceMixClientTest.class);
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(RemoteServiceMixClientTest.class);
+
protected AbstractXmlApplicationContext context;
protected ServiceMixClient client;
@@ -46,7 +48,7 @@ public class RemoteServiceMixClientTest
message.setProperty("name", "lufc");
message.setContent(new StreamSource(new StringReader("<hello>world</hello>")));
assertTrue(client.sendSync(exchange));
- log.info("OUT = " + exchange.getOutMessage());
+ LOGGER.info("OUT = {}", exchange.getOutMessage());
//assertEquals(exchange.getInMessage().getContent(),exchange.getOutMessage().getContent());
}
@@ -65,4 +67,5 @@ public class RemoteServiceMixClientTest
protected AbstractXmlApplicationContext createBeanFactory() {
return new ClassPathXmlApplicationContext("org/apache/servicemix/remoting/example.xml");
}
+
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/xbean/ClassLoaderXmlPreprocessorTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/xbean/ClassLoaderXmlPreprocessorTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/xbean/ClassLoaderXmlPreprocessorTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/xbean/ClassLoaderXmlPreprocessorTest.java Tue Jul 19 21:03:14 2011
@@ -21,43 +21,41 @@ import java.net.URL;
import java.util.List;
import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Unit tests for the <code>ClassLoaderXmlPreprocessor</code>, mainly focus
* on the classloader URL resources management.
- * @author jbonofre
*/
public class ClassLoaderXmlPreprocessorTest extends TestCase {
- private static final transient Log LOG = LogFactory.getLog(ClassLoaderXmlPreprocessorTest.class);
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(ClassLoaderXmlPreprocessorTest.class);
public void testUrlResources() throws Exception {
- LOG.debug("Define a sample System properties");
+ LOGGER.debug("Define a sample System properties");
System.setProperty("servicemix.home", "/tmp");
- LOG.debug("Create a ClassLoaderXmlPreprocessor with . as root");
+ LOGGER.debug("Create a ClassLoaderXmlPreprocessor with . as root");
ClassLoaderXmlPreprocessor classloader = new ClassLoaderXmlPreprocessor(new File("."));
- LOG.debug("Get the /tmp resource URL");
+ LOGGER.debug("Get the /tmp resource URL");
List<URL> dirResourceList = classloader.getResources("src/test/resources");
assertEquals("The directory resource list has not a correct size", 1, dirResourceList.size());
- LOG.info("Directory relative resource: " + dirResourceList.get(0).toString());
+ LOGGER.info("Directory relative resource: {}", dirResourceList.get(0).toString());
List<URL> dirPropertyResourceList = classloader.getResources("${servicemix.home}");
assertEquals("The directory system property resource list has not a correct size", 1, dirPropertyResourceList.size());
- LOG.info("Directory system property resource : " + dirPropertyResourceList.get(0).toString());
+ LOGGER.info("Directory system property resource : {}", dirPropertyResourceList.get(0).toString());
List<URL> fileResourceList = classloader.getResources("file:./src/test/resources");
assertEquals("The file resource list has not a correct size", 1, fileResourceList.size());
- LOG.info("File resource : " + fileResourceList.get(0).toString());
+ LOGGER.info("File resource : {}", fileResourceList.get(0).toString());
// Comment these tests, the test.ear must be present in src/test/resources directory
// this test.ear should contains a test file
/*
List<URL> jarResourceList = classloader.getResources("jar:file:./src/test/resources/test.ear!/test");
assertEquals("The jar resource list has not a correct size", 1, jarResourceList.size());
- LOG.info("Inside jar file resource : " + jarResourceList.get(0).toString());
+ LOGGER.info("Inside jar file resource : " + jarResourceList.get(0).toString());
List<URL> jarRegexpResourceList = classloader.getResources("jar:file:./src/test/resources/test.ear!/te(.*)");
assertEquals("The jar resource regexp list has not a correct size", 1, jarRegexpResourceList.size());
- LOG.info("Inside jar regexp file resource : " + jarRegexpResourceList.get(0).toString());
+ LOGGER.info("Inside jar regexp file resource : " + jarRegexpResourceList.get(0).toString());
assertEquals(new URL("jar:file:./src/test/resources/test.ear!/test"), (URL)jarRegexpResourceList.get(0));
*/
}
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml Tue Jul 19 21:03:14 2011
@@ -47,11 +47,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-quartz</artifactId>
<scope>test</scope>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Tue Jul 19 21:03:14 2011
@@ -265,10 +265,6 @@
<version>1.4.3</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Tue Jul 19 21:03:14 2011
@@ -943,25 +943,6 @@
<version>2.4</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
Modified: servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml (original)
+++ servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml Tue Jul 19 21:03:14 2011
@@ -58,11 +58,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/log4j-tests.properties
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/log4j-tests.properties?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/log4j-tests.properties (original)
+++ servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/log4j-tests.properties Tue Jul 19 21:03:14 2011
@@ -27,8 +27,8 @@ log4j.logger.org.springframework=INFO
log4j.logger.org.apache.activemq=INFO
log4j.logger.org.apache.activemq.spring=WARN
-#log4j.logger.org.apache.camel=DEBUG
-#log4j.logger.org.apache.servicemix=DEBUG
+#log4j.LOGGER.org.apache.camel=DEBUG
+#log4j.LOGGER.org.apache.servicemix=DEBUG
# CONSOLE appender
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml (original)
+++ servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml Tue Jul 19 21:03:14 2011
@@ -68,11 +68,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/log4j-tests.properties
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/log4j-tests.properties?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/log4j-tests.properties (original)
+++ servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/log4j-tests.properties Tue Jul 19 21:03:14 2011
@@ -27,8 +27,8 @@ log4j.logger.org.springframework=INFO
log4j.logger.org.apache.activemq=INFO
log4j.logger.org.apache.activemq.spring=WARN
-#log4j.logger.org.apache.camel=DEBUG
-#log4j.logger.org.apache.servicemix=DEBUG
+#log4j.LOGGER.org.apache.camel=DEBUG
+#log4j.LOGGER.org.apache.servicemix=DEBUG
# CONSOLE appender
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: servicemix/smx3/trunk/web/servicemix-console/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/web/servicemix-console/pom.xml?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/web/servicemix-console/pom.xml (original)
+++ servicemix/smx3/trunk/web/servicemix-console/pom.xml Tue Jul 19 21:03:14 2011
@@ -59,10 +59,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
</dependency>
Modified: servicemix/smx3/trunk/web/servicemix-console/src/main/java/org/apache/servicemix/console/ServiceMixPortlet.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/web/servicemix-console/src/main/java/org/apache/servicemix/console/ServiceMixPortlet.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/web/servicemix-console/src/main/java/org/apache/servicemix/console/ServiceMixPortlet.java (original)
+++ servicemix/smx3/trunk/web/servicemix-console/src/main/java/org/apache/servicemix/console/ServiceMixPortlet.java Tue Jul 19 21:03:14 2011
@@ -137,7 +137,7 @@ public abstract class ServiceMixPortlet
} finally {
closeConnector();
}
- //log.error("Error rendering portlet", e);
+ //LOGGER.error("Error rendering portlet", e);
//throw new PortletException("Error rendering portlet", e);
}
}
Modified: servicemix/smx3/trunk/web/servicemix-web-console/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/web/servicemix-web-console/pom.xml?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/web/servicemix-web-console/pom.xml (original)
+++ servicemix/smx3/trunk/web/servicemix-web-console/pom.xml Tue Jul 19 21:03:14 2011
@@ -158,10 +158,6 @@
<artifactId>spring-aop</artifactId>
<version>${spring-version}</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>