You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2012/10/20 21:04:16 UTC
svn commit: r1400501 [3/5] - in /airavata/trunk: ./ modules/airavata-client/
modules/commons/gfac-schema/
modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/
modules/commons/provenance-registry/ modules/commons/utils/ modul...
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/GraphImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/GraphImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/GraphImpl.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/GraphImpl.java Sat Oct 20 19:04:07 2012
@@ -48,13 +48,13 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.util.GraphUtil;
import org.apache.airavata.workflow.model.graph.ws.WSPort;
import org.apache.airavata.workflow.model.utils.ApplicationVersion;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public abstract class GraphImpl implements Graph {
- private static final Log logger = LogFactory.getLog(GraphImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(GraphImpl.class);
/**
* Unique ID of this workflow
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/NodeImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/NodeImpl.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/NodeImpl.java Sat Oct 20 19:04:07 2012
@@ -40,8 +40,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.Node;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.Port.Kind;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
/**
@@ -50,7 +50,7 @@ import org.xmlpull.infoset.XmlElement;
*/
public abstract class NodeImpl implements Node {
- private static final Log logger = LogFactory.getLog(NodeImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(NodeImpl.class);
protected String id;
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java Sat Oct 20 19:04:07 2012
@@ -36,8 +36,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.GraphSchema;
import org.apache.airavata.workflow.model.graph.Port;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class ConstantNode extends SystemNode {
@@ -46,7 +46,7 @@ public class ConstantNode extends System
private static final String VALUE_TAG_NAME = "value";
- private static final Log logger = LogFactory.getLog(ConstantNode.class);
+ private static final Logger logger = LoggerFactory.getLogger(ConstantNode.class);
private QName type;
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java Sat Oct 20 19:04:07 2012
@@ -38,8 +38,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.GraphSchema;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.ws.WSPort;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class InputNode extends ParameterNode {
@@ -48,7 +48,7 @@ public class InputNode extends Parameter
private static final String VISIBILITY_TAG_NAME = "visibility";
- private static final Log logger = LogFactory.getLog(InputNode.class);
+ private static final Logger logger = LoggerFactory.getLogger(InputNode.class);
private Object defaultValue;
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java Sat Oct 20 19:04:07 2012
@@ -38,15 +38,15 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.GraphSchema;
import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.workflow.model.graph.ws.WSPort;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class S3InputNode extends InputNode {
private static final String VALUE_TAG_NAME = "value";
- private static final Log logger = LogFactory.getLog(S3InputNode.class);
+ private static final Logger logger = LoggerFactory.getLogger(S3InputNode.class);
private Object defaultValue;
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java Sat Oct 20 19:04:07 2012
@@ -69,8 +69,8 @@ import org.apache.airavata.workflow.mode
import org.apache.commons.codec.binary.Base64;
import org.gpel.GpelConstants;
import org.gpel.model.GpelProcess;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.XmlInfosetBuilder;
import org.xmlpull.infoset.XmlNamespace;
@@ -114,7 +114,7 @@ public class Workflow implements Cloneab
private static final String ID_ATTRIBUTE = "id";
- private static final Log logger = LogFactory.getLog(Workflow.class);
+ private static final Logger logger = LoggerFactory.getLogger(Workflow.class);
private WSGraph graph;
Modified: airavata/trunk/modules/ws-messenger/client/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/client/pom.xml Sat Oct 20 19:04:07 2012
@@ -32,12 +32,8 @@
<!-- Logging -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Axis2 -->
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java Sat Oct 20 19:04:07 2012
@@ -28,15 +28,15 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
abstract class CommonMsgBrokerClient implements MessageBrokerClient {
protected final static OMFactory factory = OMAbstractFactory.getOMFactory();
private final static SOAPFactory soapfactory = OMAbstractFactory.getSOAP11Factory();
- private static final Log logger = LogFactory.getLog(CommonMsgBrokerClient.class);
+ private final static Logger logger = LoggerFactory.getLogger(CommonMsgBrokerClient.class);
protected ConsumerServer xs;
private long socketTimeout = 200000L;
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java Sat Oct 20 19:04:07 2012
@@ -35,8 +35,8 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
* Templates
*/
public class WsntCreatePublishReg extends WidgetStub {
- private static final Log logger = LogFactory.getLog(WseCreateSubscription.class);
+ private static final Logger logger = LoggerFactory.getLogger(WseCreateSubscription.class);
private OMFactory factory = OMAbstractFactory.getOMFactory();
private final static SOAPFactory soapfactory = OMAbstractFactory.getSOAP11Factory();
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java Sat Oct 20 19:04:07 2012
@@ -43,8 +43,8 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -52,7 +52,7 @@ import org.apache.commons.logging.LogFac
* Templates
*/
public class WsrfResourceStub {
- private static final Log logger = LogFactory.getLog(WsrfResourceStub.class);
+ private final static Logger logger = LoggerFactory.getLogger(WsrfResourceStub.class);
private final static OMFactory factory = OMAbstractFactory.getOMFactory();
private final static SOAPFactory soapfactory = OMAbstractFactory.getSOAP11Factory();
protected Options opts;
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MessagePuller.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MessagePuller.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MessagePuller.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MessagePuller.java Sat Oct 20 19:04:07 2012
@@ -28,12 +28,12 @@ import org.apache.airavata.wsmg.client.N
import org.apache.airavata.wsmg.msgbox.client.MsgBoxClient;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessagePuller {
- private static final Log logger = LogFactory.getLog(MessagePuller.class);
+ private final static Logger logger = LoggerFactory.getLogger(MessagePuller.class);
MsgBoxClient msgBoxUser = null;
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/NotificationViewerFrame.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/NotificationViewerFrame.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/NotificationViewerFrame.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/NotificationViewerFrame.java Sat Oct 20 19:04:07 2012
@@ -46,14 +46,14 @@ import javax.swing.border.Border;
import org.apache.airavata.wsmg.client.ConsumerServer;
import org.apache.airavata.wsmg.client.WsntMsgBrokerClient;
import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NotificationViewerFrame extends JFrame {
private static final long serialVersionUID = -4924241323165353343L;
- private static final Log logger = LogFactory.getLog(NotificationViewerFrame.class);
+ private static final Logger logger = LoggerFactory.getLogger(NotificationViewerFrame.class);
JPanel contentPane;
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java Sat Oct 20 19:04:07 2012
@@ -30,11 +30,11 @@ import org.apache.airavata.wsmg.client.C
import org.apache.airavata.wsmg.commons.NameSpaceConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WsntViewerConsumerNotificationHandler implements ConsumerNotificationHandler {
- private static final Log logger = LogFactory.getLog(WsntViewerConsumerNotificationHandler.class);
+ private final static Logger logger = LoggerFactory.getLogger(WsntViewerConsumerNotificationHandler.class);
public NotificationViewerFrame frame = null;
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java Sat Oct 20 19:04:07 2012
@@ -35,15 +35,15 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class can be used to invoke createMsgBox operation of msgBoxService and returns the resultant messageBoxId as
* EndpointReference
*/
public class CreateMsgBox {
- private static final Log logger = LogFactory.getLog(CreateMsgBox.class);
+ private static final Logger logger = LoggerFactory.getLogger(CreateMsgBox.class);
private final OMFactory factory = OMAbstractFactory.getOMFactory();
protected String msgBoxEndPointReference;
protected long timeoutInMilliSeconds;
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java Sat Oct 20 19:04:07 2012
@@ -31,15 +31,15 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class can be used to invoke destroyMsgBox operation of msgBoxService and returns the resultant messageBoxId as
* EndpointReference
*/
public class DestroyMsgBox {
- private static final Log logger = LogFactory.getLog(DestroyMsgBox.class);
+ private static final Logger logger = LoggerFactory.getLogger(DestroyMsgBox.class);
private EndpointReference msgBoxEndPointReference = null;
private long timeoutInMilliSeconds = 0;
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/MsgBoxClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/MsgBoxClient.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/MsgBoxClient.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/MsgBoxClient.java Sat Oct 20 19:04:07 2012
@@ -26,8 +26,8 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is the client class to invoke MsgBoxService this is using four separate classes to invoke four methods
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
public class MsgBoxClient {
int msgsAtOnce = 10;
- private static final Log logger = LogFactory.getLog(MsgBoxClient.class);
+ static Logger logger = LoggerFactory.getLogger(MsgBoxClient.class);
public MsgBoxClient() {
}
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java Sat Oct 20 19:04:07 2012
@@ -29,15 +29,15 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class can be used to invoke destroyMsgBox operation of msgBoxService and returns the resultant operation status
* as EndpointReference
*/
public class StoreMessage {
- private static final Log logger = LogFactory.getLog(StoreMessage.class);
+ private static final Logger logger = LoggerFactory.getLogger(StoreMessage.class);
protected EndpointReference msgBoxEndPointReference;
protected long timeoutInMilliSeconds;
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java Sat Oct 20 19:04:07 2012
@@ -33,15 +33,15 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class can be used to invoke takeMessages operation of msgBoxService and returns the resultant operation status
*
*/
public class TakeMessages {
- private static final Log logger = LogFactory.getLog(TakeMessages.class);
+ private static final Logger logger = LoggerFactory.getLogger(TakeMessages.class);
private final OMFactory factory = OMAbstractFactory.getOMFactory();
protected EndpointReference msgBoxEndPointReference;
protected long timeoutInMilliSeconds;
Modified: airavata/trunk/modules/ws-messenger/commons/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/commons/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/commons/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/commons/pom.xml Sat Oct 20 19:04:07 2012
@@ -25,12 +25,8 @@
<dependencies>
<!-- Logging -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Axis2 -->
Modified: airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/ConnectionPool.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/ConnectionPool.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/ConnectionPool.java (original)
+++ airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/ConnectionPool.java Sat Oct 20 19:04:07 2012
@@ -31,14 +31,14 @@ import java.util.concurrent.Semaphore;
import javax.sql.DataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A class for preallocating, recycling, and managing JDBC connections.
*/
public class ConnectionPool {
- private static final Log logger = LogFactory.getLog(ConnectionPool.class);
+ private static final Logger logger = LoggerFactory.getLogger(ConnectionPool.class);
private long MAX_IDLE_TIME = 5 * 60 * 1000; // 5 minutes
Modified: airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java (original)
+++ airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java Sat Oct 20 19:04:07 2012
@@ -33,8 +33,8 @@ import java.sql.SQLWarning;
import java.sql.Statement;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class creates the database tables required for messagebox and messagebroker with default configuration this
@@ -59,7 +59,7 @@ public class DatabaseCreator {
private static DatabaseType[] supportedDatabase = new DatabaseType[] { DatabaseType.derby, DatabaseType.mysql };
- private static final Log log = LogFactory.getLog(DatabaseCreator.class);
+ private static Logger log = LoggerFactory.getLogger(DatabaseCreator.class);
private static final String delimiter = ";";
/**
Modified: airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java (original)
+++ airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/JdbcStorage.java Sat Oct 20 19:04:07 2012
@@ -27,11 +27,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JdbcStorage {
- private static final Log log = LogFactory.getLog(JdbcStorage.class);
+ private static Logger log = LoggerFactory.getLogger(JdbcStorage.class);
private ConnectionPool connectionPool;
Modified: airavata/trunk/modules/ws-messenger/distribution/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/distribution/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/distribution/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/distribution/pom.xml Sat Oct 20 19:04:07 2012
@@ -87,6 +87,10 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
Modified: airavata/trunk/modules/ws-messenger/messagebox/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/pom.xml Sat Oct 20 19:04:07 2012
@@ -38,15 +38,13 @@
<artifactId>airavata-common-utils</artifactId>
<version>${project.version}</version>
</dependency>
+
<!-- Logging -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
+
<!-- Test -->
<dependency>
<groupId>junit</groupId>
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java Sat Oct 20 19:04:07 2012
@@ -41,8 +41,8 @@ import org.apache.airavata.wsmg.msgbox.u
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.ServiceLifeCycle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class initialize the messageBox service by setting the messageStore based on the configuration done by the user
@@ -50,13 +50,13 @@ import org.apache.commons.logging.LogFac
*/
public class MsgBoxServiceLifeCycle implements ServiceLifeCycle {
- private static final Log logger = LogFactory.getLog(MsgBoxServiceLifeCycle.class);
+ private static final Logger logger = LoggerFactory.getLogger(MsgBoxServiceLifeCycle.class);
private static final String CONFIGURATION_FILE_NAME = "airavata-server.properties";
private static final String TRUE = Boolean.toString(true);
public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
public static final int GFAC_URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
- public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000;
+ public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000 * 10;
public static final String JCR_CLASS = "jcr.class";
public static final String JCR_USER = "jcr.user";
public static final String JCR_PASS = "jcr.pass";
@@ -187,14 +187,13 @@ public class MsgBoxServiceLifeCycle impl
}
}catch (Exception e){
try {
- logger.info("Thread is sleeping since registry database is not up");
Thread.sleep(JCR_AVAIALABILITY_WAIT_INTERVAL);
} catch (InterruptedException e1) {
e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
return;
}
-// logger.error(e.getMessage());
-// logger.error("Workflow Interpreter Service URL update thread is interrupted");
+ logger.error(e.getMessage());
+ logger.error("Workflow Interpreter Service URL update thread is interrupted");
}
}
}
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceMessageReceiverInOut.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceMessageReceiverInOut.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceMessageReceiverInOut.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceMessageReceiverInOut.java Sat Oct 20 19:04:07 2012
@@ -31,8 +31,8 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.util.JavaUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* MsgBoxServiceMessageReceiverInOut message receiver, this is the actual location where the service operations get
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
public class MsgBoxServiceMessageReceiverInOut extends AbstractInOutMessageReceiver {
- private static final Log logger = LogFactory.getLog(MsgBoxServiceMessageReceiverInOut.class);
+ private static Logger logger = LoggerFactory.getLogger(MsgBoxServiceMessageReceiverInOut.class);
public void invokeBusinessLogic(MessageContext inMsgContext, MessageContext outMsgContext) throws AxisFault {
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java Sat Oct 20 19:04:07 2012
@@ -37,8 +37,8 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.service.Lifecycle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import sun.beans.editors.LongEditor;
/**
@@ -46,7 +46,7 @@ import sun.beans.editors.LongEditor;
*/
public class MsgBoxServiceSkeleton implements Lifecycle {
- private static final Log logger = LogFactory.getLog(MsgBoxServiceSkeleton.class);
+ private static final Logger logger = LoggerFactory.getLogger(MsgBoxServiceSkeleton.class);
private static final String TRUE = Boolean.toString(true);
private static final String FALSE = Boolean.toString(false);
private static OMFactory factory = OMAbstractFactory.getOMFactory();
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java Sat Oct 20 19:04:07 2012
@@ -33,8 +33,8 @@ import org.apache.airavata.wsmg.commons.
import org.apache.airavata.wsmg.commons.storage.JdbcStorage;
import org.apache.airavata.wsmg.msgbox.Storage.MsgBoxStorage;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Database message Storage Implementation, if airavata-server.properties configured to use database this will set as the storage
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
*/
public class DatabaseStorageImpl implements MsgBoxStorage {
- private static final Log logger = LogFactory.getLog(DatabaseStorageImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(DatabaseStorageImpl.class);
private static final String TABLE_NAME_TO_CHECK = "msgbox";
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java Sat Oct 20 19:04:07 2012
@@ -40,8 +40,8 @@ import javax.xml.stream.XMLStreamExcepti
import org.apache.airavata.wsmg.commons.storage.JdbcStorage;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is the core class which used by DatabaseStorageImpl to perform all the service operations, DatabaseStorageImpl
@@ -54,7 +54,7 @@ public class MessageBoxDB {
private static final String MSGBOX_TABLE_ID = "MSGBOXID";
- private static final Log logger = LogFactory.getLog(MessageBoxDB.class);
+ private static final Logger logger = LoggerFactory.getLogger(MessageBoxDB.class);
private static Set<String> msgBoxids;
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java Sat Oct 20 19:04:07 2012
@@ -29,15 +29,15 @@ import java.util.UUID;
import org.apache.airavata.wsmg.msgbox.Storage.MsgBoxStorage;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is the in memory storage implementation for MsgBoxService, this will be initialized if airavata-server.properties is
* configured not to use database implementation.
*/
public class InMemoryImpl implements MsgBoxStorage {
- private static final Log logger = LogFactory.getLog(InMemoryImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(InMemoryImpl.class);
private HashMap<String, List<Content>> map = new HashMap<String, List<Content>>();
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java Sat Oct 20 19:04:07 2012
@@ -32,14 +32,14 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.util.JavaUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This Dispatcher is used to validate the incoming message, this is set to Handler list in MsgBoxServiceLifeCycle.
*/
public class StoreMessageHandler extends AddressingBasedDispatcher {
- private static final Log logger = LogFactory.getLog(StoreMessageHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(StoreMessageHandler.class);
private static final String WSMG_MSGSTORE_SOAP_ACTION = MsgBoxQNameConstants.STOREMSG_QNAME.getNamespaceURI()
+ MsgBoxQNameConstants.STOREMSG_QNAME.getLocalPart();
private static final String ADDRESSING_VALIDATE_ACTION = "addressing.validateAction";
Modified: airavata/trunk/modules/ws-messenger/messagebroker/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/pom.xml Sat Oct 20 19:04:07 2012
@@ -108,12 +108,8 @@
<!-- Logging -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Test -->
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Sat Oct 20 19:04:07 2012
@@ -55,15 +55,16 @@ import org.apache.airavata.wsmg.util.Run
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.ServiceLifeCycle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class BrokerServiceLifeCycle implements ServiceLifeCycle {
- private static final Log log = LogFactory.getLog(BrokerServiceLifeCycle.class);
+ private static final Logger log = LoggerFactory.getLogger(BrokerServiceLifeCycle.class);
public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
public static final int GFAC_URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
- public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000;
+ public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000 * 10;
public static final String JCR_CLASS = "jcr.class";
public static final String JCR_USER = "jcr.user";
public static final String JCR_PASS = "jcr.pass";
@@ -319,14 +320,13 @@ public class BrokerServiceLifeCycle impl
}
} catch (Exception e) {
try {
- log.info("Thread is sleeping since registry database is not up");
Thread.sleep(JCR_AVAIALABILITY_WAIT_INTERVAL);
} catch (InterruptedException e1) {
e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
return;
}
-// log.error(e.getMessage());
-// log.error("Workflow Interpreter Service URL update thread is interrupted");
+ log.error(e.getMessage());
+ log.error("Workflow Interpreter Service URL update thread is interrupted");
}
}
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/ConsumerListManager.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/ConsumerListManager.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/ConsumerListManager.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/ConsumerListManager.java Sat Oct 20 19:04:07 2012
@@ -25,12 +25,12 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.airavata.wsmg.broker.subscription.SubscriptionState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConsumerListManager {
- private static final Log logger = LogFactory.getLog(ConsumerListManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(ConsumerListManager.class);
protected Map<String, ConsumerList> token2ConsumerListMap = new HashMap<String, ConsumerList>();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java Sat Oct 20 19:04:07 2012
@@ -45,12 +45,12 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NotificationProcessor {
- private static final Log logger = LogFactory.getLog(NotificationProcessor.class);
+ private static final Logger logger = LoggerFactory.getLogger(NotificationProcessor.class);
private WsmgConfigurationContext wsmgConfigContext;
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java Sat Oct 20 19:04:07 2012
@@ -32,12 +32,12 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.util.JavaUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PublishedMessageHandler extends AddressingBasedDispatcher {
- private static final Log logger = LogFactory.getLog(PublishedMessageHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(PublishedMessageHandler.class);
private static final String ADDRESSING_VALIDATE_ACTION = "addressing.validateAction";
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/CleanupThread.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/CleanupThread.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/CleanupThread.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/CleanupThread.java Sat Oct 20 19:04:07 2012
@@ -27,12 +27,12 @@ import java.util.Set;
import org.apache.airavata.wsmg.commons.CommonRoutines;
import org.apache.airavata.wsmg.config.WSMGParameter;
import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class CleanUpThread implements Runnable {
- private static final Log logger = LogFactory.getLog(CleanUpThread.class);
+ private static final Logger logger = LoggerFactory.getLogger(CleanUpThread.class);
private SubscriptionManager subMan;
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java Sat Oct 20 19:04:07 2012
@@ -54,8 +54,8 @@ import org.apache.airavata.wsmg.util.Run
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Manages subscribers.
@@ -63,7 +63,7 @@ import org.apache.commons.logging.LogFac
*/
public class SubscriptionManager {
- private static final Log log = LogFactory.getLog(SubscriptionManager.class);
+ private static final Logger log = LoggerFactory.getLogger(SubscriptionManager.class);
private HashMap<String, SubscriptionState> subscriptions = new HashMap<String, SubscriptionState>();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionState.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionState.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionState.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionState.java Sat Oct 20 19:04:07 2012
@@ -35,12 +35,12 @@ import org.apache.airavata.wsmg.messenge
import org.apache.airavata.wsmg.util.BrokerUtil;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SubscriptionState {
- private static final Log logger = LogFactory.getLog(SubscriptionState.class);
+ private final Logger logger = LoggerFactory.getLogger(SubscriptionState.class);
private long creationTime = 0;
private long lastAvailableTime = 0;
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java Sat Oct 20 19:04:07 2012
@@ -39,12 +39,12 @@ import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReferenceHelper;
import org.apache.axis2.context.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WSEProcessingContextBuilder extends ProcessingContextBuilder {
- private static final Log logger = LogFactory.getLog(WSEProcessingContextBuilder.class);
+ private static final Logger logger = LoggerFactory.getLogger(WSEProcessingContextBuilder.class);
public ProcessingContext build(OMElement elem) {
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java Sat Oct 20 19:04:07 2012
@@ -40,12 +40,12 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WSEProtocolSupport {
- private static final Log log = LogFactory.getLog(WSEProtocolSupport.class);
+ private static final Logger log = LoggerFactory.getLogger(WSEProtocolSupport.class);
public SubscriptionState createSubscriptionState(ProcessingContext ctx, OutGoingQueue outgoingQueue)
throws AxisFault {
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingMsgReceiver.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingMsgReceiver.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingMsgReceiver.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingMsgReceiver.java Sat Oct 20 19:04:07 2012
@@ -28,8 +28,8 @@ import org.apache.airavata.wsmg.config.W
import org.apache.airavata.wsmg.util.WsEventingOperations;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* BrokerServiceMessageReceiverInOut message receiver
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
public class WSEventingMsgReceiver extends AbstractBrokerMsgReceiver {
- private static final Log log = LogFactory.getLog(WSEventingMsgReceiver.class);
+ private static final Logger log = LoggerFactory.getLogger(WSEventingMsgReceiver.class);
WSEProcessingContextBuilder builder = new WSEProcessingContextBuilder();
public MessageContext process(MessageContext inMsg, String operationName) throws AxisFault {
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java Sat Oct 20 19:04:07 2012
@@ -38,12 +38,12 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WSNTProtocolSupport {
- private static final Log log = LogFactory.getLog(WSNTProtocolSupport.class);
+ private static final Logger log = LoggerFactory.getLogger(WSNTProtocolSupport.class);
public SubscriptionState createSubscriptionState(ProcessingContext ctx, OutGoingQueue outgoingQueue)
throws AxisFault {
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java Sat Oct 20 19:04:07 2012
@@ -29,8 +29,8 @@ import org.apache.airavata.wsmg.config.W
import org.apache.airavata.wsmg.util.WsNotificationOperations;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* BrokerServiceMessageReceiverInOut message receiver
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
public class WSNotificationMsgReceiver extends AbstractBrokerMsgReceiver {
- private static final Log log = LogFactory.getLog(WSNotificationMsgReceiver.class);
+ private static final Logger log = LoggerFactory.getLogger(WSNotificationMsgReceiver.class);
WSNotificationProcessingContextBuilder builder = new WSNotificationProcessingContextBuilder();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java Sat Oct 20 19:04:07 2012
@@ -40,12 +40,12 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
import org.apache.axis2.context.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WSNotificationProcessingContextBuilder extends ProcessingContextBuilder {
- private static final Log logger = LogFactory.getLog(WSNotificationProcessingContextBuilder.class);
+ private static final Logger logger = LoggerFactory.getLogger(WSNotificationProcessingContextBuilder.class);
public ProcessingContext build(OMElement elem) {
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java Sat Oct 20 19:04:07 2012
@@ -50,11 +50,11 @@ import org.apache.airavata.wsmg.config.W
import org.apache.airavata.wsmg.util.Counter;
import org.apache.airavata.wsmg.util.TimerThread;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WsmgPersistantStorage implements WsmgStorage, WsmgQueue {
- private static final Log logger = LogFactory.getLog(WsmgPersistantStorage.class);
+ private static final Logger logger = LoggerFactory.getLogger(WsmgPersistantStorage.class);
/*
* Table name
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/util/OMElementComparator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/util/OMElementComparator.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/util/OMElementComparator.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/util/OMElementComparator.java Sat Oct 20 19:04:07 2012
@@ -32,8 +32,8 @@ import org.apache.airavata.wsmg.util.Bro
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Compare two OMElement with its namespace, attributes, children, and text. Current implementation supports ignore
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
*/
public class OMElementComparator {
- private static final Log log = LogFactory.getLog(OMElementComparator.class);
+ private static final Logger log = LoggerFactory.getLogger(OMElementComparator.class);
private static List<String> ignorableNamespaceList = new ArrayList<String>();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterInfo.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterInfo.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterInfo.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterInfo.java Sat Oct 20 19:04:07 2012
@@ -31,8 +31,8 @@ import org.apache.airavata.wsmg.broker.C
import org.apache.airavata.wsmg.broker.ConsumerListManager;
import org.apache.airavata.wsmg.broker.subscription.SubscriptionState;
import org.apache.airavata.wsmg.config.WSMGParameter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import edu.berkeley.cs.db.yfilter.filter.EXfilterBasic;
import edu.berkeley.cs.db.yfilter.filter.SystemGlobals;
@@ -41,7 +41,7 @@ import edu.berkeley.cs.db.yfilterplus.qu
import edu.berkeley.cs.db.yfilterplus.xmltree.XMLTree;
public class YFilterInfo {
- private static final Log logger = LogFactory.getLog(YFilterInfo.class);
+ private static final Logger logger = LoggerFactory.getLogger(YFilterInfo.class);
private EXfilterBasic yfilter = new EXfilterBasic();
private HashMap<Integer, String> yFilterIdToXPath = new HashMap<Integer, String>();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterMessageMatcher.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterMessageMatcher.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterMessageMatcher.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/XPath/YFilterMessageMatcher.java Sat Oct 20 19:04:07 2012
@@ -35,12 +35,12 @@ import org.apache.airavata.wsmg.commons.
import org.apache.airavata.wsmg.config.WSMGParameter;
import org.apache.airavata.wsmg.matching.AbstractMessageMatcher;
import org.apache.airavata.wsmg.messenger.OutGoingQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class YFilterMessageMatcher extends AbstractMessageMatcher {
- private static final Log logger = LogFactory.getLog(YFilterMessageMatcher.class);
+ private static final Logger logger = LoggerFactory.getLogger(YFilterMessageMatcher.class);
private OutGoingQueue outGoingQueue = null;
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/simpleTopic/DirectWsntMessageMatcher.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/simpleTopic/DirectWsntMessageMatcher.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/simpleTopic/DirectWsntMessageMatcher.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/matching/simpleTopic/DirectWsntMessageMatcher.java Sat Oct 20 19:04:07 2012
@@ -33,12 +33,12 @@ import org.apache.airavata.wsmg.broker.s
import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
import org.apache.airavata.wsmg.matching.AbstractMessageMatcher;
import org.apache.airavata.wsmg.messenger.OutGoingQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DirectWsntMessageMatcher extends AbstractMessageMatcher {
- private static final Log logger = LogFactory.getLog(DirectWsntMessageMatcher.class);
+ private static final Logger logger = LoggerFactory.getLogger(DirectWsntMessageMatcher.class);
private ConsumerListManager consumerListmanager = new ConsumerListManager();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/ConsumerUrlManager.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/ConsumerUrlManager.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/ConsumerUrlManager.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/ConsumerUrlManager.java Sat Oct 20 19:04:07 2012
@@ -34,12 +34,12 @@ import org.apache.airavata.wsmg.commons.
import org.apache.airavata.wsmg.util.RunTimeStatistics;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConsumerUrlManager {
- private static final Log logger = LogFactory.getLog(ConsumerUrlManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(ConsumerUrlManager.class);
private ConcurrentHashMap<String, FailedConsumerInfo> failedConsumerUrls = new ConcurrentHashMap<String, FailedConsumerInfo>();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/DeliveryProcessor.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/DeliveryProcessor.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/DeliveryProcessor.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/DeliveryProcessor.java Sat Oct 20 19:04:07 2012
@@ -23,12 +23,12 @@ package org.apache.airavata.wsmg.messeng
import org.apache.airavata.wsmg.commons.OutGoingMessage;
import org.apache.airavata.wsmg.config.WSMGParameter;
import org.apache.airavata.wsmg.messenger.strategy.SendingStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DeliveryProcessor {
- private static final Log logger = LogFactory.getLog(DeliveryProcessor.class);
+ private static final Logger logger = LoggerFactory.getLogger(DeliveryProcessor.class);
private SendingStrategy strategy;
private Deliverable deliverable;
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java Sat Oct 20 19:04:07 2012
@@ -25,12 +25,12 @@ import org.apache.airavata.wsmg.commons.
import org.apache.airavata.wsmg.config.WSMGParameter;
import org.apache.airavata.wsmg.util.Counter;
import org.apache.airavata.wsmg.util.TimerThread;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class OutGoingQueue {
- private static final Log logger = LogFactory.getLog(OutGoingQueue.class);
+ private static final Logger logger = LoggerFactory.getLogger(OutGoingQueue.class);
private Counter storeToOutQueueCounter;
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java Sat Oct 20 19:04:07 2012
@@ -36,15 +36,15 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* this class is not thread safe
* */
public class SenderUtils implements Deliverable {
- private static final Log logger = LogFactory.getLog(SenderUtils.class);
+ private static final Logger logger = LoggerFactory.getLogger(SenderUtils.class);
private static OMFactory factory = OMAbstractFactory.getOMFactory();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/impl/Axis2Protocol.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/impl/Axis2Protocol.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/impl/Axis2Protocol.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/impl/Axis2Protocol.java Sat Oct 20 19:04:07 2012
@@ -43,12 +43,12 @@ import org.apache.axis2.addressing.Endpo
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Axis2Protocol implements DeliveryProtocol {
- private static final Log logger = LogFactory.getLog(Axis2Protocol.class);
+ private static final Logger logger = LoggerFactory.getLogger(Axis2Protocol.class);
private static SOAPFactory soapfactory = OMAbstractFactory.getSOAP11Factory();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java Sat Oct 20 19:04:07 2012
@@ -28,12 +28,12 @@ import java.util.concurrent.LinkedBlocki
import org.apache.airavata.wsmg.commons.CommonRoutines;
import org.apache.airavata.wsmg.messenger.Deliverable;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class ConsumerHandler implements Runnable {
- private static final Log log = LogFactory.getLog(FixedParallelSender.class);
+ private static final Logger log = LoggerFactory.getLogger(FixedParallelSender.class);
protected LinkedBlockingQueue<LightweightMsg> queue = new LinkedBlockingQueue<LightweightMsg>();
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java Sat Oct 20 19:04:07 2012
@@ -33,12 +33,12 @@ import org.apache.airavata.wsmg.broker.C
import org.apache.airavata.wsmg.commons.OutGoingMessage;
import org.apache.airavata.wsmg.messenger.Deliverable;
import org.apache.airavata.wsmg.messenger.strategy.SendingStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FixedParallelSender implements SendingStrategy {
- private static final Log log = LogFactory.getLog(FixedParallelSender.class);
+ private static final Logger log = LoggerFactory.getLogger(FixedParallelSender.class);
private static final long TIME_TO_WAIT_FOR_SHUTDOWN_SECOND = 30;
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java Sat Oct 20 19:04:07 2012
@@ -32,8 +32,8 @@ import org.apache.airavata.wsmg.broker.C
import org.apache.airavata.wsmg.commons.OutGoingMessage;
import org.apache.airavata.wsmg.messenger.Deliverable;
import org.apache.airavata.wsmg.messenger.strategy.SendingStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Each subscriber (URL Endpoint) will have its own thread to send a message to
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
*/
public class ParallelSender implements SendingStrategy {
- private static final Log log = LogFactory.getLog(ParallelSender.class);
+ private static final Logger log = LoggerFactory.getLogger(ParallelSender.class);
private static final long TIME_TO_WAIT_FOR_SHUTDOWN_SECOND = 30;
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/SerialSender.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/SerialSender.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/SerialSender.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/SerialSender.java Sat Oct 20 19:04:07 2012
@@ -33,12 +33,12 @@ import org.apache.airavata.wsmg.commons.
import org.apache.airavata.wsmg.messenger.Deliverable;
import org.apache.airavata.wsmg.messenger.strategy.SendingStrategy;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SerialSender implements SendingStrategy {
- private static final Log log = LogFactory.getLog(SerialSender.class);
+ private static final Logger log = LoggerFactory.getLogger(SerialSender.class);
public void init() {
}
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java Sat Oct 20 19:04:07 2012
@@ -24,15 +24,15 @@ package org.apache.airavata.wsmg.perform
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.MessageBrokerClient;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Subscription {
private String subscriptionID;
private String topic;
- private static final Log logger = LogFactory.getLog(Subscription.class);
+ private final static Logger logger = LoggerFactory.getLogger(Subscription.class);
private ConsumerNotificationHandler handler;
private MessageBrokerClient client;
private EndpointReference messageBoxEPR;
Modified: airavata/trunk/modules/ws-messenger/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/pom.xml Sat Oct 20 19:04:07 2012
@@ -59,11 +59,11 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
- <!--dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
- </dependency-->
+ </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>