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 2011/10/06 00:31:53 UTC
svn commit: r1179464 - in
/incubator/airavata/trunk/modules/commons/workflow-tracking: ./
src/main/java/org/apache/airavata/commons/
src/main/java/org/apache/airavata/workflow/tracking/
src/main/java/org/apache/airavata/workflow/tracking/client/ src/ma...
Author: patanachai
Date: Wed Oct 5 22:31:52 2011
New Revision: 1179464
URL: http://svn.apache.org/viewvc?rev=1179464&view=rev
Log:
AIRAVATA-101 remove log4j
Modified:
incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/ProvenanceNotifierImpl.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/ConfigKeys.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/XmlBeanUtils.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/SubscriberThread.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxCreateThread.java
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml Wed Oct 5 22:31:52 2011
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>airavata-commons</artifactId>
- <groupId>airavata</groupId>
- <version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <artifactId>airavata-commons</artifactId>
+ <groupId>airavata</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>airavata</groupId>
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.5</version>
<executions>
<execution>
<id>add-source</id>
@@ -64,30 +64,30 @@
</executions>
<inherited>true</inherited>
<configuration>
- <schemaDirectory>schemas</schemaDirectory>
+ <schemaDirectory>schemas</schemaDirectory>
<outputJar>target/airavata-workflowtrackingtypes-${pom.version}.jar</outputJar>
<xmlConfigs>
<xmlConfig implementation="java.io.File">schemas/workflow_tracking_types.xsdconfig</xmlConfig>
</xmlConfigs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -107,35 +107,19 @@
<version>2.4.0</version>
<scope>compile</scope>
</dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java Wed Oct 5 22:31:52 2011
@@ -33,7 +33,8 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LeadContextHeader {
@@ -285,7 +286,7 @@ public class LeadContextHeader {
return lookupStringValue(NS, "OUTPUT_DATA_FILES_SUFFIX");
}
- private static final org.apache.log4j.Logger logger = Logger.getLogger(LeadContextHeader.class);
+ private static final Logger logger = LoggerFactory.getLogger(LeadContextHeader.class);
private static final OMFactory factory;
public static final String GFAC_NAMESPACE = "http://org.apache.airavata/namespaces/2004/01/gFac";
public static final QName TYPE;
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadCrosscutParametersUtil.java Wed Oct 5 22:31:52 2011
@@ -31,8 +31,9 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LeadCrosscutParametersUtil {
public LeadCrosscutParametersUtil(XmlObject xmlObjectToWrap) throws XMLStreamException {
@@ -279,7 +280,7 @@ public class LeadCrosscutParametersUtil
return Float.parseFloat(s);
}
- private static final org.apache.log4j.Logger logger = Logger.getLogger(LeadCrosscutParametersUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(LeadCrosscutParametersUtil.class);
public static final String FORECAST_TIME = "fcst_time";
public static final String START_DATE = "start_date";
public static final String START_HOUR = "start_hour";
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/XBeansUtil.java Wed Oct 5 22:31:52 2011
@@ -26,13 +26,14 @@ import java.io.StringReader;
import javax.xml.stream.XMLStreamException;
import org.apache.axiom.om.OMElement;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class XBeansUtil {
- org.apache.log4j.Logger logger = Logger.getLogger(XBeansUtil.class);
+ Logger logger = LoggerFactory.getLogger(XBeansUtil.class);
public XBeansUtil() {
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java Wed Oct 5 22:31:52 2011
@@ -39,13 +39,13 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.types.BaseNotificationType;
import org.apache.airavata.workflow.tracking.util.XmlBeanUtils;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractNotifier {
- protected static final Log log = LogFactory.getLog(AbstractNotifier.class.toString());
+ protected static final Logger log = LoggerFactory.getLogger(AbstractNotifier.class);
private Map<EndpointReference, NotificationPublisher> publishermap = new ConcurrentHashMap<EndpointReference, NotificationPublisher>();
protected Date activityTimestamp = null;
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java Wed Oct 5 22:31:52 2011
@@ -27,7 +27,6 @@ import java.util.Properties;
import org.apache.airavata.workflow.tracking.common.InvocationContext;
import org.apache.airavata.workflow.tracking.common.InvocationEntity;
import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext;
-import org.apache.axis2.addressing.EndpointReference;
/**
* Utility to create and send generic Lead notification messages. Common messages to send log, debug, information, and
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java Wed Oct 5 22:31:52 2011
@@ -24,7 +24,8 @@ package org.apache.airavata.workflow.tra
import org.apache.airavata.workflow.tracking.impl.GenericNotifierImpl;
import org.apache.airavata.workflow.tracking.impl.NotifierImpl;
import org.apache.airavata.workflow.tracking.impl.ProvenanceNotifierImpl;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Create a Notifier instance.
@@ -32,7 +33,7 @@ import org.apache.log4j.Logger;
* This code was inspired by the listener agent factory in xmessages
*/
public class NotifierFactory {
- private final static org.apache.log4j.Logger logger = Logger.getLogger(NotifierFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(NotifierFactory.class);
public static Notifier createNotifier() {
return new NotifierImpl();
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/LeadNotificationManager.java Wed Oct 5 22:31:52 2011
@@ -34,11 +34,12 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LeadNotificationManager {
- private final static org.apache.log4j.Logger logger = Logger.getLogger(LeadNotificationManager.class);
+ private final static Logger logger = LoggerFactory.getLogger(LeadNotificationManager.class);
/**
* THis API call could be used if the user created a Subscription in an earlier run and now the service is being
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/client/Subscription.java Wed Oct 5 22:31:52 2011
@@ -28,14 +28,16 @@ import org.apache.airavata.wsmg.client.C
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Subscription {
+ private static final Logger logger = LoggerFactory.getLogger(Subscription.class);
+
private String subscriptionID;
private String topic;
- private final static org.apache.log4j.Logger logger = Logger.getLogger(Subscription.class);
private Callback callback;
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java Wed Oct 5 22:31:52 2011
@@ -28,8 +28,14 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.common.InvocationEntity;
import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext;
import org.apache.airavata.workflow.tracking.impl.state.InvocationContextImpl;
-import org.apache.airavata.workflow.tracking.types.*;
-import org.apache.log4j.Logger;
+import org.apache.airavata.workflow.tracking.types.BaseNotificationType;
+import org.apache.airavata.workflow.tracking.types.LogDebugDocument;
+import org.apache.airavata.workflow.tracking.types.LogExceptionDocument;
+import org.apache.airavata.workflow.tracking.types.LogInfoDocument;
+import org.apache.airavata.workflow.tracking.types.LogWarningDocument;
+import org.apache.airavata.workflow.tracking.types.PublishURLDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DOES NOT SUPPORT MULTI_THREADING -- PUBLISHER QUEUE, DATA CONSUMED/PRODUCED BATCHING
@@ -41,7 +47,7 @@ public class GenericNotifierImpl extends
// private AnnotationProps globalAnnotations;
- protected static final org.apache.log4j.Logger logger = Logger.getLogger(GenericNotifierImpl.class);
+ protected static final Logger logger = LoggerFactory.getLogger(GenericNotifierImpl.class);
public GenericNotifierImpl() throws WorkflowTrackingException {
super();
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/ProvenanceNotifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/ProvenanceNotifierImpl.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/ProvenanceNotifierImpl.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/ProvenanceNotifierImpl.java Wed Oct 5 22:31:52 2011
@@ -37,7 +37,36 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.impl.state.DataObjImpl;
import org.apache.airavata.workflow.tracking.impl.state.InvocationContextImpl;
import org.apache.airavata.workflow.tracking.impl.state.InvocationEntityImpl;
-import org.apache.airavata.workflow.tracking.types.*;
+import org.apache.airavata.workflow.tracking.types.AcknowledgeFailureType;
+import org.apache.airavata.workflow.tracking.types.AcknowledgeSuccessType;
+import org.apache.airavata.workflow.tracking.types.BaseNotificationType;
+import org.apache.airavata.workflow.tracking.types.DataConsumedDocument;
+import org.apache.airavata.workflow.tracking.types.DataProducedDocument;
+import org.apache.airavata.workflow.tracking.types.DataProductNotificationType;
+import org.apache.airavata.workflow.tracking.types.DataProductType;
+import org.apache.airavata.workflow.tracking.types.FaultMessageType;
+import org.apache.airavata.workflow.tracking.types.FaultReceiverType;
+import org.apache.airavata.workflow.tracking.types.FaultResponderType;
+import org.apache.airavata.workflow.tracking.types.InvocationMessageType;
+import org.apache.airavata.workflow.tracking.types.InvokingServiceDocument;
+import org.apache.airavata.workflow.tracking.types.InvokingServiceFailedDocument;
+import org.apache.airavata.workflow.tracking.types.InvokingServiceSucceededDocument;
+import org.apache.airavata.workflow.tracking.types.ReceivedFaultDocument;
+import org.apache.airavata.workflow.tracking.types.ReceivedResultDocument;
+import org.apache.airavata.workflow.tracking.types.RequestInitiatorType;
+import org.apache.airavata.workflow.tracking.types.RequestReceiverType;
+import org.apache.airavata.workflow.tracking.types.ResultReceiverType;
+import org.apache.airavata.workflow.tracking.types.ResultResponderType;
+import org.apache.airavata.workflow.tracking.types.SendingFaultDocument;
+import org.apache.airavata.workflow.tracking.types.SendingResponseFailedDocument;
+import org.apache.airavata.workflow.tracking.types.SendingResponseSucceededDocument;
+import org.apache.airavata.workflow.tracking.types.SendingResultDocument;
+import org.apache.airavata.workflow.tracking.types.ServiceInitializedDocument;
+import org.apache.airavata.workflow.tracking.types.ServiceInvokedDocument;
+import org.apache.airavata.workflow.tracking.types.ServiceTerminatedDocument;
+import org.apache.airavata.workflow.tracking.types.WorkflowInitializedDocument;
+import org.apache.airavata.workflow.tracking.types.WorkflowInvokedDocument;
+import org.apache.airavata.workflow.tracking.types.WorkflowTerminatedDocument;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlString;
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/AbstractPublisher.java Wed Oct 5 22:31:52 2011
@@ -27,8 +27,9 @@ import java.util.concurrent.locks.Reentr
import org.apache.airavata.workflow.tracking.util.LinkedMessageQueue;
import org.apache.airavata.workflow.tracking.util.Timer;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract method to publish messages in sync or async mode. In async mode, the messages are kept in an in-memory queue
@@ -37,7 +38,7 @@ import org.apache.xmlbeans.XmlObject;
*/
public abstract class AbstractPublisher implements Runnable, NotificationPublisher {
- protected static final org.apache.log4j.Logger logger = Logger.getLogger(AbstractPublisher.class);
+ protected static final Logger logger = LoggerFactory.getLogger(AbstractPublisher.class);
protected static final boolean IS_LOG_FINEST = logger.isDebugEnabled();
private final LinkedMessageQueue<BrokerEntry> messageQueue;
protected static final boolean IS_TIMER = Boolean.getBoolean("ENABLE_TIMER");
@@ -190,10 +191,10 @@ public abstract class AbstractPublisher
if (deleted)
break;
else
- logger.fatal("Interrupted when queue size: " + messageQueue.size() + ". deleted == false", e);
+ logger.error("Interrupted when queue size: " + messageQueue.size() + ". deleted == false", e);
} catch (RuntimeException e) {
- logger.fatal("Runtime Error: " + e.getMessage());
+ logger.error("Runtime Error: " + e.getMessage());
if (logger.isDebugEnabled()) {
logger.debug("Runtime Error at message: "
+ (brokerEntry != null ? brokerEntry.getMessage() : "NULL") + "; queue size: "
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java Wed Oct 5 22:31:52 2011
@@ -23,7 +23,6 @@ package org.apache.airavata.workflow.tra
import java.io.IOException;
import java.io.StringReader;
-import java.net.URL;
import java.util.Properties;
import javax.xml.stream.XMLStreamException;
@@ -31,13 +30,13 @@ import javax.xml.stream.XMLStreamExcepti
import org.apache.airavata.commons.WorkFlowUtils;
import org.apache.airavata.workflow.tracking.WorkflowTrackingException;
import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext;
-import org.apache.airavata.workflow.tracking.util.ConfigKeys;
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Publish WS-Eventing messages using WS-Messenger client API
@@ -49,7 +48,7 @@ public class WSMPublisher extends Abstra
protected final EndpointReference brokerEpr;
protected Properties configs = new Properties();
- private Logger log = Logger.getLogger(WSMPublisher.class);
+ private Logger log = LoggerFactory.getLogger(WSMPublisher.class);
public WSMPublisher(WorkflowTrackingContext context) {
this(10, context.isEnableAsyncPublishing(), context.getBrokerEpr());
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java Wed Oct 5 22:31:52 2011
@@ -34,10 +34,11 @@ import org.apache.airavata.wsmg.client.W
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility for clients to subscribe and receive Lead notifications using new message schema. The agent implements the
@@ -48,7 +49,7 @@ import org.apache.xmlbeans.XmlObject;
*/
public class LeadNotificationHandler implements ConsumerNotificationHandler {
- private final static org.apache.log4j.Logger logger = Logger.getLogger(LeadNotificationHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(LeadNotificationHandler.class);
private String topic;
@@ -135,7 +136,7 @@ public class LeadNotificationHandler imp
xc.dispose();
} catch (XmlException e) {
- logger.fatal("error parsing message content: " + messageContent, e);
+ logger.error("error parsing message content: " + messageContent, e);
e.printStackTrace();
}
NotificationType type = MessageUtil.getType(messageObj);
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java Wed Oct 5 22:31:52 2011
@@ -38,14 +38,15 @@ import org.apache.airavata.wsmg.commons.
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageBoxNotificationHandler implements NotificationHandler {
- private final static org.apache.log4j.Logger logger = Logger.getLogger(MessageBoxNotificationHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(MessageBoxNotificationHandler.class);
private String messageBoxUrl;
@@ -61,12 +62,12 @@ public class MessageBoxNotificationHandl
public MessageBoxNotificationHandler(String messageBoxUrl, String brokerURL) {
if (messageBoxUrl == null || "".equals(messageBoxUrl)) {
- logger.fatal("Invalid messagebox Location :" + messageBoxUrl);
+ logger.error("Invalid messagebox Location :" + messageBoxUrl);
throw new WorkflowTrackingException("BrokerLocation should be not null messaboxUrl:" + messageBoxUrl);
}
if (brokerURL == null || "".equals(brokerURL)) {
- logger.fatal("Invalid broker Location :" + brokerURL);
+ logger.error("Invalid broker Location :" + brokerURL);
throw new WorkflowTrackingException("BrokerLocation should be not null brokerurl:" + brokerURL);
}
this.messageBoxUrl = messageBoxUrl;
@@ -84,7 +85,7 @@ public class MessageBoxNotificationHandl
xc.dispose();
} catch (XmlException e) {
- logger.fatal("error parsing message content: " + message, e);
+ logger.error("error parsing message content: " + message, e);
e.printStackTrace();
}
NotificationType type = MessageUtil.getType(messageObj);
@@ -113,7 +114,7 @@ public class MessageBoxNotificationHandl
} catch (MsgBrokerClientException e) {
- logger.fatal("unable to unsubscribe", e);
+ logger.error("unable to unsubscribe", e);
e.printStackTrace();
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/ConfigKeys.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/ConfigKeys.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/ConfigKeys.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/ConfigKeys.java Wed Oct 5 22:31:52 2011
@@ -22,6 +22,6 @@
package org.apache.airavata.workflow.tracking.util;
public class ConfigKeys {
- public final static String CONFIG_FILE_NAME = "workflow_tracking.properties";
- public final static String AXIS2_REPOSITORY = "axis2.repository";
+ public static final String CONFIG_FILE_NAME = "workflow_tracking.properties";
+ public static final String AXIS2_REPOSITORY = "axis2.repository";
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/Timer.java Wed Oct 5 22:31:52 2011
@@ -21,14 +21,15 @@
package org.apache.airavata.workflow.tracking.util;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* calculates simple timing information for instrumenting code
*/
public class Timer {
- private static final org.apache.log4j.Logger logger = Logger.getLogger(Timer.class);
+ private static final Logger logger = LoggerFactory.getLogger(Timer.class);
private long start, end, total = 0, deltaStart, delta = 0;
private final String msg;
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/XmlBeanUtils.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/XmlBeanUtils.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/XmlBeanUtils.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/XmlBeanUtils.java Wed Oct 5 22:31:52 2011
@@ -26,31 +26,10 @@ import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
public class XmlBeanUtils {
- // public static void addNameValuePair(XmlObject parent, QName name, Object value)
- // throws WorkflowTrackingException {
- // XmlCursor c = parent.newCursor();
- // // TODO may be we need to check we are not moving in to a namespace or a
- // // attribute.
- // c.toNextToken();
- // XmlBeanUtils.addNameValuePair(c, name, value);
- // c.dispose();
- // }
- //
- //
- // public static void createAFragment(QName name, Properties nameValuePairs)
- // throws WorkflowTrackingException {
- // XmlCursor c = XmlObject.Factory.newInstance();
- // c.beginElement(name);
- // for(String key: nameValuePairs.keySet()){
- // XmlBeanUtils.addNameValuePair(c, new QName(key), nameValuePairs.get(key));
- // }
- // c.dispose();
- // }
+
public static BaseNotificationType extractBaseNotificationType(XmlObject xmldata) {
XmlCursor c = xmldata.newCursor();
c.toNextToken();
-
- // System.out.println(c.getObject().getClass());
BaseNotificationType type = (BaseNotificationType) c.getObject();
c.dispose();
return type;
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java Wed Oct 5 22:31:52 2011
@@ -36,16 +36,18 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.tool.XSTCTester.TestCase;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessagePullerTest extends TestCase {
+ private static final Logger logger = LoggerFactory.getLogger(MessagePullerTest.class);
static Properties configs = new Properties();
String BROKER_URL;
String MESSAGEBOX_URL;
@@ -55,7 +57,7 @@ public class MessagePullerTest extends T
public static int count = 0;
public int messages = 10;
public static Object mutex = new Object();
- private org.apache.log4j.Logger logger = Logger.getLogger(MessagePullerTest.class);
+
Subscription sub;
String AXIS_REPO;
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java Wed Oct 5 22:31:52 2011
@@ -31,12 +31,18 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.tests.util.TestConfigKeys;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMElement;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.impl.tool.XSTCTester.TestCase;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MultipleSubscriptionForMessageBoxTest extends TestCase implements ThreadMessagePassingCallback {
+ private static final Logger logger = LoggerFactory.getLogger(MultipleSubscriptionForMessageBoxTest.class);
static Properties configs = new Properties();
String BROKER_URL;
String MESSAGEBOX_URL;
@@ -44,7 +50,6 @@ public class MultipleSubscriptionForMess
public static final String TEST_TOPIC = "3a9c7b20-0475-11db-ba88-b61b57d3be03";
public static final int NOTIFICATIONS_PUBLISHED = 10;
public static final int NUMBER_OF_SUBSCRIBERS = 1;
- private org.apache.log4j.Logger logger = Logger.getLogger(MultipleSubscriptionForMessageBoxTest.class);
@BeforeClass
public static void setUpBeforeClass() throws Exception {
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/SubscriberThread.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/SubscriberThread.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/SubscriberThread.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/SubscriberThread.java Wed Oct 5 22:31:52 2011
@@ -28,11 +28,13 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
import org.apache.airavata.workflow.tracking.tests.ThreadMessagePassingCallback;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SubscriberThread extends Thread {
+ private static final Logger logger = LoggerFactory.getLogger(SubscriberThread.class);
private ThreadMessagePassingCallback callback;
private int subCount = 0;
@@ -41,7 +43,6 @@ public class SubscriberThread extends Th
private String topic;
private String messageboxUrl;
private String msgBoxId;
- private org.apache.log4j.Logger logger = Logger.getLogger(SubscriberThread.class);
public SubscriberThread(String messageboxUrl, String brokerURL, String topic,
ThreadMessagePassingCallback callback, String msgBoxId) {
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java Wed Oct 5 22:31:52 2011
@@ -35,13 +35,19 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.tool.XSTCTester.TestCase;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageBoxClientRestartTest extends TestCase {
+ private static final Logger logger = LoggerFactory.getLogger(MessageBoxClientRestartTest.class);
private static final String TOPIC = "RestartclientTopic2";
private boolean wait = true;
static Properties configs = new Properties();
@@ -50,7 +56,6 @@ public class MessageBoxClientRestartTest
int consumerPort;
public static final int NOTIFICATIONS_PUBLISHED = 4;
public static final int NUMBER_OF_SUBSCRIBERS = 4;
- private org.apache.log4j.Logger logger = Logger.getLogger(MessageBoxClientRestartTest.class);
@BeforeClass
public static void setUpBeforeClass() throws Exception {
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxCreateThread.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxCreateThread.java?rev=1179464&r1=1179463&r2=1179464&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxCreateThread.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxCreateThread.java Wed Oct 5 22:31:52 2011
@@ -26,15 +26,17 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageBoxCreateThread extends Thread {
+
+ private static final Logger logger = LoggerFactory.getLogger(MessageBoxCreateThread.class);
private String brokerLocation;
private String messageboxLocation;
private String topic;
private Subscription subscription;
- private org.apache.log4j.Logger logger = Logger.getLogger(MessageBoxCreateThread.class);
public MessageBoxCreateThread(String brokerLocation, String messageboxLocation, String topic) {
super();