svn commit: r1400501 [2/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...

[pa...@apache.org]

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java Sat Oct 20 19:04:07 2012
@@ -43,15 +43,15 @@ import org.apache.airavata.schemas.gfac.
 import org.apache.airavata.schemas.gfac.GlobusHostType;
 import org.apache.airavata.schemas.gfac.HostDescriptionType;
 import org.ietf.jgss.GSSCredential;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Input plugin to transfer file from GridFTP host to target GridFTP host
  */
 public class GridFtpInputStaging extends PreExecuteChain {
 
-    private static final Log log = LogFactory.getLog(GridFtpInputStaging.class);
+    public static final Logger log = LoggerFactory.getLogger(GridFtpInputStaging.class);
 
     public static final String MYPROXY_SECURITY_CONTEXT = "myproxy";
 

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java Sat Oct 20 19:04:07 2012
@@ -47,15 +47,15 @@ import org.apache.airavata.schemas.gfac.
 import org.apache.airavata.schemas.gfac.GlobusHostType;
 import org.apache.airavata.schemas.gfac.HostDescriptionType;
 import org.ietf.jgss.GSSCredential;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Input plugin to transfer file from Http location to target GridFTP host
  */
 public class HttpInputStaging extends PreExecuteChain {
 
-    private static final Log log = LogFactory.getLog(HttpInputStaging.class);
+    public static final Logger log = LoggerFactory.getLogger(HttpInputStaging.class);
 
     public static final String MYPROXY_SECURITY_CONTEXT = "myproxy";
 

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java Sat Oct 20 19:04:07 2012
@@ -54,15 +54,15 @@ import org.globus.ftp.exception.ClientEx
 import org.globus.ftp.exception.ServerException;
 import org.globus.gsi.gssapi.auth.HostAuthorization;
 import org.ietf.jgss.GSSCredential;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * GridFTP tools
  */
 public class GridFtp {
 
-    private static final Log log = LogFactory.getLog(GridFtp.class);
+    public static final Logger log = LoggerFactory.getLogger(GridFtp.class);
 
     public static final String GSIFTP_SCHEME = "gsiftp";
     public static final String HOST = "host";

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/AbstractServiceFactory.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/AbstractServiceFactory.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/AbstractServiceFactory.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/AbstractServiceFactory.java Sat Oct 20 19:04:07 2012
@@ -23,8 +23,8 @@ package org.apache.airavata.core.gfac.fa
 
 import org.apache.airavata.core.gfac.exception.GfacException;
 import org.apache.airavata.core.gfac.services.GenericService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Abstract Factory to create a generic service
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
  */
 public abstract class AbstractServiceFactory {
 
-    private static final Log log = LogFactory.getLog(AbstractServiceFactory.class);
+    protected final Logger log = LoggerFactory.getLogger(AbstractServiceFactory.class);
 
     /**
      * Create and initialize a generic service

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java Sat Oct 20 19:04:07 2012
@@ -27,8 +27,8 @@ import java.util.List;
 import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
 import org.apache.airavata.core.gfac.notification.GFacNotifiable;
 import org.apache.airavata.core.gfac.notification.GFacNotifier;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The default notifier which uses {@link ArrayList} to store
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  */
 public class DefaultNotifier implements GFacNotifier {
 
-    private static final Log logger = LogFactory.getLog(DefaultNotifier.class);
+    private static final Logger logger = LoggerFactory.getLogger(DefaultNotifier.class);
 
     private List<GFacNotifiable> notifiableObjects = new ArrayList<GFacNotifiable>();
 

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java Sat Oct 20 19:04:07 2012
@@ -23,8 +23,8 @@ package org.apache.airavata.core.gfac.no
 import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
 import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
 import org.apache.airavata.core.gfac.notification.GFacNotifiable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * {@link org.apache.airavata.core.gfac.notification.GFacNotifiable} object as a SLF4J logger. Log out all the message
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
  */
 public class LoggingNotification implements GFacNotifiable {
 
-    private static final Log log = LogFactory.getLog(LoggingNotification.class+
+    protected final Logger log = LoggerFactory.getLogger(LoggingNotification.class+
             "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
 
     public void startSchedule(InvocationContext context) {

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java Sat Oct 20 19:04:07 2012
@@ -27,8 +27,8 @@ import org.apache.airavata.common.workfl
 import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
 import org.apache.airavata.core.gfac.exception.*;
 import org.apache.airavata.core.gfac.notification.GFacNotifier;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * AbstractProvider wraps up steps of execution for Provider. <br/>
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
  * - retrieveOutput <br/>
  */
 public abstract class AbstractProvider implements Provider {
-    protected final Log log = LogFactory.getLog(this.getClass() +
+    protected final Logger log = LoggerFactory.getLogger(this.getClass() +
             "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
     public void initialize(InvocationContext invocationContext) throws ProviderException {
         /*

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java Sat Oct 20 19:04:07 2012
@@ -39,14 +39,14 @@ import org.apache.airavata.schemas.gfac.
 import org.apache.airavata.schemas.gfac.URIArrayType;
 import org.apache.airavata.schemas.wec.ContextHeaderDocument;
 import org.globus.gram.GramAttributes;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utilities for generating GRAM RSL
  */
 public class GramRSLGenerator {
-    private static final Log log = LogFactory.getLog(GramRSLGenerator.class);
+    protected static final Logger log = LoggerFactory.getLogger(GramRSLGenerator.class);
 
     private enum JobType {
         SERIAL, SINGLE, MPI, MULTIPLE, CONDOR

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/InputStreamToFileWriter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/InputStreamToFileWriter.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/InputStreamToFileWriter.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/InputStreamToFileWriter.java Sat Oct 20 19:04:07 2012
@@ -21,13 +21,13 @@
 
 package org.apache.airavata.core.gfac.provider.utils;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 
 public class InputStreamToFileWriter extends Thread {
-    private static final Log log = LogFactory.getLog(InputStreamToFileWriter.class);
+    protected final Logger log = LoggerFactory.getLogger(this.getClass());
 
     private BufferedReader in;
     private BufferedWriter out;

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java Sat Oct 20 19:04:07 2012
@@ -29,8 +29,8 @@ import org.globus.gram.GramJob;
 import org.globus.gram.GramJobListener;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Gram job listener to check for status changed in job submission
@@ -47,7 +47,7 @@ public class JobSubmissionListener imple
     private int status;
     private InvocationContext context;
     private GramJob job;
-    private static final Log log = LogFactory.getLog(JobSubmissionListener.class);
+    private final Logger log = LoggerFactory.getLogger(JobSubmissionListener.class);
 
     public JobSubmissionListener(GramJob job, InvocationContext context) {
         this.job = job;

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java Sat Oct 20 19:04:07 2012
@@ -48,15 +48,15 @@ import org.apache.airavata.schemas.wec.C
 import org.apache.airavata.schemas.wec.SecurityContextDocument;
 import org.apache.axiom.om.OMElement;
 import org.apache.xmlbeans.XmlException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class selects {@link Provider} based on information in {@link AiravataRegistry2}
  */
 public class SchedulerImpl implements Scheduler {
 
-    private static final Log log = LogFactory.getLog(SchedulerImpl.class+
+    private static Logger log = LoggerFactory.getLogger(SchedulerImpl.class+
             "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
 
     public Provider schedule(InvocationContext context) throws SchedulerException {

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java Sat Oct 20 19:04:07 2012
@@ -35,8 +35,8 @@ import org.apache.airavata.core.gfac.ext
 import org.apache.airavata.core.gfac.provider.Provider;
 import org.apache.airavata.core.gfac.scheduler.Scheduler;
 import org.apache.airavata.core.gfac.services.GenericService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The abstract service wraps up steps of execution for {@link GenericService}. Also, it adds input/output plug-ins
@@ -55,7 +55,7 @@ import org.apache.commons.logging.LogFac
  */
 public abstract class AbstractSimpleService implements GenericService {
 
-    private static final Log log = LogFactory.getLog(AbstractSimpleService.class);
+    private static Logger log = LoggerFactory.getLogger(AbstractSimpleService.class);
 
     public abstract void preProcess(InvocationContext context) throws ServiceException;
 

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Sat Oct 20 19:04:07 2012
@@ -45,8 +45,8 @@ import org.apache.airavata.registry.api.
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This generic service implementation will load Registry service and Data Catalog from property file using (Apache
@@ -57,7 +57,7 @@ public class PropertiesBasedServiceImpl 
 
     public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
 
-    private static final Log log = LogFactory.getLog(PropertiesBasedServiceImpl.class+
+    private static Logger log = LoggerFactory.getLogger(PropertiesBasedServiceImpl.class+
             "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
 
     /*

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java Sat Oct 20 19:04:07 2012
@@ -38,11 +38,11 @@ import java.util.UUID;
 import org.apache.airavata.commons.gfac.type.ActualParameter;
 import org.apache.airavata.schemas.gfac.*;
 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 GfacUtils {
-    private static final Log log = LogFactory.getLog(GfacUtils.class);
+    private final static Logger log = LoggerFactory.getLogger(GfacUtils.class);
 
     private GfacUtils() {
     }

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GridFTPContactInfo.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GridFTPContactInfo.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GridFTPContactInfo.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GridFTPContactInfo.java Sat Oct 20 19:04:07 2012
@@ -21,15 +21,15 @@
 
 package org.apache.airavata.core.gfac.utils;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class represents GridFTP Endpoint
  * 
  */
 public class GridFTPContactInfo {
-    private static final Log log = LogFactory.getLog(GridFTPContactInfo.class);
+    protected final static Logger log = LoggerFactory.getLogger(GridFTPContactInfo.class);
     public String hostName;
     public int port;
 

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/LogUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/LogUtils.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/LogUtils.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/LogUtils.java Sat Oct 20 19:04:07 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.core.gfac.ut
 import java.util.Enumeration;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 public class LogUtils {
 
@@ -38,7 +38,7 @@ public class LogUtils {
      * @param log
      * @param prop
      */
-    public static void displayProperties(Log log, Properties prop) {
+    public static void displayProperties(Logger log, Properties prop) {
         Enumeration em = prop.keys();
         while (em.hasMoreElements()) {
             String key = em.nextElement().toString();

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml Sat Oct 20 19:04:07 2012
@@ -25,8 +25,8 @@
 
     <dependencies>
         <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
@@ -45,6 +45,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-registry-api</artifactId>
             <version>${project.version}</version>

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java Sat Oct 20 19:04:07 2012
@@ -23,8 +23,8 @@ package org.apache.airavata.persistance.
 import org.apache.airavata.persistance.registry.jpa.model.*;
 import org.apache.airavata.persistance.registry.jpa.resources.*;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.*;
 import java.util.ArrayList;
@@ -35,7 +35,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 public class ResourceUtils {
-    private static final Log logger = LogFactory.getLog(ResourceUtils.class);
+    private final static Logger logger = LoggerFactory.getLogger(ResourceUtils.class);
     private static final String PERSISTENCE_UNIT_NAME = "airavata_data";
     protected static EntityManagerFactory factory;
 

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Sat Oct 20 19:04:07 2012
@@ -72,11 +72,11 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
 import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
 import org.apache.xmlbeans.XmlException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AiravataJPARegistry extends AiravataRegistry2{
-    private static final Log logger = LogFactory.getLog(AiravataJPARegistry.class);
+    private final static Logger logger = LoggerFactory.getLogger(AiravataJPARegistry.class);
     private JPAResourceAccessor jpa;
     private boolean active=false;
     private static final String DEFAULT_PROJECT_NAME = "default";

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java Sat Oct 20 19:04:07 2012
@@ -5,8 +5,8 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.AiravataUser;
 import org.apache.airavata.registry.api.Gateway;
 import org.apache.airavata.registry.api.exception.UnknownRegistryConnectionDataException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.URL;
@@ -14,7 +14,7 @@ import java.util.Properties;
 
 public class AiravataRegistryConnectionDataProviderImpl implements AiravataRegistryConnectionDataProvider {
 
-    private static final Log logger = LogFactory.getLog(AiravataRegistryConnectionDataProviderImpl.class);
+    private final static Logger logger = LoggerFactory.getLogger(AiravataRegistryConnectionDataProviderImpl.class);
     public static Properties loadProperties(){
         URL resource = Utils.class.getClassLoader().getResource("airavata-server.properties");
         Properties properties = new Properties();

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java Sat Oct 20 19:04:07 2012
@@ -25,8 +25,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
 import org.apache.airavata.persistance.registry.jpa.model.*;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -34,7 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ApplicationDescriptorResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(ApplicationDescriptorResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(ApplicationDescriptorResource.class);
     private String name;
     private String gatewayName;
     private String updatedUser;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java Sat Oct 20 19:04:07 2012
@@ -34,11 +34,11 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.Configuration;
 import org.apache.airavata.persistance.registry.jpa.model.Configuration_PK;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ConfigurationResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(ConfigurationResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(ConfigurationResource.class);
     private String configKey;
     private String configVal;
     private Date expireDate;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java Sat Oct 20 19:04:07 2012
@@ -28,8 +28,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.Experiment_Metadata;
 import org.apache.airavata.persistance.registry.jpa.model.Workflow_Data;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -38,7 +38,7 @@ import java.util.List;
 
 public class ExperimentDataResource extends AbstractResource{
 
-    private static final Log logger = LogFactory.getLog(ExperimentDataResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(ExperimentDataResource.class);
     private String experimentID;
     private String expName;
     private String userName;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java Sat Oct 20 19:04:07 2012
@@ -25,8 +25,8 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
 import org.apache.airavata.registry.api.workflow.*;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.*;
 import java.text.DateFormat;
@@ -36,7 +36,7 @@ import java.util.*;
 import java.util.Date;
 
 public class ExperimentDataRetriever {
-    private static final Log logger = LogFactory.getLog(ExperimentDataRetriever.class);
+    private static final Logger logger = LoggerFactory.getLogger(ExperimentDataRetriever.class);
 
     public ExperimentData getExperiment(String experimentId){
         String connectionURL =  Utils.getJDBCURL();

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java Sat Oct 20 19:04:07 2012
@@ -4,14 +4,14 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.ResourceType;
 import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
 import org.apache.airavata.persistance.registry.jpa.model.Experiment_Metadata;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import java.util.List;
 
 public class ExperimentMetadataResource extends AbstractResource{
-    private static final Log logger = LogFactory.getLog(ExperimentMetadataResource.class);
+    private static final Logger logger = LoggerFactory.getLogger(ExperimentMetadataResource.class);
     private String expID;
     private String metadata;
 

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java Sat Oct 20 19:04:07 2012
@@ -36,11 +36,11 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.Project;
 import org.apache.airavata.persistance.registry.jpa.model.Users;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExperimentResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(ExperimentResource.class);
+    private static final Logger logger = LoggerFactory.getLogger(ExperimentResource.class);
     private WorkerResource worker;
     private String expID;
     private Date submittedDate;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java Sat Oct 20 19:04:07 2012
@@ -31,11 +31,11 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
 import org.apache.airavata.persistance.registry.jpa.model.*;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GatewayResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(GatewayResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(GatewayResource.class);
     private String gatewayName;
     private String owner;
 

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java Sat Oct 20 19:04:07 2012
@@ -29,14 +29,14 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.Gram_DataPK;
 import org.apache.airavata.persistance.registry.jpa.model.Node_Data;
 import org.apache.airavata.persistance.registry.jpa.model.Workflow_Data;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import java.util.List;
 
 public class GramDataResource extends AbstractResource{
-    private static final Log logger = LogFactory.getLog(GramDataResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(GramDataResource.class);
     private WorkflowDataResource workflowDataResource;
     private String nodeID;
     private String rsl;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java Sat Oct 20 19:04:07 2012
@@ -25,8 +25,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
 import org.apache.airavata.persistance.registry.jpa.model.*;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -37,7 +37,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class HostDescriptorResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(HostDescriptorResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(HostDescriptorResource.class);
     private String hostDescName;
     private String gatewayName;
     private String userName;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java Sat Oct 20 19:04:07 2012
@@ -28,15 +28,15 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.Node_Data;
 import org.apache.airavata.persistance.registry.jpa.model.Node_DataPK;
 import org.apache.airavata.persistance.registry.jpa.model.Workflow_Data;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import java.sql.Timestamp;
 import java.util.List;
 
 public class NodeDataResource extends AbstractResource{
-    private static final Log logger = LogFactory.getLog(NodeDataResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(NodeDataResource.class);
     private WorkflowDataResource workflowDataResource;
     private String nodeID;
     private String nodeType;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java Sat Oct 20 19:04:07 2012
@@ -34,11 +34,11 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.Project;
 import org.apache.airavata.persistance.registry.jpa.model.Users;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ProjectResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(ProjectResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(ProjectResource.class);
     private String name;
     private GatewayResource gateway;
     private WorkerResource worker;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java Sat Oct 20 19:04:07 2012
@@ -28,8 +28,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.Published_Workflow_PK;
 import org.apache.airavata.persistance.registry.jpa.model.Users;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PublishWorkflowResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(PublishWorkflowResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(PublishWorkflowResource.class);
     private String name;
     private String version;
     private Date publishedDate;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java Sat Oct 20 19:04:07 2012
@@ -25,8 +25,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
 import org.apache.airavata.persistance.registry.jpa.model.*;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -34,7 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ServiceDescriptorResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(ServiceDescriptorResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(ServiceDescriptorResource.class);
     private String serviceDescName;
     private String gatewayName;
     private String userName;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java Sat Oct 20 19:04:07 2012
@@ -26,13 +26,13 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.ResourceType;
 import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
 import org.apache.airavata.persistance.registry.jpa.model.Users;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 
 public class UserResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(UserResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(UserResource.class);
     private String userName;
     private String password;
     private String gatewayName;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java Sat Oct 20 19:04:07 2012
@@ -28,8 +28,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.User_Workflow_PK;
 import org.apache.airavata.persistance.registry.jpa.model.Users;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -39,7 +39,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class UserWorkflowResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(UserWorkflowResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(UserWorkflowResource.class);
     private GatewayResource gateway;
     private WorkerResource worker;
     private String name;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java Sat Oct 20 19:04:07 2012
@@ -47,12 +47,12 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.registry.api.AiravataRegistryConnectionDataProvider;
 import org.apache.airavata.registry.api.AiravataRegistryFactory;
 import org.apache.airavata.registry.api.exception.UnknownRegistryConnectionDataException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class Utils {
-    private static final Log logger = LogFactory.getLog(Utils.class);
+    private final static Logger logger = LoggerFactory.getLogger(Utils.class);
 
     public static Properties loadProperties(){
         URL resource = Utils.class.getClassLoader().getResource("airavata-server.properties");

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java Sat Oct 20 19:04:07 2012
@@ -33,11 +33,11 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.*;
 import org.apache.airavata.persistance.registry.jpa.resources.AbstractResource.WorkflowDataConstants;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WorkerResource extends AbstractResource {
-    private static final Log logger = LogFactory.getLog(WorkerResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(WorkerResource.class);
     private String user;
 	private GatewayResource gateway;
 

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java Sat Oct 20 19:04:07 2012
@@ -29,8 +29,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.model.Node_Data;
 import org.apache.airavata.persistance.registry.jpa.model.Workflow_Data;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -39,7 +39,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class WorkflowDataResource extends AbstractResource{
-    private static final Log logger = LogFactory.getLog(WorkflowDataResource.class);
+    private final static Logger logger = LoggerFactory.getLogger(WorkflowDataResource.class);
     public static final String NODE_DATA = "Node_Data";
     public static final String GRAM_DATA = "Gram_Data";
     private String experimentID;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java Sat Oct 20 19:04:07 2012
@@ -27,8 +27,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
 import org.apache.airavata.persistance.registry.jpa.resources.Utils;
 import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.derby.drda.NetworkServerControl;
 
 import java.io.BufferedReader;
@@ -42,7 +42,7 @@ import java.util.Properties;
 import java.util.StringTokenizer;
 
 public class Initialize {
-    private static final Log logger = LogFactory.getLog(Initialize.class);
+    private static final Logger logger = LoggerFactory.getLogger(Initialize.class);
     public static final String GATEWAY_ID = "gateway.id";
     public static final String REGISTRY_USER = "registry.user";
     public static final String REGISTRY_PASSWORD = "registry.password";

Modified: airavata/trunk/modules/registry/airavata-registry-service/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/pom.xml (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/pom.xml Sat Oct 20 19:04:07 2012
@@ -44,8 +44,20 @@
             <version>1.2.8</version>
         </dependency>
         <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${org.slf4j.version}</version>
+            <scope>runtime</scope>
         </dependency>
 	   <dependency>
             <groupId>org.apache.airavata</groupId>

Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java Sat Oct 20 19:04:07 2012
@@ -31,8 +31,8 @@ import org.apache.axis2.context.Configur
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.ServiceLifeCycle;
 import org.apache.derby.drda.NetworkServerControl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -42,7 +42,7 @@ import java.sql.SQLException;
 import java.util.Properties;
 
 public class RegistryService implements ServiceLifeCycle {
-    private static final Log logger = LogFactory.getLog(RegistryService.class);
+    private static final Logger logger = LoggerFactory.getLogger(RegistryService.class);
 
     public static final String PERSISTANT_DATA = "Configuration";
     public static final String GATEWAY_ID = "gateway.id";

Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java Sat Oct 20 19:04:07 2012
@@ -40,8 +40,8 @@ package org.apache.airavata.registry.ser
  *
  */
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -57,7 +57,7 @@ import java.util.concurrent.Semaphore;
  * 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/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/DatabaseCreator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/DatabaseCreator.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/DatabaseCreator.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/DatabaseCreator.java Sat Oct 20 19:04:07 2012
@@ -32,8 +32,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
@@ -58,7 +58,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/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/JdbcStorage.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/JdbcStorage.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/JdbcStorage.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/JdbcStorage.java Sat Oct 20 19:04:07 2012
@@ -25,11 +25,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/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java Sat Oct 20 19:04:07 2012
@@ -27,8 +27,8 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.resources.Utils;
 import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
 import org.apache.derby.drda.NetworkServerControl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -41,7 +41,7 @@ import java.util.Properties;
 import java.util.StringTokenizer;
 
 public class Initialize {
-    private static final Log logger = LogFactory.getLog(Initialize.class);
+    private static final Logger logger = LoggerFactory.getLogger(Initialize.class);
     public static final String GATEWAY_ID = "gateway.id";
     public static final String REGISTRY_USER = "registry.user";
     public static final String REGISTRY_PASSWORD = "registry.password";

Modified: airavata/trunk/modules/registry/registry-api/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/pom.xml (original)
+++ airavata/trunk/modules/registry/registry-api/pom.xml Sat Oct 20 19:04:07 2012
@@ -30,6 +30,10 @@
             <version>${jcr.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
@@ -51,8 +55,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java Sat Oct 20 19:04:07 2012
@@ -36,11 +36,11 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.RegistryAccessorInvalidException;
 import org.apache.airavata.registry.api.exception.RegistryAccessorNotFoundException;
 import org.apache.airavata.registry.api.exception.RegistryAccessorUndefinedException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RegistryUtils {
-    private static final Log log = LogFactory.getLog(RegistryUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(RegistryUtils.class);
 
     public static final String GATEWAY_ID = "gateway.id";
 

Modified: airavata/trunk/modules/test-suite/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/pom.xml (original)
+++ airavata/trunk/modules/test-suite/pom.xml Sat Oct 20 19:04:07 2012
@@ -65,12 +65,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>
 
         <!-- GFAC schemas -->
@@ -118,6 +114,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java Sat Oct 20 19:04:07 2012
@@ -42,12 +42,12 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MessagePullerTest extends TestCase {
 
-    private static final Log logger = LogFactory.getLog(MessagePullerTest.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessagePullerTest.class);
     static Properties configs = new Properties();
     String BROKER_URL;
     String MESSAGEBOX_URL;

Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MultipleSubscriptionForMessageBoxTest.java Sat Oct 20 19:04:07 2012
@@ -37,12 +37,12 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MultipleSubscriptionForMessageBoxTest extends TestCase implements ThreadMessagePassingCallback {
 
-    private static final Log logger = LogFactory.getLog(MultipleSubscriptionForMessageBoxTest.class);
+    private static final Logger logger = LoggerFactory.getLogger(MultipleSubscriptionForMessageBoxTest.class);
     static Properties configs = new Properties();
     String BROKER_URL;
     String MESSAGEBOX_URL;

Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java Sat Oct 20 19:04:07 2012
@@ -29,12 +29,12 @@ import org.apache.airavata.workflow.trac
 import org.apache.airavata.workflow.tracking.client.Subscription;
 import org.apache.airavata.test.suite.workflowtracking.tests.ThreadMessagePassingCallback;
 import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SubscriberThread extends Thread {
 
-    private static final Log logger = LogFactory.getLog(SubscriberThread.class);
+    private static final Logger logger = LoggerFactory.getLogger(SubscriberThread.class);
     private ThreadMessagePassingCallback callback;
 
     private int subCount = 0;

Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java Sat Oct 20 19:04:07 2012
@@ -42,12 +42,12 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MessageBoxClientRestartTest extends TestCase {
 
-    private static final Log logger = LogFactory.getLog(MessageBoxClientRestartTest.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageBoxClientRestartTest.class);
     private static final String TOPIC = "RestartclientTopic2";
     private boolean wait = true;
     static Properties configs = new Properties();

Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxCreateThread.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxCreateThread.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxCreateThread.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxCreateThread.java Sat Oct 20 19:04:07 2012
@@ -27,12 +27,12 @@ import org.apache.airavata.workflow.trac
 import org.apache.airavata.workflow.tracking.client.Subscription;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MessageBoxCreateThread extends Thread {
 
-    private static final Log logger = LogFactory.getLog(MessageBoxCreateThread.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageBoxCreateThread.class);
     private String brokerLocation;
     private String messageboxLocation;
     private String topic;

Modified: airavata/trunk/modules/workflow-interpreter/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-interpreter/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-interpreter/pom.xml (original)
+++ airavata/trunk/modules/workflow-interpreter/pom.xml Sat Oct 20 19:04:07 2012
@@ -92,5 +92,40 @@
                 </includes>
             </resource>
         </resources>
+        <pluginManagement>
+        	<plugins>
+        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        		<plugin>
+        			<groupId>org.eclipse.m2e</groupId>
+        			<artifactId>lifecycle-mapping</artifactId>
+        			<version>1.0.0</version>
+        			<configuration>
+        				<lifecycleMappingMetadata>
+        					<pluginExecutions>
+        						<pluginExecution>
+        							<pluginExecutionFilter>
+        								<groupId>
+        									org.apache.axis2
+        								</groupId>
+        								<artifactId>
+        									axis2-wsdl2code-maven-plugin
+        								</artifactId>
+        								<versionRange>
+        									[1.5.1,)
+        								</versionRange>
+        								<goals>
+        									<goal>wsdl2code</goal>
+        								</goals>
+        							</pluginExecutionFilter>
+        							<action>
+        								<ignore></ignore>
+        							</action>
+        						</pluginExecution>
+        					</pluginExecutions>
+        				</lifecycleMappingMetadata>
+        			</configuration>
+        		</plugin>
+        	</plugins>
+        </pluginManagement>
     </build>
 </project>

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml Sat Oct 20 19:04:07 2012
@@ -257,6 +257,22 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${org.slf4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
             <version>${jcr.version}</version>

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.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/component/registry/JCRComponentRegistry.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java Sat Oct 20 19:04:07 2012
@@ -39,12 +39,12 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.util.RegistryConstants;
 import org.apache.airavata.registry.api.util.WebServiceUtil;
 import org.apache.airavata.workflow.model.component.ComponentReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JCRComponentRegistry extends ComponentRegistry {
 
-    private static final Log log = LogFactory.getLog(JCRComponentRegistry.class);
+    private static final Logger log = LoggerFactory.getLogger(JCRComponentRegistry.class);
     private static final String NAME = "Application Services";
     public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
 

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/WebComponentRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/WebComponentRegistry.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/component/registry/WebComponentRegistry.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/WebComponentRegistry.java Sat Oct 20 19:04:07 2012
@@ -44,12 +44,12 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
 import org.apache.airavata.workflow.model.component.ws.WSComponent;
 import org.apache.airavata.workflow.model.component.ws.WSComponentFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WebComponentRegistry extends ComponentRegistry {
 
-    private static final Log logger = LogFactory.getLog(WebComponentRegistry.class);
+    private static final Logger logger = LoggerFactory.getLogger(WebComponentRegistry.class);
 
     private URL url;
 

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.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/component/ws/WSComponent.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.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.Graph;
 import org.apache.airavata.workflow.model.graph.Node;
 import org.apache.airavata.workflow.model.graph.ws.WSNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlCharacters;
 import org.xmlpull.infoset.XmlElement;
 
@@ -54,7 +54,7 @@ import xsul5.wsdl.WsdlPortTypeOutput;
 
 public class WSComponent extends Component {
 
-    private static final Log logger = LogFactory.getLog(WSComponent.class);
+    private static final Logger logger = LoggerFactory.getLogger(WSComponent.class);
 
     protected WsdlDefinitions wsdl;
 

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.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/gpel/script/BPELScript.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java Sat Oct 20 19:04:07 2012
@@ -80,8 +80,8 @@ import org.gpel.model.GpelReply;
 import org.gpel.model.GpelScope;
 import org.gpel.model.GpelSequence;
 import org.gpel.model.GpelVariable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlComment;
 import org.xmlpull.infoset.XmlElement;
 import org.xmlpull.infoset.XmlInfosetBuilder;
@@ -145,7 +145,7 @@ public class BPELScript {
 
     private static final String FOREACH_VALUE_SUFFIX = "Value";
 
-    private static final Log logger = LogFactory.getLog(BPELScript.class);
+    private static final Logger logger = LoggerFactory.getLogger(BPELScript.class);
 
     private Workflow workflow;