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 [4/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/...
Modified: servicemix/components/trunk/engines/servicemix-eip/src/test/java/org/apache/servicemix/eip/MessageFilterSwitchPredicateTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/test/java/org/apache/servicemix/eip/MessageFilterSwitchPredicateTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/test/java/org/apache/servicemix/eip/MessageFilterSwitchPredicateTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/test/java/org/apache/servicemix/eip/MessageFilterSwitchPredicateTest.java Fri Feb 4 09:05:47 2011
@@ -6,18 +6,19 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.InOnly;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.eip.patterns.MessageFilter;
import org.apache.servicemix.eip.support.SwitchPredicate;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.FileSystemResource;
// Test for SwitchPredicate methods. Switch can be turned on/off with a
// property file, a property on the message exchange, or a system property.
public class MessageFilterSwitchPredicateTest extends AbstractEIPTest {
- private static Log log = LogFactory.getLog(MessageFilterSwitchPredicateTest.class);
+ private final Logger logger = LoggerFactory.getLogger(MessageFilterSwitchPredicateTest.class);
+
protected MessageFilter messageFilter;
protected SwitchPredicate predicate;
@@ -53,9 +54,9 @@ public class MessageFilterSwitchPredicat
// Message exchange turned off - message should NOT reach the target.
me.getInMessage().setContent(createSource("<orderIn><widget>5</widget></orderIn>"));
me.getInMessage().setProperty("on", Boolean.FALSE);
- log.info("Before client.sendSync me.getProperty(\"on\") is: " + me.getProperty("on"));
+ logger.info("Before client.sendSync me.getProperty(\"on\") is: " + me.getProperty("on"));
client.sendSync(me);
- log.info("After client.sendSync me.getProperty(\"on\" is: " + me.getProperty("on"));
+ logger.info("After client.sendSync me.getProperty(\"on\" is: " + me.getProperty("on"));
assertEquals("Message exchange status should be DONE", ExchangeStatus.DONE, me.getStatus());
rec.getMessageList().assertMessagesReceived(0);
@@ -74,9 +75,9 @@ public class MessageFilterSwitchPredicat
me.getInMessage().setContent(createSource("<orderIn><widget>5</widget></orderIn>"));
me.getInMessage().setProperty("on", Boolean.TRUE);
- log.info("Before client.sendSync me.getProperty(\"on\") is: " + me.getProperty("on"));
+ logger.info("Before client.sendSync me.getProperty(\"on\") is: " + me.getProperty("on"));
client.sendSync(me);
- log.info("After client.sendSync me.getProperty(\"on\" is: " + me.getProperty("on"));
+ logger.info("After client.sendSync me.getProperty(\"on\" is: " + me.getProperty("on"));
assertEquals("Message exchange status should be DONE", ExchangeStatus.DONE, me.getStatus());
rec.getMessageList().assertMessagesReceived(1);
Modified: servicemix/components/trunk/engines/servicemix-exec/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-exec/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-exec/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-exec/pom.xml Fri Feb 4 09:05:47 2011
@@ -66,10 +66,6 @@
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
</dependency>
Modified: servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/marshaler/DefaultExecMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/marshaler/DefaultExecMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/marshaler/DefaultExecMarshaler.java (original)
+++ servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/marshaler/DefaultExecMarshaler.java Fri Feb 4 09:05:47 2011
@@ -22,9 +22,9 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.dom.DOMSource;
-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;
import org.w3c.dom.Document;
/**
@@ -35,9 +35,8 @@ import org.w3c.dom.Document;
* @author jbonofre
*/
public class DefaultExecMarshaler implements ExecMarshalerSupport {
-
- // logging facility
- private final static transient Log LOG = LogFactory.getLog(DefaultExecMarshaler.class);
+
+ private final Logger logger = LoggerFactory.getLogger(DefaultExecMarshaler.class);
/*
* (non-Javadoc)
@@ -46,15 +45,15 @@ public class DefaultExecMarshaler implem
public ExecRequest unmarshal(NormalizedMessage in) throws Exception {
// create a JAXB context for the exec request
- LOG.debug("Create a JAXB context with ExecRequest class.");
+ logger.debug("Create a JAXB context with ExecRequest class.");
JAXBContext jaxbContext = JAXBContext.newInstance(ExecRequest.class);
// create a unmarshaller
- LOG.debug("Create the JAXB unmarshaller.");
+ logger.debug("Create the JAXB unmarshaller.");
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
// unmarshal the in message content
- LOG.debug("Unmarshal the in message context.");
+ logger.debug("Unmarshal the in message context.");
return (ExecRequest)unmarshaller.unmarshal(in.getContent());
}
@@ -65,21 +64,21 @@ public class DefaultExecMarshaler implem
public void marshal(ExecResponse execResponse, NormalizedMessage out) throws Exception {
// create a JAXB context for the exec response
- LOG.debug("Create a JAXB context with ExecResponse class.");
+ logger.debug("Create a JAXB context with ExecResponse class.");
JAXBContext jaxbContext = JAXBContext.newInstance(ExecResponse.class);
// create a marshaller
- LOG.debug("Create the JAXB marshaller.");
+ logger.debug("Create the JAXB marshaller.");
Marshaller marshaller = jaxbContext.createMarshaller();
// marshal into the out message node
- LOG.debug("Marshal the ExecResponse into a DOM node.");
+ logger.debug("Marshal the ExecResponse into a DOM node.");
SourceTransformer transformer = new SourceTransformer();
Document document = transformer.createDocument();
marshaller.marshal(execResponse, document);
// populate the out message content
- LOG.debug("Populate the out message content using the DOM node.");
+ logger.debug("Populate the out message content using the DOM node.");
out.setContent(new DOMSource(document));
}
Modified: servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/utils/ExecUtils.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/utils/ExecUtils.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/utils/ExecUtils.java (original)
+++ servicemix/components/trunk/engines/servicemix-exec/src/main/java/org/apache/servicemix/exec/utils/ExecUtils.java Fri Feb 4 09:05:47 2011
@@ -21,10 +21,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.exec.marshaler.ExecRequest;
import org.apache.servicemix.exec.marshaler.ExecResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility class to execute system command.
@@ -33,7 +33,7 @@ import org.apache.servicemix.exec.marsha
*/
public class ExecUtils {
- private static final transient Log LOG = LogFactory.getLog(ExecUtils.class);
+ private final static Logger logger = LoggerFactory.getLogger(ExecUtils.class);
/**
* <p>
@@ -54,38 +54,38 @@ public class ExecUtils {
exec = exec + " " + argument;
}
- LOG.info("Execute command " + exec);
+ logger.info("Execute command " + exec);
String[] shellCommand = null;
- LOG.debug("Define the shell.");
- LOG.debug("Get the OS name property.");
+ logger.debug("Define the shell.");
+ logger.debug("Get the OS name property.");
String osName = System.getProperty("os.name");
if (osName.startsWith("Windows")) {
- LOG.debug("Microsoft Windows platform detected.");
+ logger.debug("Microsoft Windows platform detected.");
String comSpec = System.getProperty("ComSpec");
if (comSpec != null) {
- LOG.debug("The ComSpec MS Windows environment variable is defined, using it: " + comSpec + " /C " + exec);
+ logger.debug("The ComSpec MS Windows environment variable is defined, using it: " + comSpec + " /C " + exec);
shellCommand = new String[] { comSpec, "/C", exec };
} else {
- LOG.debug("The ComSpec MS Windows environment variable is not defined, found the shell command depending of the MS Windows version.");
+ logger.debug("The ComSpec MS Windows environment variable is not defined, found the shell command depending of the MS Windows version.");
if (osName.startsWith("Windows 3")
|| osName.startsWith("Windows 95")
|| osName.startsWith("Windows 98")
|| osName.startsWith("Windows ME")) {
- LOG.debug("MS Windows 3.1/95/98/Me detected, using: command.com /C " + exec);
+ logger.debug("MS Windows 3.1/95/98/Me detected, using: command.com /C " + exec);
shellCommand = new String[] { "command.com", "/C", exec };
} else {
- LOG.debug("MS Windows NT/XP/Vista detected, using: cmd.exe /C " + exec);
+ logger.debug("MS Windows NT/XP/Vista detected, using: cmd.exe /C " + exec);
shellCommand = new String[] { "cmd.exe", "/C", exec };
}
}
} else {
- LOG.debug("Unix platform detected.");
+ logger.debug("Unix platform detected.");
String shell = System.getProperty("SHELL");
if (shell != null) {
- LOG.debug("The SHELL Unix environment variable is defined, using it: " + shell + " -c " + exec);
+ logger.debug("The SHELL Unix environment variable is defined, using it: " + shell + " -c " + exec);
shellCommand = new String[] { shell, "-c", exec };
} else {
- LOG.debug("The SHELL Unix environment variable is not defined, using the default Unix shell: /bin/sh -c " + exec);
+ logger.debug("The SHELL Unix environment variable is not defined, using the default Unix shell: /bin/sh -c " + exec);
shellCommand = new String[] { "/bin/sh", "-c", exec };
}
}
@@ -115,13 +115,13 @@ public class ExecUtils {
if (exitValue != 0) {
// an error occured
- LOG.error("Command " + exec + " execution failed with return code " + exitValue + " : " + execResponse.getErrorData().toString());
+ logger.error("Command " + exec + " execution failed with return code " + exitValue + " : " + execResponse.getErrorData().toString());
} else {
// command was successful
- LOG.debug("Command " + exec + " execution completed: " + execResponse.getOutputData().toString());
+ logger.debug("Command " + exec + " execution completed: " + execResponse.getOutputData().toString());
}
} catch (Exception exception) {
- LOG.error("Command " + exec + " execution failed.", exception);
+ logger.error("Command " + exec + " execution failed.", exception);
throw new ExecException("Command " + exec + " execution failed.", exception);
}
@@ -139,9 +139,7 @@ public class ExecUtils {
*/
class StreamGobbler extends Thread {
- // log facility
- private final static transient Log LOG = LogFactory
- .getLog(StreamGobbler.class);
+ private final Logger logger = LoggerFactory.getLogger(StreamGobbler.class);
InputStream in;
StringBuffer response;
@@ -166,8 +164,7 @@ class StreamGobbler extends Thread {
response.append('\n');
}
} catch (IOException ioException) {
- LOG.warn("System command stream gobbler error : "
- + ioException.getMessage());
+ logger.warn("System command stream gobbler error : " + ioException.getMessage());
}
}
Modified: servicemix/components/trunk/engines/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/pom.xml Fri Feb 4 09:05:47 2011
@@ -69,10 +69,6 @@
<artifactId>jaxb-impl</artifactId>
</dependency>
<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/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java Fri Feb 4 09:05:47 2011
@@ -38,12 +38,12 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.WebFault;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import com.ibm.wsdl.Constants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.xfire.XFire;
import org.codehaus.xfire.annotations.AnnotationServiceFactory;
import org.codehaus.xfire.client.Client;
@@ -58,7 +58,7 @@ import org.jdom.Element;
public class JbiProxy {
- private static final Log LOG = LogFactory.getLog(JbiProxyFactoryBean.class);
+ private final static Logger logger = LoggerFactory.getLogger(JbiProxyFactoryBean.class);
protected XFire xfire;
protected ComponentContext context;
@@ -236,12 +236,12 @@ public class JbiProxy {
}
protected Exception translateException(Method method, Exception t) {
if (!(t instanceof XFireFault)) {
- LOG.debug("Exception is not an XFireFault");
+ logger.debug("Exception is not an XFireFault");
return t;
}
XFireFault xfireFault = (XFireFault) t;
if (!xfireFault.hasDetails()) {
- LOG.debug("XFireFault has no details");
+ logger.debug("XFireFault has no details");
return t;
}
// Get first child element of <detail/>
@@ -254,17 +254,17 @@ public class JbiProxy {
}
}
if (detail == null) {
- LOG.debug("XFireFault has no element in <detail/>");
+ logger.debug("XFireFault has no element in <detail/>");
return t;
}
QName qname = new QName(detail.getNamespaceURI(),
detail.getName());
Class<?>[] exceptions = method.getExceptionTypes();
for (int i = 0; i < exceptions.length; i++) {
- LOG.debug("Checking exception: " + exceptions[i]);
+ logger.debug("Checking exception: " + exceptions[i]);
WebFault wf = exceptions[i].getAnnotation(WebFault.class);
if (wf == null) {
- LOG.debug("No WebFault annotation");
+ logger.debug("No WebFault annotation");
continue;
}
QName exceptionName = new QName(wf.targetNamespace(), wf.name());
@@ -282,10 +282,10 @@ public class JbiProxy {
Constructor<?> cst = exceptions[i].getConstructor(String.class, infoClass);
return (Exception) cst.newInstance(xfireFault.toString(), obj.getValue());
} catch (Throwable e) {
- LOG.debug("Error: " + e);
+ logger.debug("Error: " + e);
}
} else {
- LOG.debug("QName mismatch: element: " + qname + ", exception: " + exceptionName);
+ logger.debug("QName mismatch: element: " + qname + ", exception: " + exceptionName);
}
}
return t;
Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiTransport.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiTransport.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiTransport.java (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiTransport.java Fri Feb 4 09:05:47 2011
@@ -18,8 +18,6 @@ package org.apache.servicemix.jsr181.xfi
import javax.jbi.component.ComponentContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.xfire.handler.LocateBindingHandler;
import org.codehaus.xfire.service.Service;
import org.codehaus.xfire.soap.SoapTransport;
@@ -28,6 +26,8 @@ import org.codehaus.xfire.transport.Abst
import org.codehaus.xfire.transport.Channel;
import org.codehaus.xfire.transport.DefaultEndpoint;
import org.codehaus.xfire.wsdl11.WSDL11Transport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Simple jbi transport, similar to local transport,
@@ -38,7 +38,7 @@ public class JbiTransport extends Abstra
public static final String JBI_BINDING = "http://java.sun.com/xml/ns/jbi/binding/service+engine";
- private static final Log LOG = LogFactory.getLog(JbiTransport.class);
+ private final Logger logger = LoggerFactory.getLogger(JbiTransport.class);
private static final String URI_PREFIX = "urn:xfire:transport:jbi:";
@@ -59,7 +59,7 @@ public class JbiTransport extends Abstra
}
protected Channel createNewChannel(String uri) {
- LOG.debug("Creating new channel for uri: " + uri);
+ logger.debug("Creating new channel for uri: " + uri);
JbiChannel c = new JbiChannel(uri, this);
c.setEndpoint(new DefaultEndpoint());
return c;
Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java Fri Feb 4 09:05:47 2011
@@ -32,14 +32,14 @@ import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.traversal.NodeIterator;
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;
@@ -53,7 +53,7 @@ import org.apache.xpath.CachedXPathAPI;
public class Jsr181ComplexPojoTest extends TestCase {
- private static transient Log log = LogFactory.getLog(Jsr181ComplexPojoTest.class);
+ private final Logger logger = LoggerFactory.getLogger(Jsr181ComplexPojoTest.class);
protected JBIContainer container;
protected SourceTransformer transformer = new SourceTransformer();
@@ -120,7 +120,7 @@ public class Jsr181ComplexPojoTest exten
me.getInMessage().setContent(new StringSource(
"<oneWay xmlns='http://jsr181.servicemix.apache.org'><in0>world</in0></oneWay>"));
client.sendSync(me);
- log.info(new SourceTransformer().contentToString(me.getOutMessage()));
+ logger.info(new SourceTransformer().contentToString(me.getOutMessage()));
client.done(me);
// Wait all acks being processed
@@ -150,7 +150,7 @@ public class Jsr181ComplexPojoTest exten
me.getInMessage().setContent(new StringSource(
"<twoWay xmlns='http://jsr181.servicemix.apache.org'><in0>world �</in0></twoWay>"));
client.sendSync(me);
- log.info(new SourceTransformer().contentToString(me.getOutMessage()));
+ logger.info(new SourceTransformer().contentToString(me.getOutMessage()));
client.done(me);
// Wait all acks being processed
@@ -182,7 +182,7 @@ public class Jsr181ComplexPojoTest exten
assertEquals(ExchangeStatus.ACTIVE, me.getStatus());
assertNotNull(me.getFault());
Node n = transformer.toDOMNode(me.getFault());
- log.info(transformer.toString(n));
+ logger.info(transformer.toString(n));
assertNotNull(textValueOfXPath(n, "/stack"));
client.done(me);
Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java Fri Feb 4 09:05:47 2011
@@ -28,20 +28,17 @@ import javax.wsdl.extensions.schema.Sche
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import junit.framework.TestCase;
import com.ibm.wsdl.Constants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.servicemix.jbi.api.Container;
import org.apache.servicemix.jbi.container.JBIContainer;
-import org.apache.servicemix.jbi.framework.ClientFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.view.DotViewEndpointListener;
import org.apache.servicemix.jbi.view.DotViewFlowListener;
@@ -70,7 +67,7 @@ public class Jsr181ComplexTypeTest exten
static final String BROKER_SERVER = "wschris";
static final int BROKER_PORT = 61216;
- private static transient Log log = LogFactory.getLog(Jsr181ComplexTypeTest.class);
+ private final org.slf4j.Logger logger = LoggerFactory.getLogger(Jsr181ComplexTypeTest.class);
protected JBIContainer container;
@@ -107,9 +104,9 @@ public class Jsr181ComplexTypeTest exten
component.setEndpoints(new Jsr181Endpoint[] {orderEndpoint });
container.activateComponent(component, "JSR181Component");
- log.info(orderEndpoint.getServiceInterface());
- log.info(orderEndpoint.getInterfaceName());
- log.info(orderEndpoint.getEndpoint());
+ logger.info(orderEndpoint.getServiceInterface());
+ logger.info(orderEndpoint.getInterfaceName().toString());
+ logger.info(orderEndpoint.getEndpoint());
// Create interface based proxy
JbiProxyFactoryBean pf = new JbiProxyFactoryBean();
@@ -143,7 +140,7 @@ public class Jsr181ComplexTypeTest exten
// Analyse the WSDL that is generated from the pojo service
Document description = orderEndpoint.getDescription();
SourceTransformer transformer = new SourceTransformer();
- log.info(transformer.toString(description));
+ logger.info(transformer.toString(description));
WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
reader.setFeature(Constants.FEATURE_VERBOSE, false);
Definition definition = reader.readWSDL(null, description);
Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComponentTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComponentTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComponentTest.java Fri Feb 4 09:05:47 2011
@@ -26,18 +26,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.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import test.EchoService;
public class Jsr181ComponentTest extends TestCase {
- private static Log logger = LogFactory.getLog(Jsr181ComponentTest.class);
+ private final Logger logger = LoggerFactory.getLogger(Jsr181ComponentTest.class);
protected JBIContainer container;
Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181MTOMTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181MTOMTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181MTOMTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181MTOMTest.java Fri Feb 4 09:05:47 2011
@@ -24,12 +24,12 @@ import javax.jbi.servicedesc.ServiceEndp
import javax.naming.InitialContext;
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.client.Destination;
import org.apache.servicemix.jbi.container.JBIContainer;
@@ -39,7 +39,8 @@ import org.apache.servicemix.jbi.util.By
import org.apache.servicemix.jbi.util.FileUtil;
public class Jsr181MTOMTest extends TestCase {
- private static transient Log log = LogFactory.getLog(Jsr181MTOMTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(Jsr181MTOMTest.class);
protected JBIContainer container;
@@ -73,7 +74,7 @@ public class Jsr181MTOMTest extends Test
ServiceEndpoint se = container.getRegistry().getEndpointsForService(service)[0];
Document doc = container.getRegistry().getEndpointDescriptor(se);
String wsdl = new SourceTransformer().toString(doc);
- log.info(wsdl);
+ logger.info(wsdl);
DefaultServiceMixClient client = new DefaultServiceMixClient(container);
Destination dest = client.createDestination("service:http://jsr181.servicemix.apache.org/EchoWithAttachment");
Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringProxyTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringProxyTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringProxyTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringProxyTest.java Fri Feb 4 09:05:47 2011
@@ -20,18 +20,18 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.InOut;
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.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 Jsr181SpringProxyTest extends SpringTestSupport {
- private static Log logger = LogFactory.getLog(Jsr181ComponentTest.class);
+ private final Logger logger = LoggerFactory.getLogger(Jsr181ComponentTest.class);
public void test() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java Fri Feb 4 09:05:47 2011
@@ -20,20 +20,20 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.InOut;
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.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;
import test.Echo;
public class Jsr181SpringTest extends SpringTestSupport {
- private static Log logger = LogFactory.getLog(Jsr181ComponentTest.class);
+ private final Logger logger = LoggerFactory.getLogger(Jsr181ComponentTest.class);
public void test() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
Modified: servicemix/components/trunk/engines/servicemix-osworkflow/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-osworkflow/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-osworkflow/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-osworkflow/pom.xml Fri Feb 4 09:05:47 2011
@@ -70,10 +70,6 @@
<artifactId>bsh</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
Modified: servicemix/components/trunk/engines/servicemix-osworkflow/src/main/java/org/apache/servicemix/osworkflow/OSWorkflow.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-osworkflow/src/main/java/org/apache/servicemix/osworkflow/OSWorkflow.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-osworkflow/src/main/java/org/apache/servicemix/osworkflow/OSWorkflow.java (original)
+++ servicemix/components/trunk/engines/servicemix-osworkflow/src/main/java/org/apache/servicemix/osworkflow/OSWorkflow.java Fri Feb 4 09:05:47 2011
@@ -29,15 +29,12 @@ import com.opensymphony.workflow.Workflo
import com.opensymphony.workflow.WorkflowException;
import com.opensymphony.workflow.basic.BasicWorkflow;
import com.opensymphony.workflow.config.DefaultConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-/**
- * @author lhe
- */
public class OSWorkflow implements Runnable {
-
+
+ private final Logger logger = LoggerFactory.getLogger(OSWorkflow.class);
public static final String KEY_EXCHANGE = "exchange";
@@ -48,8 +45,6 @@ public class OSWorkflow implements Runna
public static final String KEY_CALLER = "caller";
public static final String KEY_ASYNC_PROCESSING = "asynchronous";
-
- private static Log log = LogFactory.getLog(OSWorkflow.class);
private Workflow osWorkflowInstance;
@@ -129,12 +124,12 @@ public class OSWorkflow implements Runna
// call the endpoint method for init actions
this.endpoint.preWorkflow();
- if (log.isDebugEnabled()) {
- log.debug("Starting workflow...");
- log.debug("Name: " + this.osWorkflowName);
- log.debug("Action: " + this.action);
- log.debug("Caller: " + this.caller);
- log.debug("Map: " + this.map);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Starting workflow...");
+ logger.debug("Name: " + this.osWorkflowName);
+ logger.debug("Action: " + this.action);
+ logger.debug("Caller: " + this.caller);
+ logger.debug("Map: " + this.map);
}
// loop as long as there are more actions to do and the workflow is not
@@ -145,7 +140,7 @@ public class OSWorkflow implements Runna
try {
this.workflowId = createWorkflow();
} catch (Exception ex) {
- log.error("Error creating the workflow", ex);
+ logger.error("Error creating the workflow", ex);
aborted = true;
break;
}
@@ -157,34 +152,34 @@ public class OSWorkflow implements Runna
// check if there are more actions available
if (availableActions.length == 0) {
// no, no more actions available - workflow finished
- log.debug("No more actions. Workflow is finished...");
+ logger.debug("No more actions. Workflow is finished...");
this.finished = true;
} else {
// get first available action to execute
int nextAction = availableActions[0];
- log.debug("call action " + nextAction);
+ logger.debug("call action " + nextAction);
try {
// call the action
this.osWorkflowInstance.doAction(this.workflowId,nextAction, this.map);
} catch (InvalidInputException iiex) {
- log.error(iiex);
+ logger.error(iiex.getMessage());
aborted = true;
} catch (WorkflowException wfex) {
- log.error(wfex);
+ logger.error(wfex.getMessage());
aborted = true;
}
}
}
- if (log.isDebugEnabled()) {
- log.debug("Stopping workflow...");
- log.debug("Name: " + this.osWorkflowName);
- log.debug("Action: " + this.action);
- log.debug("Caller: " + this.caller);
- log.debug("Map: " + this.map);
- log.debug("WorkflowId: " + this.workflowId);
- log.debug("End state: " + (finished ? "Finished" : "Aborted"));
+ if (logger.isDebugEnabled()) {
+ logger.debug("Stopping workflow...");
+ logger.debug("Name: " + this.osWorkflowName);
+ logger.debug("Action: " + this.action);
+ logger.debug("Caller: " + this.caller);
+ logger.debug("Map: " + this.map);
+ logger.debug("WorkflowId: " + this.workflowId);
+ logger.debug("End state: " + (finished ? "Finished" : "Aborted"));
}
// call the endpoint method for cleanup actions or message exchange
Modified: servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowFailureTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowFailureTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowFailureTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowFailureTest.java Fri Feb 4 09:05:47 2011
@@ -20,18 +20,18 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.InOut;
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.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 OSWorkflowFailureTest extends SpringTestSupport {
- private static Log logger = LogFactory.getLog(OSWorkflowFailureTest.class);
+ private final Logger logger = LoggerFactory.getLogger(OSWorkflowFailureTest.class);
public void test() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
Modified: servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowSucessTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowSucessTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowSucessTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/OSWorkflowSucessTest.java Fri Feb 4 09:05:47 2011
@@ -20,18 +20,18 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.InOut;
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.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 OSWorkflowSucessTest extends SpringTestSupport {
- private static Log logger = LogFactory.getLog(OSWorkflowSucessTest.class);
+ private final Logger logger = LoggerFactory.getLogger(OSWorkflowSucessTest.class);
public void test() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
Modified: servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/conditions/ExampleCondition.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/conditions/ExampleCondition.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/conditions/ExampleCondition.java (original)
+++ servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/conditions/ExampleCondition.java Fri Feb 4 09:05:47 2011
@@ -21,15 +21,12 @@ import java.util.Map;
import com.opensymphony.module.propertyset.PropertySet;
import com.opensymphony.workflow.Condition;
import com.opensymphony.workflow.WorkflowException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ExampleCondition implements Condition {
- private static Log logger = LogFactory.getLog(ExampleCondition.class);
+ private final Logger logger = LoggerFactory.getLogger(ExampleCondition.class);
/*
* (non-Javadoc)
Modified: servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/functions/ExampleFunction.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/functions/ExampleFunction.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/functions/ExampleFunction.java (original)
+++ servicemix/components/trunk/engines/servicemix-osworkflow/src/test/java/org/apache/servicemix/osworkflow/functions/ExampleFunction.java Fri Feb 4 09:05:47 2011
@@ -23,14 +23,14 @@ import javax.jbi.messaging.MessagingExce
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.transform.dom.DOMSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
import com.opensymphony.module.propertyset.PropertySet;
import com.opensymphony.workflow.FunctionProvider;
import com.opensymphony.workflow.WorkflowException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.osworkflow.OSWorkflow;
import org.apache.servicemix.osworkflow.OSWorkflowEndpoint;
@@ -38,7 +38,7 @@ import org.apache.xpath.CachedXPathAPI;
public class ExampleFunction implements FunctionProvider {
- private static Log logger = LogFactory.getLog(ExampleFunction.class);
+ private final Logger logger = LoggerFactory.getLogger(ExampleFunction.class);
/*
* (non-Javadoc)
Modified: servicemix/components/trunk/engines/servicemix-pdf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-pdf/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-pdf/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-pdf/pom.xml Fri Feb 4 09:05:47 2011
@@ -72,10 +72,6 @@
<version>${itext.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
Modified: servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java (original)
+++ servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java Fri Feb 4 09:05:47 2011
@@ -20,8 +20,8 @@ import javax.jbi.messaging.NormalizedMes
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
*/
public class JaxbPdfComposerMarshaler implements PdfComposerMarshalerSupport {
- private final static transient Log LOG = LogFactory.getLog(JaxbPdfComposerMarshaler.class);
+ private final Logger logger = LoggerFactory.getLogger(JaxbPdfComposerMarshaler.class);
/*
* (non-Javadoc)
@@ -41,15 +41,15 @@ public class JaxbPdfComposerMarshaler im
public PdfComposerRequest unmarshal(NormalizedMessage in) throws Exception {
// create a JAXB context for the PdfComposerRequest
- LOG.debug("Create a JAXB context with PdfComposerRequest class.");
+ logger.debug("Create a JAXB context with PdfComposerRequest class.");
JAXBContext jaxbContext = JAXBContext.newInstance(PdfComposerRequest.class);
// create the JAXB unmarshaller
- LOG.debug("Create the JAXB unmarshaller.");
+ logger.debug("Create the JAXB unmarshaller.");
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
// unmarshal in the "in" message content
- LOG.debug("Unmarshal the \"in\" message content.");
+ logger.debug("Unmarshal the \"in\" message content.");
return (PdfComposerRequest) unmarshaller.unmarshal(in.getContent());
}
Modified: servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java (original)
+++ servicemix/components/trunk/engines/servicemix-pdf/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java Fri Feb 4 09:05:47 2011
@@ -18,12 +18,13 @@ package org.apache.servicemix.pdf.marsha
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.jdom.xpath.XPath;
import org.w3c.dom.Node;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <p>
* XPath PDF composer marshaler.
@@ -33,7 +34,7 @@ import org.w3c.dom.Node;
*/
public class XpathPdfComposerMarshaler implements PdfComposerMarshalerSupport {
- private final static transient Log LOG = LogFactory.getLog(XpathPdfComposerMarshaler.class);
+ private final Logger logger = LoggerFactory.getLogger(XpathPdfComposerMarshaler.class);
/*
* (non-Javadoc)
@@ -42,18 +43,18 @@ public class XpathPdfComposerMarshaler i
public PdfComposerRequest unmarshal(NormalizedMessage in) throws Exception {
// TODO check performance issue by using stream
- LOG.debug("Create the PDF composer request.");
+ logger.debug("Create the PDF composer request.");
PdfComposerRequest request = new PdfComposerRequest();
- LOG.debug("Transform the in NoramlizedMessage to XML node.");
+ logger.debug("Transform the in NoramlizedMessage to XML node.");
SourceTransformer transformer = new SourceTransformer();
Node root = transformer.toDOMNode(in);
- LOG.debug("Extract template.");
+ logger.debug("Extract template.");
XPath templateXPath = XPath.newInstance("//template");
request.setTemplate(templateXPath.valueOf(root));
- //LOG.debug("Extract rows.");
+ //logger.debug("Extract rows.");
//XPath rowsXPath = XPath.newInstance("*/row");
//List rows = rowsXPath.selectNodes(root);
Modified: servicemix/components/trunk/engines/servicemix-quartz/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-quartz/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-quartz/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-quartz/pom.xml Fri Feb 4 09:05:47 2011
@@ -60,10 +60,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/engines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/QuartzSpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/QuartzSpringTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/QuartzSpringTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/QuartzSpringTest.java Fri Feb 4 09:05:47 2011
@@ -18,10 +18,10 @@ package org.apache.servicemix.quartz;
import javax.jbi.messaging.NormalizedMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.SpringTestSupport;
@@ -29,7 +29,8 @@ import org.apache.xbean.spring.context.C
import org.springframework.context.support.AbstractXmlApplicationContext;
public class QuartzSpringTest extends SpringTestSupport {
- private static transient Log log = LogFactory.getLog(QuartzSpringTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(QuartzSpringTest.class);
public void test() throws Exception {
Receiver r1 = (Receiver) getBean("receiver1");
Modified: servicemix/components/trunk/engines/servicemix-saxon/src/test/java/org/apache/servicemix/saxon/SaxonComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-saxon/src/test/java/org/apache/servicemix/saxon/SaxonComponentTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-saxon/src/test/java/org/apache/servicemix/saxon/SaxonComponentTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-saxon/src/test/java/org/apache/servicemix/saxon/SaxonComponentTest.java Fri Feb 4 09:05:47 2011
@@ -24,10 +24,10 @@ import javax.xml.namespace.QName;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
-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;
@@ -37,7 +37,8 @@ import org.apache.xbean.spring.context.C
import org.springframework.context.support.AbstractXmlApplicationContext;
public class SaxonComponentTest extends SpringTestSupport {
- private static transient Log log = LogFactory.getLog(SaxonComponentTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(SaxonComponentTest.class);
public void testXslt() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
@@ -54,7 +55,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
assertEquals("2005", textValueOfXPath(el, "/transformed/bookstore/book[1]/year"));
client.done(me);
@@ -75,7 +76,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
assertEquals("2005", textValueOfXPath(el, "/transformed/bookstore/book[1]/year"));
client.done(me);
@@ -98,7 +99,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
assertEquals("2005", textValueOfXPath(el, "/transformed/book/year"));
client.done(me);
@@ -122,7 +123,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
assertEquals("2005", textValueOfXPath(el, "/transformed/book/year"));
client.done(me);
@@ -144,7 +145,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
client.done(me);
assertEquals("cheeseyCheese", textValueOfXPath(el, "//param"));
@@ -167,7 +168,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -186,7 +187,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -205,7 +206,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
assertEquals("XQuery Kick Start", textValueOfXPath(el, "/titles/title[1]"));
client.done(me);
@@ -226,7 +227,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
assertEquals("XQuery Kick Start", textValueOfXPath(el, "/titles/title[1]"));
client.done(me);
@@ -248,7 +249,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
client.done(me);
assertEquals(new QName("http://saxon.sf.net/xquery-results", "sequence"), DOMUtil.getQName(el));
@@ -275,7 +276,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
client.done(me);
assertEquals("XQuery Kick Start", textValueOfXPath(el, "/titles/title[1]"));
@@ -296,7 +297,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
client.done(me);
assertEquals("skcotSyub", el.getLocalName());
@@ -317,7 +318,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
client.done(me);
assertEquals("buyStocks", el.getLocalName());
@@ -338,7 +339,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
client.done(me);
assertEquals("buyStocks", el.getLocalName());
@@ -359,7 +360,7 @@ public class SaxonComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(transformer.toString(me.getOutMessage().getContent()));
+ logger.info(transformer.toString(me.getOutMessage().getContent()));
Element el = transformer.toDOMElement(me.getOutMessage());
client.done(me);
assertEquals("buyStocks", el.getLocalName());
Modified: servicemix/components/trunk/engines/servicemix-script/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-script/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-script/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-script/pom.xml Fri Feb 4 09:05:47 2011
@@ -79,10 +79,6 @@
<scope>test</scope>
</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/engines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java Fri Feb 4 09:05:47 2011
@@ -20,17 +20,18 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.InOut;
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.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 ScriptComponentTest extends SpringTestSupport {
- private static transient Log log = LogFactory.getLog(ScriptComponentTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(ScriptComponentTest.class);
public void testGroovy() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
@@ -47,7 +48,7 @@ public class ScriptComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -66,7 +67,7 @@ public class ScriptComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -85,7 +86,7 @@ public class ScriptComponentTest extends
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
Modified: servicemix/components/trunk/engines/servicemix-scripting/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-scripting/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-scripting/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-scripting/pom.xml Fri Feb 4 09:05:47 2011
@@ -95,10 +95,6 @@
<artifactId>commons-io</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/engines/servicemix-scripting/src/main/java/org/apache/servicemix/scripting/ScriptingEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-scripting/src/main/java/org/apache/servicemix/scripting/ScriptingEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-scripting/src/main/java/org/apache/servicemix/scripting/ScriptingEndpoint.java (original)
+++ servicemix/components/trunk/engines/servicemix-scripting/src/main/java/org/apache/servicemix/scripting/ScriptingEndpoint.java Fri Feb 4 09:05:47 2011
@@ -43,12 +43,11 @@ import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
import org.apache.servicemix.common.util.URIResolver;
import org.apache.servicemix.jbi.marshaler.PojoMarshaler;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
/**
@@ -56,6 +55,7 @@ import org.springframework.core.io.Resou
* @author lhein
*/
public class ScriptingEndpoint extends ProviderEndpoint implements ScriptingEndpointType {
+
public static final String KEY_CHANNEL = "deliveryChannel";
public static final String KEY_COMPONENT_NAMESPACE = "componentNamespace";
public static final String KEY_CONTEXT = "componentContext";
@@ -72,7 +72,7 @@ public class ScriptingEndpoint extends P
public static final String KEY_USER_BINDINGS = "bindings";
public static final String LANGUAGE_AUTODETECT = "autodetect";
- private static Log logger = LogFactory.getLog(ScriptingEndpoint.class);
+ private final org.slf4j.Logger logger = LoggerFactory.getLogger(ScriptingEndpoint.class);
private Map<String, Object> bindings;
private boolean disableOutput;
Modified: servicemix/components/trunk/engines/servicemix-validation/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-validation/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-validation/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-validation/pom.xml Fri Feb 4 09:05:47 2011
@@ -60,10 +60,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/engines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java Fri Feb 4 09:05:47 2011
@@ -25,18 +25,19 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.InOut;
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.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.util.FileUtil;
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 ValidationComponentTest extends SpringTestSupport {
- private static transient Log log = LogFactory.getLog(ValidationComponentTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(ValidationComponentTest.class);
private static final String VALID_FILE = "target/test-classes/requestValid.xml";
private static final String INVALID_FILE = "target/test-classes/requestInvalid.xml";
@@ -59,7 +60,7 @@ public class ValidationComponentTest ext
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -76,7 +77,7 @@ public class ValidationComponentTest ext
if (me.getFault() == null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -98,7 +99,7 @@ public class ValidationComponentTest ext
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -116,7 +117,7 @@ public class ValidationComponentTest ext
client.done(me);
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
}
public void testValidationOKFlowCaptures() throws Exception {
@@ -137,7 +138,7 @@ public class ValidationComponentTest ext
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -154,7 +155,7 @@ public class ValidationComponentTest ext
if (me.getFault() == null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
@@ -172,7 +173,7 @@ public class ValidationComponentTest ext
FileUtil.copyInputStream(fds.getInputStream(), baos);
result = baos.toString();
} catch (IOException ex) {
- log.error("Error loading file " + file, ex);
+ logger.error("Error loading file " + file, ex);
}
return result;
Modified: servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml Fri Feb 4 09:05:47 2011
@@ -66,10 +66,6 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Modified: servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java (original)
+++ servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java Fri Feb 4 09:05:47 2011
@@ -24,12 +24,11 @@ import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.id.IdGenerator;
import org.apache.servicemix.common.util.DOMUtil;
import org.apache.servicemix.wsn.client.AbstractWSAClient;
@@ -42,7 +41,7 @@ import org.oasis_open.docs.wsn.bw_2.Unab
@WebService(endpointInterface = "org.oasis_open.docs.wsn.bw_2.CreatePullPoint")
public abstract class AbstractCreatePullPoint extends AbstractEndpoint implements CreatePullPoint {
- private static Log log = LogFactory.getLog(AbstractCreatePullPoint.class);
+ private final Logger logger = LoggerFactory.getLogger(AbstractCreatePullPoint.class);
private IdGenerator idGenerator;
@@ -77,7 +76,7 @@ public abstract class AbstractCreatePull
partName = "CreatePullPointRequest")
org.oasis_open.docs.wsn.b_2.CreatePullPoint createPullPointRequest) throws UnableToCreatePullPointFault {
- log.debug("CreatePullEndpoint");
+ logger.debug("CreatePullEndpoint");
return handleCreatePullPoint(createPullPointRequest, null);
}
@@ -108,7 +107,7 @@ public abstract class AbstractCreatePull
success = true;
return response;
} catch (EndpointRegistrationException e) {
- log.warn("Unable to register new endpoint", e);
+ logger.warn("Unable to register new endpoint", e);
UnableToCreatePullPointFaultType fault = new UnableToCreatePullPointFaultType();
throw new UnableToCreatePullPointFault("Unable to register new endpoint", fault, e);
} finally {
@@ -117,7 +116,7 @@ public abstract class AbstractCreatePull
try {
pullPoint.destroy();
} catch (UnableToDestroyPullPointFault e) {
- log.info("Error destroying pullPoint", e);
+ logger.info("Error destroying pullPoint", e);
}
}
}
Modified: servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java (original)
+++ servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java Fri Feb 4 09:05:47 2011
@@ -27,8 +27,6 @@ import javax.jws.WebService;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.id.IdGenerator;
import org.apache.servicemix.wsn.client.AbstractWSAClient;
import org.oasis_open.docs.wsn.b_2.GetCurrentMessage;
@@ -66,6 +64,8 @@ import org.oasis_open.docs.wsrf.rpw_2.Ge
import org.oasis_open.docs.wsrf.rpw_2.InvalidResourcePropertyQNameFault;
import org.oasis_open.docs.wsrf.rp_2.GetResourcePropertyResponse;
import org.oasis_open.docs.wsrf.rp_2.InvalidResourcePropertyQNameFaultType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@WebService(endpointInterface = "org.oasis_open.docs.wsn.brw_2.NotificationBroker")
public abstract class AbstractNotificationBroker extends AbstractEndpoint implements NotificationBroker, GetResourceProperty {
@@ -77,8 +77,7 @@ public abstract class AbstractNotificati
public static final QName TOPIC_EXPRESSION_DIALECT_QNAME = new QName(NAMESPACE_URI, "TopicExpressionDialect", PREFIX);
public static final QName TOPIC_SET_QNAME = new QName(NAMESPACE_URI, "TopicSet", PREFIX);
-
- private static Log log = LogFactory.getLog(AbstractNotificationBroker.class);
+ private final Logger logger = LoggerFactory.getLogger(AbstractNotificationBroker.class);
private IdGenerator idGenerator;
@@ -122,7 +121,7 @@ public abstract class AbstractNotificati
partName = "Notify")
Notify notify) {
- log.debug("Notify");
+ logger.debug("Notify");
handleNotify(notify);
}
@@ -176,7 +175,7 @@ public abstract class AbstractNotificati
SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault,
UnacceptableInitialTerminationTimeFault, UnsupportedPolicyRequestFault, UnrecognizedPolicyRequestFault {
- log.debug("Subscribe");
+ logger.debug("Subscribe");
return handleSubscribe(subscribeRequest, null);
}
@@ -203,7 +202,7 @@ public abstract class AbstractNotificati
success = true;
return response;
} catch (EndpointRegistrationException e) {
- log.warn("Unable to register new endpoint", e);
+ logger.warn("Unable to register new endpoint", e);
SubscribeCreationFailedFaultType fault = new SubscribeCreationFailedFaultType();
throw new SubscribeCreationFailedFault("Unable to register new endpoint", fault, e);
} finally {
@@ -212,7 +211,7 @@ public abstract class AbstractNotificati
try {
subscription.unsubscribe();
} catch (UnableToDestroySubscriptionFault e) {
- log.info("Error destroying subscription", e);
+ logger.info("Error destroying subscription", e);
}
}
}
@@ -248,7 +247,7 @@ public abstract class AbstractNotificati
MultipleTopicsSpecifiedFault, NoCurrentMessageOnTopicFault, ResourceUnknownFault,
TopicExpressionDialectUnknownFault, TopicNotSupportedFault {
- log.debug("GetCurrentMessage");
+ logger.debug("GetCurrentMessage");
NoCurrentMessageOnTopicFaultType fault = new NoCurrentMessageOnTopicFaultType();
throw new NoCurrentMessageOnTopicFault("There is no current message on this topic.", fault);
}
@@ -275,7 +274,7 @@ public abstract class AbstractNotificati
PublisherRegistrationFailedFault, PublisherRegistrationRejectedFault, ResourceUnknownFault,
TopicNotSupportedFault {
- log.debug("RegisterPublisher");
+ logger.debug("RegisterPublisher");
return handleRegisterPublisher(registerPublisherRequest, null);
}
@@ -297,7 +296,7 @@ public abstract class AbstractNotificati
success = true;
return response;
} catch (EndpointRegistrationException e) {
- log.warn("Unable to register new endpoint", e);
+ logger.warn("Unable to register new endpoint", e);
PublisherRegistrationFailedFaultType fault = new PublisherRegistrationFailedFaultType();
throw new PublisherRegistrationFailedFault("Unable to register new endpoint", fault, e);
} finally {
@@ -306,7 +305,7 @@ public abstract class AbstractNotificati
try {
publisher.destroy();
} catch (ResourceNotDestroyedFault e) {
- log.info("Error destroying publisher", e);
+ logger.info("Error destroying publisher", e);
}
}
}
@@ -323,7 +322,7 @@ public abstract class AbstractNotificati
javax.xml.namespace.QName getResourcePropertyRequest
) throws ResourceUnavailableFault, ResourceUnknownFault, InvalidResourcePropertyQNameFault {
- log.debug("GetResourceProperty");
+ logger.debug("GetResourceProperty");
return handleGetResourceProperty(getResourcePropertyRequest);
}
Modified: servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java (original)
+++ servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractPullPoint.java Fri Feb 4 09:05:47 2011
@@ -25,8 +25,6 @@ import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.oasis_open.docs.wsn.b_2.CreatePullPoint;
import org.oasis_open.docs.wsn.b_2.DestroyPullPoint;
import org.oasis_open.docs.wsn.b_2.DestroyPullPointResponse;
@@ -41,11 +39,13 @@ import org.oasis_open.docs.wsn.bw_2.Unab
import org.oasis_open.docs.wsn.bw_2.UnableToDestroyPullPointFault;
import org.oasis_open.docs.wsn.bw_2.UnableToGetMessagesFault;
import org.oasis_open.docs.wsrf.rw_2.ResourceUnknownFault;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@WebService(endpointInterface = "org.oasis_open.docs.wsn.bw_2.PullPoint")
public abstract class AbstractPullPoint extends AbstractEndpoint implements PullPoint, NotificationConsumer {
- private static Log log = LogFactory.getLog(AbstractPullPoint.class);
+ private final Logger logger = LoggerFactory.getLogger(AbstractPullPoint.class);
protected AbstractCreatePullPoint createPullPoint;
@@ -65,7 +65,7 @@ public abstract class AbstractPullPoint
partName = "Notify")
Notify notify) {
- log.debug("Notify");
+ logger.debug("Notify");
for (NotificationMessageHolderType messageHolder : notify.getNotificationMessage()) {
store(messageHolder);
}
@@ -87,7 +87,7 @@ public abstract class AbstractPullPoint
partName = "GetMessagesRequest")
GetMessages getMessagesRequest) throws ResourceUnknownFault, UnableToGetMessagesFault {
- log.debug("GetMessages");
+ logger.debug("GetMessages");
BigInteger max = getMessagesRequest.getMaximumNumber();
List<NotificationMessageHolderType> messages = getMessages(max != null ? max.intValue() : 0);
GetMessagesResponse response = new GetMessagesResponse();
@@ -111,7 +111,7 @@ public abstract class AbstractPullPoint
partName = "DestroyPullPointRequest")
DestroyPullPoint destroyPullPointRequest) throws ResourceUnknownFault, UnableToDestroyPullPointFault {
- log.debug("Destroy");
+ logger.debug("Destroy");
createPullPoint.destroyPullPoint(getAddress());
return new DestroyPullPointResponse();
}