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 [2/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/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java Tue Jul 19 21:03:14 2011
@@ -56,8 +56,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-public class HttpSoapInOutBinding extends ComponentSupport implements
- HttpBinding {
+public class HttpSoapInOutBinding extends ComponentSupport implements HttpBinding {
protected XFire xfire;
protected XFireServletController controller;
@@ -67,6 +66,7 @@ public class HttpSoapInOutBinding extend
protected SourceTransformer transformer;
public HttpSoapInOutBinding() {
+
}
public void init(ComponentContext context) throws JBIException {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java Tue Jul 19 21:03:14 2011
@@ -22,8 +22,6 @@ import java.security.Security;
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.security.SslSocketConnector;
@@ -32,14 +30,19 @@ import org.mortbay.jetty.servlet.Servlet
import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.jetty.servlet.ServletMapping;
import org.mortbay.thread.BoundedThreadPool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
/**
* An embedded Servlet engine to implement a HTTP connector
*
- * @version $Revision: 373823 $
+ * @version $Revision$
*/
public class HttpsConnector extends HttpInOutBinding {
+
+ private static final Logger logger = LoggerFactory.getLogger(HttpsConnector.class);
+
private SslSocketConnector listener = new SslSocketConnector();
/**
@@ -47,7 +50,6 @@ public class HttpsConnector extends Http
* to 256 by default to match the default value in Jetty.
*/
private int maxThreads = 256;
- private static final Log log = LogFactory.getLog(HttpsConnector.class);
private Server server;
private String host;
private int port;
@@ -171,7 +173,7 @@ public class HttpsConnector extends Http
server.start();
}
catch (Exception e) {
- log.warn(e.toString());
+ logger.warn(e.toString());
throw new JBIException("Start failed: " + e, e);
}
}
@@ -186,7 +188,7 @@ public class HttpsConnector extends Http
}
}
catch (Exception e) {
- log.warn(e.toString());
+ logger.warn(e.toString());
throw new JBIException("Stop failed: " + e, e);
}
}
@@ -198,7 +200,6 @@ public class HttpsConnector extends Http
server = null;
}
-
// Properties
//-------------------------------------------------------------------------
public int getPort() {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsInvoker.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsInvoker.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsInvoker.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsInvoker.java Tue Jul 19 21:03:14 2011
@@ -54,7 +54,7 @@ import org.springframework.core.io.Class
/**
* Performs HTTP client invocations on a remote HTTP site.
*
- * @version $Revision: 373823 $
+ * @version $Revision$
*/
public class HttpsInvoker extends TransformComponentSupport implements MessageExchangeListener {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java Tue Jul 19 21:03:14 2011
@@ -22,8 +22,6 @@ import java.security.Security;
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.security.SslSocketConnector;
@@ -32,9 +30,14 @@ import org.mortbay.jetty.servlet.Servlet
import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.jetty.servlet.ServletMapping;
import org.mortbay.thread.BoundedThreadPool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
public class HttpsSoapConnector extends HttpSoapInOutBinding {
+
+ private static final Logger logger = LoggerFactory.getLogger(HttpsConnector.class);
+
private SslSocketConnector listener = new SslSocketConnector();
/**
@@ -43,7 +46,6 @@ public class HttpsSoapConnector extends
*/
private int maxThreads = 256;
private Server server;
- private static final Log log = LogFactory.getLog(HttpsConnector.class);
private String host;
private int port;
private String keyPassword;
@@ -166,7 +168,7 @@ public class HttpsSoapConnector extends
server.start();
}
catch (Exception e) {
- log.warn(e.toString());
+ logger.warn(e.toString());
throw new JBIException("Start failed: " + e, e);
}
}
@@ -350,4 +352,5 @@ public class HttpsSoapConnector extends
public void setWantClientAuth(boolean wantClientAuth) {
this.wantClientAuth = wantClientAuth;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/InvalidStatusResponseException.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/InvalidStatusResponseException.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/InvalidStatusResponseException.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/InvalidStatusResponseException.java Tue Jul 19 21:03:14 2011
@@ -19,9 +19,10 @@ package org.apache.servicemix.components
import javax.jbi.messaging.MessagingException;
/**
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class InvalidStatusResponseException extends MessagingException {
+
private int statusCode;
public InvalidStatusResponseException(int statusCode) {
@@ -32,4 +33,5 @@ public class InvalidStatusResponseExcept
public int getStatusCode() {
return statusCode;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/SpringBindingServlet.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/SpringBindingServlet.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/SpringBindingServlet.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/SpringBindingServlet.java Tue Jul 19 21:03:14 2011
@@ -28,7 +28,7 @@ import javax.servlet.ServletException;
* lookup the JBI container and the HttpBinding to use from the Spring
* {@link ApplicationContext}
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class SpringBindingServlet extends BindingServlet {
@@ -60,6 +60,5 @@ public class SpringBindingServlet extend
throw new ServletException("The endpoint is not a HttpBinding: " + value);
}
}
-
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberChatSender.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberChatSender.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberChatSender.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberChatSender.java Tue Jul 19 21:03:14 2011
@@ -26,7 +26,7 @@ import javax.jbi.messaging.NormalizedMes
/**
* Sends one way messages to a private Jabber {@link Chat}
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JabberChatSender extends JabberComponentSupport {
@@ -84,4 +84,5 @@ public class JabberChatSender extends Ja
chat.sendMessage(message);
done(messageExchange);
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberComponentSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberComponentSupport.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberComponentSupport.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberComponentSupport.java Tue Jul 19 21:03:14 2011
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.components.jabber;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.OutBinding;
import org.jivesoftware.smack.*;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Presence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import javax.jbi.JBIException;
@@ -30,10 +30,11 @@ import javax.jbi.messaging.MessagingExce
import javax.jbi.messaging.NormalizedMessage;
/**
- * @version $Revision: 517251 $
+ * @version $Revision$
*/
public abstract class JabberComponentSupport extends OutBinding implements InitializingBean, PacketListener {
- private static final transient Log log = LogFactory.getLog(JabberComponentSupport.class);
+
+ protected static final transient Logger logger = LoggerFactory.getLogger(JabberComponentSupport.class);
private JabberMarshaler marshaler = new JabberMarshaler();
protected XMPPConnection connection;
@@ -62,14 +63,14 @@ public abstract class JabberComponentSup
if (this.connection == null) {
this.connection = new XMPPConnection(this.connectionConfig);
- this.log.debug("Connecting to server " + this.host);
+ this.logger.debug("Connecting to server {}", this.host);
this.connection.connect();
if (this.login && !this.connection.isAuthenticated()) {
if (this.user != null) {
- this.log.debug("Logging into Jabber as user: " + this.user + " on connection: " + this.connection);
+ this.logger.debug("Logging into Jabber as user: {}", this.user);
if (this.password == null) {
- this.log.warn("No password configured for user: " + this.user);
+ this.logger.warn("No password configured for user: {}", this.user);
}
AccountManager accountManager = new AccountManager(this.connection);
@@ -81,7 +82,7 @@ public abstract class JabberComponentSup
this.connection.login(this.user, this.password);
}
} else {
- this.log.debug("Logging in anonymously to Jabber on connection: " + this.connection);
+ this.logger.debug("Logging in anonymously to Jabber on connection: {}", this.connection);
this.connection.loginAnonymously();
}
// now lets send a presence we are available
@@ -95,7 +96,7 @@ public abstract class JabberComponentSup
public void stop() throws JBIException {
if (this.connection != null && this.connection.isConnected()) {
- this.logger.debug("Disconnecting from server " + this.host);
+ this.logger.debug("Disconnecting from server {}", this.host);
this.connection.disconnect();
this.connection = null;
}
@@ -179,4 +180,5 @@ public abstract class JabberComponentSup
public void setLogin(boolean login) {
this.login = login;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberGroupChatSender.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberGroupChatSender.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberGroupChatSender.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberGroupChatSender.java Tue Jul 19 21:03:14 2011
@@ -27,7 +27,7 @@ import javax.jbi.messaging.NormalizedMes
* Sends one way messages to a Jabber {@link MultiUserChat} and receives inbound messages
* from the chat
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JabberGroupChatSender extends JabberComponentSupport {
@@ -51,7 +51,7 @@ public class JabberGroupChatSender exten
this.chat.join(this.user);
}
} catch (Exception ex) {
- logger.error("Unable to log into chatroom " + room, ex);
+ logger.error("Unable to LOGGER into chatroom " + room, ex);
}
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberListenerException.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberListenerException.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberListenerException.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberListenerException.java Tue Jul 19 21:03:14 2011
@@ -21,9 +21,10 @@ import org.jivesoftware.smack.packet.Pac
/**
* A runtime exception thrown when processing inbound Jabber packets.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JabberListenerException extends RuntimeException {
+
private Packet packet;
public JabberListenerException(Exception cause, Packet packet) {
@@ -34,4 +35,5 @@ public class JabberListenerException ext
public Packet getPacket() {
return packet;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java Tue Jul 19 21:03:14 2011
@@ -30,9 +30,10 @@ import java.util.Iterator;
/**
* Marshals Jabber messages into and out of NMS messages
*
- * @version $Revision: 429277 $
+ * @version $Revision$
*/
public class JabberMarshaler {
+
private SourceMarshaler sourceMarshaler;
public JabberMarshaler() {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberReceiver.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberReceiver.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberReceiver.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberReceiver.java Tue Jul 19 21:03:14 2011
@@ -28,7 +28,7 @@ import javax.jbi.messaging.NormalizedMes
/**
* Receives inbound messages or packets and dispatches them into the NMR
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JabberReceiver extends JabberComponentSupport {
@@ -62,4 +62,5 @@ public class JabberReceiver extends Jabb
protected void process(MessageExchange exchange, NormalizedMessage message) throws Exception {
throw new MessagingException("This component is not meant to receive inbound messages but received: " + message);
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jaxrpc/JaxRpcInBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jaxrpc/JaxRpcInBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jaxrpc/JaxRpcInBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jaxrpc/JaxRpcInBinding.java Tue Jul 19 21:03:14 2011
@@ -23,9 +23,10 @@ import javax.xml.rpc.Call;
import org.apache.servicemix.components.util.OutBinding;
/**
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JaxRpcInBinding extends OutBinding {
+
private JaxRpcMarshaler marshaler = new JaxRpcMarshaler();
@@ -36,4 +37,5 @@ public class JaxRpcInBinding extends Out
call.invokeOneWay(params);
done(messageExchange);
}
+
}
\ No newline at end of file
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jaxrpc/JaxRpcMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jaxrpc/JaxRpcMarshaler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jaxrpc/JaxRpcMarshaler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jaxrpc/JaxRpcMarshaler.java Tue Jul 19 21:03:14 2011
@@ -20,7 +20,7 @@ import javax.jbi.messaging.NormalizedMes
import javax.xml.rpc.Call;
/**
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JaxRpcMarshaler {
@@ -31,4 +31,5 @@ public class JaxRpcMarshaler {
public Object[] getCallParams(NormalizedMessage normalizedMessage) {
return new Object[0]; /** TODO */
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jdbc/JdbcComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jdbc/JdbcComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jdbc/JdbcComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jdbc/JdbcComponent.java Tue Jul 19 21:03:14 2011
@@ -32,23 +32,24 @@ import javax.jbi.messaging.NormalizedMes
import javax.sql.DataSource;
import javax.xml.transform.Source;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.MessageExchangeListener;
import org.apache.servicemix.components.util.TransformComponentSupport;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.xpath.CachedXPathAPI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
public class JdbcComponent extends TransformComponentSupport implements MessageExchangeListener {
- private static final Log log = LogFactory.getLog(JdbcComponent.class);
+
+ private static final Logger logger = LoggerFactory.getLogger(JdbcComponent.class);
private DataSource dataSource;
private boolean responseRequired = false;
public boolean transform(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out) throws MessagingException {
- log.debug("Received a JDBC request. Datasource=" + dataSource + ", ResponseRequired=" + responseRequired);
+ logger.debug("Received a JDBC request. Datasource=" + dataSource + ", ResponseRequired=" + responseRequired);
Connection conn = null;
Statement stmt = null;
ResultSet rs = null;
@@ -60,13 +61,13 @@ public class JdbcComponent extends Trans
// Return the exception message
// if (isExceptionXml(domNode)) {
-// log.debug("Found an exception message: " + domNode);
+// LOGGER.debug("Found an exception message: " + domNode);
// out.setContent(in.getContent());
// return true;
// }
String query = getQuery(domNode);
- log.debug("Retrieved query: " + query);
+ logger.debug("Retrieved query: " + query);
conn = dataSource.getConnection();
@@ -78,16 +79,16 @@ public class JdbcComponent extends Trans
// Result is a ResultSet object
rs = stmt.getResultSet();
- log.debug("Formatting ResultSet: " + rs);
+ logger.debug("Formatting ResultSet: " + rs);
outMsg = toXmlSource(rs);
} else {
int updateCount = stmt.getUpdateCount();
if (updateCount > -1) {
- log.debug("Formatting UpdateCount: " + updateCount);
+ logger.debug("Formatting UpdateCount: " + updateCount);
// Result is an update count
outMsg = toXmlSource(updateCount);
} else {
- log.debug("Formatting NoResult.");
+ logger.debug("Formatting NoResult.");
// Result is neither a result set nor an update count
outMsg = null;
}
@@ -96,23 +97,23 @@ public class JdbcComponent extends Trans
if (outMsg != null) {
// There is a valid response
- log.debug("Response: " + domTransform.toString(outMsg));
+ logger.debug("Response: " + domTransform.toString(outMsg));
out.setContent(outMsg);
return true;
} else if (responseRequired) {
// Create an empty <sqlResult> element
- log.debug("Response: Empty Response");
+ logger.debug("Response: Empty Response");
out.setContent(toXmlSource());
return true;
} else {
- log.debug("Response: No Response");
+ logger.debug("Response: No Response");
// There is no valid response
return false;
}
} catch (Exception e) {
- log.error("JDBC Component Exception: ", e);
+ logger.error("JDBC Component Exception: ", e);
// out.setContent(createExceptionXml(e));
// return true;
throw new MessagingException(e);
@@ -252,14 +253,4 @@ public class JdbcComponent extends Trans
return new StringSource("<sqlResult></sqlResult>");
}
-
- // Custom method to create and handle exception
- /*
- public boolean isExceptionXml(Node document) {
- return document.getFirstChild().getNodeName().equalsIgnoreCase("exception");
- }
-
- public Source createExceptionXml(Throwable e) {
- return new StringSource("<exception class='" + e.getClass() + "'>'" + e.getMessage() + "'</exception>");
- } */
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/DestinationChooser.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/DestinationChooser.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/DestinationChooser.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/DestinationChooser.java Tue Jul 19 21:03:14 2011
@@ -22,7 +22,7 @@ import javax.jms.Destination;
/**
* A pluggable strategy used to decide which JMS Destination to use for an outbound JMS message
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public interface DestinationChooser {
@@ -30,4 +30,5 @@ public interface DestinationChooser {
* Chooses which JMS destintation to use for the outbound message
*/
Destination chooseDestination(MessageExchange messageExchange);
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JBIJMSException.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JBIJMSException.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JBIJMSException.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JBIJMSException.java Tue Jul 19 21:03:14 2011
@@ -23,10 +23,12 @@ import javax.jms.JMSException;
* Thrown when a JMS message is thrown from inside a JMS binding
* component for the JBI container
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JBIJMSException extends JBIException {
+
public JBIJMSException(JMSException cause) {
super(cause);
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsInBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsInBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsInBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsInBinding.java Tue Jul 19 21:03:14 2011
@@ -26,20 +26,21 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
-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.RuntimeJBIException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A JMS {@link MessageListener} which sends the inbound JMS message into the JBI container
* for processing
*
- * @version $Revision: 487499 $
+ * @version $Revision$
*/
public class JmsInBinding extends ComponentSupport implements MessageListener, MessageExchangeListener {
- private static final Log log = LogFactory.getLog(JmsInBinding.class);
+
+ private static final Logger logger = LoggerFactory.getLogger(JmsInBinding.class);
private JmsMarshaler marshaler = new JmsMarshaler();
private boolean synchronous = false;
@@ -67,8 +68,8 @@ public class JmsInBinding extends Compon
}
public void onMessage(Message jmsMessage) {
- if (log.isTraceEnabled()) {
- log.trace("Received: " + jmsMessage);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Received: " + jmsMessage);
}
try {
@@ -99,4 +100,5 @@ public class JmsInBinding extends Compon
// Do nothing as we only send in-only
// but this ensure that messages are not queued in the DeliveryChannel
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsInUsingJCABinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsInUsingJCABinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsInUsingJCABinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsInUsingJCABinding.java Tue Jul 19 21:03:14 2011
@@ -28,7 +28,7 @@ import org.springframework.beans.factory
/**
* Uses the JCA Container for better inbound subscription.
*
- * @version $Revision: 487499 $
+ * @version $Revision$
*/
public class JmsInUsingJCABinding extends JmsInBinding implements BeanNameAware {
@@ -113,4 +113,5 @@ public class JmsInUsingJCABinding extend
public void setBeanName(String name) {
this.name = name;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsMarshaler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsMarshaler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsMarshaler.java Tue Jul 19 21:03:14 2011
@@ -33,9 +33,10 @@ import java.util.Iterator;
/**
* Marshalls JMS messages into and out of NMS messages
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JmsMarshaler {
+
private SourceMarshaler sourceMarshaler;
private boolean needJavaIdentifiers;
@@ -148,5 +149,6 @@ public class JmsMarshaler {
*/
public void setNeedJavaIdentifiers(boolean needJavaIdentifiers) {
this.needJavaIdentifiers = needJavaIdentifiers;
- }
+ }
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java Tue Jul 19 21:03:14 2011
@@ -31,9 +31,10 @@ import org.springframework.jms.core.JmsT
* A component which uses a {@link JmsTemplate} to consume messages from a
* destination.
*
- * @version $Revision: 466982 $
+ * @version $Revision$
*/
public class JmsReceiverComponent extends JmsInBinding implements InitializingBean {
+
private JmsTemplate template;
private String selector;
private MessageConsumer consumer;
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsSenderComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsSenderComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsSenderComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsSenderComponent.java Tue Jul 19 21:03:14 2011
@@ -23,9 +23,9 @@ import javax.jms.Message;
import javax.jms.Session;
import javax.xml.transform.TransformerException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.OutBinding;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;
@@ -33,11 +33,11 @@ import org.springframework.jms.core.Mess
* Consumers JBI messages and sends them to a JMS destination using the Spring
* {@link JmsTemplate}
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class JmsSenderComponent extends OutBinding {
- private static final Log log = LogFactory.getLog(JmsSenderComponent.class);
+ private static final Logger logger = LoggerFactory.getLogger(JmsSenderComponent.class);
private JmsTemplate template;
private JmsMarshaler marshaler = new JmsMarshaler();
@@ -82,9 +82,8 @@ public class JmsSenderComponent extends
public Message createMessage(Session session) throws JMSException {
try {
Message message = marshaler.createMessage(inMessage, session);
- if (log.isTraceEnabled()) {
- log.trace("Sending message to: " + template.getDefaultDestinationName() + " message: " + message);
- }
+ logger.trace("Sending message to: {}", template.getDefaultDestinationName());
+ logger.trace("Message: {}", message);
return message;
}
catch (TransformerException e) {
@@ -96,4 +95,5 @@ public class JmsSenderComponent extends
});
done(exchange);
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java Tue Jul 19 21:03:14 2011
@@ -32,12 +32,12 @@ import javax.jms.MessageListener;
import javax.jms.Session;
import javax.xml.transform.TransformerException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.executors.Executor;
import org.apache.servicemix.executors.ExecutorFactory;
import org.apache.servicemix.jbi.framework.ComponentContextImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.jms.JmsException;
import org.springframework.jms.core.JmsTemplate;
@@ -48,10 +48,12 @@ import org.springframework.jms.core.Mess
* container for processing, and send back the result to the JMS requestor - used for the TopipcRequestor and
* QueueRequestor pattern
*
- * @version $Revision: 466982 $
+ * @version $Revision$
*/
public class JmsServiceComponent extends ComponentSupport implements MessageListener, InitializingBean {
- private static final Log log = LogFactory.getLog(JmsServiceComponent.class);
+
+ private static final Logger logger = LoggerFactory.getLogger(JmsServiceComponent.class);
+
private DestinationChooser destinationChooser;
private JmsMarshaler marshaler = new JmsMarshaler();
private JmsTemplate template;
@@ -247,10 +249,8 @@ public class JmsServiceComponent extends
try {
Message message = marshaler.createMessage(messageExchange.getOutMessage(), session);
message.setJMSCorrelationID(jmsMessage.getJMSCorrelationID());
- if (log.isTraceEnabled()) {
- log.trace("Sending message to: " + template.getDefaultDestinationName()
- + " message: " + message);
- }
+ logger.trace("Sending message to: {}", template.getDefaultDestinationName());
+ logger.trace("Message: {}", message);
return message;
}
catch (TransformerException e) {
@@ -268,13 +268,13 @@ public class JmsServiceComponent extends
}
}
catch (JMSException e) {
- log.error("Couldn't process " + jmsMessage, e);
+ logger.error("Couldn't process {}", jmsMessage, e);
messageExchange.setError(e);
messageExchange.setStatus(ExchangeStatus.ERROR);
}
}
catch (MessagingException e) {
- log.error("Failed to process inbound JMS Message: " + jmsMessage, e);
+ logger.error("Failed to process inbound JMS Message: {}", jmsMessage, e);
}
}
@@ -304,9 +304,10 @@ public class JmsServiceComponent extends
result = inboundMessage.getJMSReplyTo();
}
if (result == null) {
- log.error("Could not find an outbound destination for " + inboundMessage);
+ logger.error("Could not find an outbound destination for {}", inboundMessage);
throw new JMSException("No outbound JMS Destination can be found");
}
return result;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/RuntimeJMSException.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/RuntimeJMSException.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/RuntimeJMSException.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/RuntimeJMSException.java Tue Jul 19 21:03:14 2011
@@ -23,11 +23,12 @@ import javax.jms.JMSException;
* in a method which cannot throw a checked exception such
* as inside a JMS {@link javax.jms.MessageListener#onMessage(javax.jms.Message)} method.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class RuntimeJMSException extends RuntimeException {
public RuntimeJMSException(JMSException cause) {
super(cause);
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/SimpleDestinationChooser.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/SimpleDestinationChooser.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/SimpleDestinationChooser.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jms/SimpleDestinationChooser.java Tue Jul 19 21:03:14 2011
@@ -23,9 +23,10 @@ import javax.jms.Destination;
* A simple destination chooser which will use the value of the {@link #OUT_DESTINATION_KEY}
* property on the message exchange, or fall back to a default destination
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class SimpleDestinationChooser implements DestinationChooser {
+
public static final String OUT_DESTINATION_KEY = "org.apache.servicemix.binding.jms.out.destination";
private Destination defaultDestination;
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jmx/CounterMonitorComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jmx/CounterMonitorComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jmx/CounterMonitorComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/jmx/CounterMonitorComponent.java Tue Jul 19 21:03:14 2011
@@ -30,20 +30,21 @@ import javax.management.ObjectName;
import javax.management.monitor.CounterMonitor;
import javax.xml.transform.Source;
-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;
/**
* A JMX Counter Monitor as a Component to enable firing notifications
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class CounterMonitorComponent extends ComponentSupport implements NotificationListener, MessageExchangeListener {
- private static final Log log = LogFactory.getLog(ComponentSupport.class);
+ private static final Logger logger = LoggerFactory.getLogger(ComponentSupport.class);
+
private String name;
private ObjectName ourName;
private String observedObjectName;
@@ -142,7 +143,7 @@ public class CounterMonitorComponent ext
send(exchange);
}
catch (Exception e) {
- log.error("Failed to send Notification message to the NMR");
+ logger.error("Failed to send Notification message to the NMR");
}
}
@@ -278,4 +279,5 @@ public class CounterMonitorComponent ext
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
// We can only receive acks, so do nothing
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/ConfigNotSupportedException.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/ConfigNotSupportedException.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/ConfigNotSupportedException.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/ConfigNotSupportedException.java Tue Jul 19 21:03:14 2011
@@ -21,6 +21,7 @@ public class ConfigNotSupportedException
public ConfigNotSupportedException() {
super();
}
+
public ConfigNotSupportedException(String message) {
super(message);
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/ExistingPropertyCopier.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/ExistingPropertyCopier.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/ExistingPropertyCopier.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/ExistingPropertyCopier.java Tue Jul 19 21:03:14 2011
@@ -19,10 +19,8 @@ package org.apache.servicemix.components
import javax.jbi.JBIException;
import javax.jbi.messaging.NormalizedMessage;
-
/**
* Copy a property value from an existing property (somewhere)
- * @author rbuckland
*
*/
public class ExistingPropertyCopier implements PropertyValue {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/MessagePropertySetterXML.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/MessagePropertySetterXML.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/MessagePropertySetterXML.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/MessagePropertySetterXML.java Tue Jul 19 21:03:14 2011
@@ -30,12 +30,12 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.TransformComponentSupport;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.xpath.CachedXPathAPI;
import org.apache.xpath.objects.XObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
import org.springframework.util.Assert;
import org.w3c.dom.Document;
@@ -43,8 +43,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
-
-
/**
* Sets properties on the message, loaded from an XML MPS file
* where the properties to set are located in a <property-set ..>
@@ -121,16 +119,10 @@ import org.xml.sax.SAXException;
* </mps>
* -->
*
- *
- * @author rbuckland
- *
*/
public class MessagePropertySetterXML extends TransformComponentSupport {
-
- /**
- * Apache commons logger
- */
- private final transient Log logger = LogFactory.getLog(getClass());
+
+ private final transient Logger logger = LoggerFactory.getLogger(getClass());
/**
* The name of our JBI property we may have to interrogate to
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertySet.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertySet.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertySet.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertySet.java Tue Jul 19 21:03:14 2011
@@ -27,7 +27,6 @@ import org.w3c.dom.NodeList;
public class PropertySet {
-
public final static String XML_ELEMENT_NAME = "property-set";
public final static String XML_ATTR_NAME_NAME = "name";
@@ -74,4 +73,5 @@ public class PropertySet {
public String getName() {
return propertySetName;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertySetNotFoundException.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertySetNotFoundException.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertySetNotFoundException.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertySetNotFoundException.java Tue Jul 19 21:03:14 2011
@@ -34,5 +34,4 @@ public class PropertySetNotFoundExceptio
super(cause);
}
-
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertyValueResolver.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertyValueResolver.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertyValueResolver.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/PropertyValueResolver.java Tue Jul 19 21:03:14 2011
@@ -22,21 +22,18 @@ import java.util.List;
import javax.jbi.JBIException;
import javax.jbi.messaging.NormalizedMessage;
-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;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
/**
- * Class to hold the list of propertyValues
- *
- * @author rbuckland
- *
+ * Class to hold the list of Property Values
*/
public class PropertyValueResolver {
- private final transient Log logger = LogFactory.getLog(getClass());
+ private final transient Logger logger = LoggerFactory.getLogger(getClass());
public static final String XML_ELEMENT_NAME = "property";
@@ -59,12 +56,6 @@ public class PropertyValueResolver {
/**
* Construct this PVR, the Element is the .. //property-set/property element
- *
- * @param propertyName
- * the name of the property that will be set
- * @param self
- * Element
- * @throws JBIException
*/
public PropertyValueResolver(String propertyName, Element self)
throws ConfigNotSupportedException {
@@ -75,8 +66,6 @@ public class PropertyValueResolver {
/**
* Set the property (this.name) on the out message based on any properties
* on the message
- *
- * @param msg
*/
public void setProperty(NormalizedMessage in, NormalizedMessage out)
throws JBIException {
@@ -96,10 +85,6 @@ public class PropertyValueResolver {
/**
* Get the value out of the in, and put it in the out.
- *
- * @param in
- * @param out
- * @return
*/
private String resolveValue(NormalizedMessage message) throws JBIException {
// go through the list
@@ -129,8 +114,6 @@ public class PropertyValueResolver {
* <existing-property name="someproperty"/> <xpath-expression>
* <![CDATA[/someexpath/statement]]> </xpath-expression> <static-value><![CDATA[a
* value in the raw]]></static-value> </property>
- *
- * @param propertyNode
*/
private void addPropertySetTypes(Element propertyElement)
throws ConfigNotSupportedException {
@@ -181,4 +164,5 @@ public class PropertyValueResolver {
}
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/StaticStringPropertyValue.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/StaticStringPropertyValue.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/StaticStringPropertyValue.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/StaticStringPropertyValue.java Tue Jul 19 21:03:14 2011
@@ -19,30 +19,16 @@ package org.apache.servicemix.components
import javax.jbi.JBIException;
import javax.jbi.messaging.NormalizedMessage;
-
public class StaticStringPropertyValue implements PropertyValue {
- /**
- * Our element name
- */
public final static String XML_ELEMENT_NAME = "static-value";
- /**
- * This is the static value we represent
- */
private String staticValue;
- /**
- * Ctor
- * @param staticValue
- */
public StaticStringPropertyValue(String staticValue) {
this.staticValue = staticValue;
}
-
- /**
- *
- */
+
public String getPropertyValue(NormalizedMessage msg) throws JBIException {
return staticValue;
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/XPathContentMessagePropertyValue.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/XPathContentMessagePropertyValue.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/XPathContentMessagePropertyValue.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/mps/XPathContentMessagePropertyValue.java Tue Jul 19 21:03:14 2011
@@ -27,8 +27,6 @@ import org.apache.xpath.objects.XObject;
/**
* Get the Value of a property from the message given the XPath Statement.
- * @author rbuckland
- *
*/
public class XPathContentMessagePropertyValue implements PropertyValue {
@@ -61,7 +59,6 @@ public class XPathContentMessageProperty
}
}
return resultValue;
-
}
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/ConnectionRefusedException.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/ConnectionRefusedException.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/ConnectionRefusedException.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/ConnectionRefusedException.java Tue Jul 19 21:03:14 2011
@@ -21,9 +21,10 @@ import javax.jbi.messaging.MessagingExce
/**
* Exception thrown if the connection could not be established.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class ConnectionRefusedException extends MessagingException {
+
private int code;
public ConnectionRefusedException(int code) {
@@ -37,5 +38,6 @@ public class ConnectionRefusedException
public int getCode() {
return code;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPClientPool.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPClientPool.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPClientPool.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPClientPool.java Tue Jul 19 21:03:14 2011
@@ -28,7 +28,7 @@ import java.io.IOException;
* A pool of FTP clients for
* the <a href="http://jakarta.apache.org/commons/net.html">Jakarta Commons Net</a> library
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class FTPClientPool extends SocketClientPoolSupport {
@@ -144,4 +144,5 @@ public class FTPClientPool extends Socke
protected SocketClient createSocketClient() {
return new FTPClient();
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPPoller.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPPoller.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPPoller.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPPoller.java Tue Jul 19 21:03:14 2011
@@ -24,14 +24,14 @@ import javax.jbi.JBIException;
import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.SocketClient;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.servicemix.components.util.DefaultFileMarshaler;
import org.apache.servicemix.components.util.FileMarshaler;
import org.apache.servicemix.components.util.PollingComponentSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -41,10 +41,11 @@ import java.util.concurrent.CopyOnWriteA
* and then sends them into the normalized message service, using a plugable transformer
* and removes them.
*
- * @version $Revision: 666120 $
+ * @version $Revision$
*/
public class FTPPoller extends PollingComponentSupport {
- private static final Log log = LogFactory.getLog(FTPPoller.class);
+
+ private static final Logger logger = LoggerFactory.getLogger(FTPPoller.class);
private FTPClientPool clientPool;
private String path;
@@ -68,7 +69,6 @@ public class FTPPoller extends PollingCo
}
}
-
// Properties
//-------------------------------------------------------------------------
public FTPClientPool getClientPool() {
@@ -114,8 +114,8 @@ public class FTPPoller extends PollingCo
protected void pollFile(final FTPFile aFile) {
if (workingSet.add(aFile)) {
- if (log.isDebugEnabled()) {
- log.debug("Scheduling file " + aFile + " for processing");
+ if (logger.isDebugEnabled()) {
+ logger.debug("Scheduling file " + aFile + " for processing");
}
getExecutor().execute(new Runnable() {
public void run() {
@@ -142,7 +142,7 @@ public class FTPPoller extends PollingCo
}
}
catch (Exception e) {
- log.error("Failed to process file: " + file + ". Reason: " + e, e);
+ logger.error("Failed to process file: " + file + ". Reason: " + e, e);
}
finally {
if (client != null) {
@@ -179,8 +179,9 @@ public class FTPPoller extends PollingCo
getClientPool().returnClient(client);
}
catch (Exception e) {
- log.error("Failed to return client to pool: " + e, e);
+ logger.error("Failed to return client to pool: " + e, e);
}
}
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPSender.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPSender.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPSender.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/FTPSender.java Tue Jul 19 21:03:14 2011
@@ -23,29 +23,29 @@ import javax.jbi.JBIException;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.SocketClient;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.servicemix.components.util.DefaultFileMarshaler;
import org.apache.servicemix.components.util.FileMarshaler;
import org.apache.servicemix.components.util.OutBinding;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A component which sends a message to a file using FTP via the
* <a href="http://jakarta.apache.org/commons/net.html">Jakarta Commons Net</a> library
*
- * @version $Revision: 486715 $
+ * @version $Revision$
*/
public class FTPSender extends OutBinding {
- private static final Log log = LogFactory.getLog(FTPSender.class);
+
+ private static final Logger logger = LoggerFactory.getLogger(FTPSender.class);
private FTPClientPool clientPool;
private FileMarshaler marshaler = new DefaultFileMarshaler();
private String uniqueFileName = "ServiceMix";
private boolean overwrite = false;
-
// Properties
//-------------------------------------------------------------------------
public FTPClientPool getClientPool() {
@@ -131,7 +131,7 @@ public class FTPSender extends OutBindin
out.close();
}
catch (IOException e) {
- log.error("Caught exception while closing stream on error: " + e, e);
+ logger.error("Caught exception while closing stream on error: ", e);
}
}
client.completePendingCommand();
@@ -145,7 +145,7 @@ public class FTPSender extends OutBindin
getClientPool().returnClient(client);
}
catch (Exception e) {
- log.error("Failed to return client to pool: " + e, e);
+ logger.error("Failed to return client to pool: ", e);
}
}
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/SocketClientPoolSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/SocketClientPoolSupport.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/SocketClientPoolSupport.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/net/SocketClientPoolSupport.java Tue Jul 19 21:03:14 2011
@@ -32,9 +32,10 @@ import java.net.InetAddress;
* <a href="http://jakarta.apache.org/commons/net.html">Jakarta Commons Net</a> library to handle
* internet networking connections.
*
- * @version $Revision: 469500 $
+ * @version $Revision$
*/
public abstract class SocketClientPoolSupport implements InitializingBean, DisposableBean, PoolableObjectFactory {
+
private ObjectPool pool;
private InetAddress address;
private String host;
@@ -88,7 +89,6 @@ public abstract class SocketClientPoolSu
public void passivateObject(Object object) throws Exception {
}
-
// Properties
//-------------------------------------------------------------------------
public InetAddress getAddress() {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/DefaultQuartzMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/DefaultQuartzMarshaler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/DefaultQuartzMarshaler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/DefaultQuartzMarshaler.java Tue Jul 19 21:03:14 2011
@@ -34,9 +34,9 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
/**
- * The default implementation of the Quartz marshaler
+ * The default implementation of the Quartz marshaller
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class DefaultQuartzMarshaler extends MarshalerSupport implements QuartzMarshaler {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/QuartzComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/QuartzComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/QuartzComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/QuartzComponent.java Tue Jul 19 21:03:14 2011
@@ -16,8 +16,6 @@
*/
package org.apache.servicemix.components.quartz;
-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.quartz.JobDetail;
@@ -28,6 +26,8 @@ import org.quartz.SchedulerException;
import org.quartz.SchedulerFactory;
import org.quartz.Trigger;
import org.quartz.impl.StdSchedulerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jbi.JBIException;
import javax.jbi.messaging.InOnly;
@@ -41,10 +41,11 @@ import java.util.Map;
/**
* A <a href="http://www.opensymphony.com/quartz/">Quartz</a> component for triggering components when timer events fire.
*
- * @version $Revision: 433012 $
+ * @version $Revision$
*/
public class QuartzComponent extends ComponentSupport implements MessageExchangeListener {
- private static final transient Log log = LogFactory.getLog(QuartzComponent.class);
+
+ private static final transient Logger logger = LoggerFactory.getLogger(QuartzComponent.class);
public static final String COMPONENT_KEY = "org.apache.servicemix.component";
@@ -114,9 +115,7 @@ public class QuartzComponent extends Com
* @param context the Quartz Job context
*/
public void onJobExecute(JobExecutionContext context) throws JobExecutionException {
- if (log.isDebugEnabled()) {
- log.debug("Firing Quartz Job with context: " + context);
- }
+ logger.debug("Firing Quartz Job with context: {}", context);
try {
InOnly exchange = getExchangeFactory().createInOnlyExchange();
NormalizedMessage message = exchange.createMessage();
@@ -129,7 +128,6 @@ public class QuartzComponent extends Com
}
}
-
// Properties
//-------------------------------------------------------------------------
public SchedulerFactory getFactory() {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/QuartzMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/QuartzMarshaler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/QuartzMarshaler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/QuartzMarshaler.java Tue Jul 19 21:03:14 2011
@@ -23,7 +23,7 @@ import javax.jbi.messaging.NormalizedMes
import javax.jbi.messaging.MessagingException;
/**
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public interface QuartzMarshaler {
@@ -36,4 +36,5 @@ public interface QuartzMarshaler {
* @throws MessagingException
*/
void populateNormalizedMessage(NormalizedMessage message, JobExecutionContext context) throws JobExecutionException, MessagingException;
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/ServiceMixJob.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/ServiceMixJob.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/ServiceMixJob.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/quartz/ServiceMixJob.java Tue Jul 19 21:03:14 2011
@@ -23,9 +23,10 @@ import org.quartz.JobExecutionException;
/**
* A Quartz Job which dispatches a message to a component.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class ServiceMixJob implements Job {
+
public void execute(JobExecutionContext context) throws JobExecutionException {
QuartzComponent component = (QuartzComponent) context.getJobDetail().getJobDataMap().get(QuartzComponent.COMPONENT_KEY);
if (component == null) {
@@ -33,4 +34,5 @@ public class ServiceMixJob implements Jo
}
component.onJobExecute(context);
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ProxyInOnlyBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ProxyInOnlyBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ProxyInOnlyBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ProxyInOnlyBinding.java Tue Jul 19 21:03:14 2011
@@ -24,20 +24,20 @@ import javax.jbi.JBIException;
import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.RuntimeJBIException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Proxy factory which sends the method invocations into the JBI container
* for processing.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class ProxyInOnlyBinding extends ComponentSupport implements InvocationHandler {
- private static final Log log = LogFactory.getLog(ProxyInOnlyBinding.class);
+ private static final Logger logger = LoggerFactory.getLogger(ProxyInOnlyBinding.class);
private ClassLoader cl;
private Class[] interfaces;
@@ -56,9 +56,7 @@ public class ProxyInOnlyBinding extends
}
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- if (log.isTraceEnabled()) {
- log.trace("Invoked: " + method);
- }
+ logger.trace("Invoked: {}", method);
try {
InOnly messageExchange = getDeliveryChannel().createExchangeFactory().createInOnlyExchange();
NormalizedMessage inMessage = messageExchange.createMessage();
@@ -76,4 +74,5 @@ public class ProxyInOnlyBinding extends
throw new RuntimeJBIException(e);
}
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ProxyInOutBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ProxyInOutBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ProxyInOutBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ProxyInOutBinding.java Tue Jul 19 21:03:14 2011
@@ -25,20 +25,20 @@ import javax.jbi.messaging.ExchangeStatu
import javax.jbi.messaging.InOut;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.RuntimeJBIException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Proxy factory which sends the method invocations into the JBI container
* for processing.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class ProxyInOutBinding extends ComponentSupport implements InvocationHandler {
- private static final Log log = LogFactory.getLog(ProxyInOutBinding.class);
+ private static final Logger logger = LoggerFactory.getLogger(ProxyInOutBinding.class);
private ClassLoader cl;
private final Class[] interfaces;
@@ -57,9 +57,7 @@ public class ProxyInOutBinding extends C
}
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- if (log.isTraceEnabled()) {
- log.trace("Invoked: " + proxy);
- }
+ logger.trace("Invoked: {}", proxy);
try {
InOut messageExchange = getDeliveryChannel().createExchangeFactory().createInOutExchange();
NormalizedMessage inMessage = messageExchange.createMessage();
@@ -80,4 +78,5 @@ public class ProxyInOutBinding extends C
throw new RuntimeJBIException(e);
}
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ReflectionOutBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ReflectionOutBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ReflectionOutBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/reflection/ReflectionOutBinding.java Tue Jul 19 21:03:14 2011
@@ -26,7 +26,7 @@ import org.apache.servicemix.components.
/**
* Consumes normalized method invocation from the JBI container.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class ReflectionOutBinding extends OutBinding {
@@ -48,4 +48,5 @@ public class ReflectionOutBinding extend
method.invoke(target, args);
done(messageExchange);
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/router/Predicate.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/router/Predicate.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/router/Predicate.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/router/Predicate.java Tue Jul 19 21:03:14 2011
@@ -23,8 +23,10 @@ import javax.jbi.component.ComponentCont
* A simple predicate which evaluates to true or false given the current
* context and message exchange.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public interface Predicate {
+
boolean evaluate(ComponentContext context, MessageExchange exchange);
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/router/RoutingRule.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/router/RoutingRule.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/router/RoutingRule.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/router/RoutingRule.java Tue Jul 19 21:03:14 2011
@@ -29,9 +29,10 @@ import javax.jbi.servicedesc.ServiceEndp
* A simple routing rule which if the predicate is matched then the message is forwarded to
* the given endpoint.
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class RoutingRule {
+
private Predicate predicate;
private EndpointResolver resolver;
private EndpointFilter filter = NullEndpointFilter.getInstance();
@@ -69,5 +70,4 @@ public class RoutingRule {
}
}
-
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/rss/FeedWriter.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/rss/FeedWriter.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/rss/FeedWriter.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/rss/FeedWriter.java Tue Jul 19 21:03:14 2011
@@ -50,7 +50,7 @@ import java.util.List;
/**
* This component generates an RSS/Atom Feed from the JBI messages it receives.
*
- * @version $Revision: 579627 $
+ * @version $Revision$
*/
public class FeedWriter extends OutBinding {
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/rss/RssPollingComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/rss/RssPollingComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/rss/RssPollingComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/rss/RssPollingComponent.java Tue Jul 19 21:03:14 2011
@@ -26,8 +26,6 @@ import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.PollingComponentSupport;
import com.sun.syndication.feed.synd.SyndEntry;
@@ -36,21 +34,23 @@ import com.sun.syndication.feed.synd.Syn
import com.sun.syndication.io.SyndFeedInput;
import com.sun.syndication.io.SyndFeedOutput;
import com.sun.syndication.io.XmlReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The RssPollingComponent polls for updates to RSS feeds
*
- * @version $Revision: 426415 $
+ * @version $Revision$
*/
public class RssPollingComponent extends PollingComponentSupport {
- private static final Log log = LogFactory.getLog(RssPollingComponent.class);
+
+ private static final Logger logger = LoggerFactory.getLogger(RssPollingComponent.class);
+
private List urlStrings = new ArrayList();
private List urls = new ArrayList();
private Date lastPolledDate = new Date();
private String outputType = "rss_2.0";
-
-
/**
* @return Returns the urlStrings.
*/
@@ -103,12 +103,11 @@ public class RssPollingComponent extends
urls.add(new URL(urlStrings.get(i).toString()));
}
catch (MalformedURLException e) {
- log.warn("URL: " + urlStrings.get(i) + " is badly formed", e);
+ logger.warn("URL: {} is badly formed", urlStrings.get(i), e);
}
}
}
super.init();
-
}
/**
@@ -135,7 +134,7 @@ public class RssPollingComponent extends
send(exchange);
}
catch (Exception e) {
- log.error("Failed to send RSS message to the NMR");
+ logger.error("Failed to send RSS message to the NMR");
}
finally {
lastPolledDate = new Date();
@@ -160,9 +159,10 @@ public class RssPollingComponent extends
}
}
catch (Exception e) {
- log.warn("Failed to process feed from: " + inputUrl, e);
+ logger.warn("Failed to process feed from: {}", inputUrl, e);
}
}
return result;
}
+
}
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java Tue Jul 19 21:03:14 2011
@@ -26,21 +26,21 @@ import javax.xml.soap.SOAPConnectionFact
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.MessageExchangeListener;
import org.apache.servicemix.components.util.TransformComponentSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Converts an inbound JBI message into a <a href="http://java.sun.com/xml/saaj/">SAAJ</a> (Soap With Attachments for Java)
* request-response and outputs the response back into JBI Bindings. This provides
* a message centric way of invoking SOAP services inside providers such as <a href="http://ws.apache.org/axis/">Apache Axis</a>
*
- * @version $Revision: 429277 $
+ * @version $Revision$
*/
public class SaajBinding extends TransformComponentSupport implements MessageExchangeListener {
- private static final transient Log log = LogFactory.getLog(SaajBinding.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(SaajBinding.class);
private SaajMarshaler marshaler = new SaajMarshaler();
private SOAPConnectionFactory connectionFactory;
@@ -109,10 +109,10 @@ public class SaajBinding extends Transfo
inMessage.saveChanges();
}
- if (log.isDebugEnabled()) {
+ if (logger.isDebugEnabled()) {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
inMessage.writeTo(buffer);
- log.debug(new String(buffer.toByteArray()));
+ logger.debug(new String(buffer.toByteArray()));
}
SOAPMessage response = connection.call(inMessage, soapEndpoint);
@@ -128,7 +128,7 @@ public class SaajBinding extends Transfo
connection.close();
}
catch (SOAPException e) {
- log.warn("Failed to close connection: " + e, e);
+ logger.warn("Failed to close connection", e);
}
}
}
@@ -156,4 +156,5 @@ public class SaajBinding extends Transfo
public void setSoapAction(String soapAction) {
this.soapAction = soapAction;
}
+
}