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 20:54:31 UTC
svn commit: r1179764 - in /incubator/airavata/trunk/modules:
commons/utils/src/main/java/org/apache/airavata/common/utils/
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/
Author: patanachai
Date: Thu Oct 6 18:54:30 2011
New Revision: 1179764
URL: http://svn.apache.org/viewvc?rev=1179764&view=rev
Log:
AIRAVATA-107 replace logging with SLF4J in commons and gfac-axis2 module
Modified:
incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java
incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java
incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java
incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/XMLUtil.java
Modified: incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java?rev=1179764&r1=1179763&r2=1179764&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java (original)
+++ incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/BrowserLauncher.java Thu Oct 6 18:54:30 2011
@@ -26,9 +26,9 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.net.URL;
-
import org.apache.airavata.common.exception.UtilsException;
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Opens URLs with the OS-specific browser.
@@ -37,7 +37,7 @@ public class BrowserLauncher {
private static final String ERROR_MESSAGE = "Error while attempting to launch web browser";
- private static MLogger logger = MLogger.getLogger();
+ private static Logger logger = LoggerFactory.getLogger(BrowserLauncher.class);
/**
* Opens a specified URL with the browser.
@@ -58,7 +58,7 @@ public class BrowserLauncher {
* @throws UtilsException
*/
public static void openURL(String url) throws UtilsException {
- logger.entering(url);
+ logger.debug("Enter:" + url);
String osName = System.getProperty("os.name");
try {
if (osName.startsWith("Mac OS")) {
Modified: incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java?rev=1179764&r1=1179763&r2=1179764&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java (original)
+++ incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/IOUtil.java Thu Oct 6 18:54:30 2011
@@ -33,11 +33,12 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IOUtil {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(IOUtil.class);
/**
* @param path
@@ -45,12 +46,10 @@ public class IOUtil {
* @throws IOException
*/
public static void writeToFile(String content, String path) throws IOException {
- logger.entering(new Object[] { path, content });
+ logger.debug("Path:" + path + " Content:" + content );
FileWriter fw = new FileWriter(path);
writeToWriter(content, fw);
-
- logger.exiting();
}
/**
Modified: incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java?rev=1179764&r1=1179763&r2=1179764&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java (original)
+++ incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java Thu Oct 6 18:54:30 2011
@@ -32,13 +32,15 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.apache.airavata.common.exception.UtilsException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlAttribute;
import org.xmlpull.infoset.XmlBuilderException;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.XmlNamespace;
-import org.apache.airavata.common.exception.UtilsException;
+
import xsul.XmlConstants;
-import xsul5.MLogger;
import xsul5.wsdl.WsdlBinding;
import xsul5.wsdl.WsdlDefinitions;
import xsul5.wsdl.WsdlPortType;
@@ -47,7 +49,7 @@ import xsul5.wsdl.WsdlUtil;
public class WSDLUtil {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(WSDLUtil.class);
/**
* @param wsdlString
@@ -455,7 +457,7 @@ public class WSDLUtil {
*/
public static URI appendWSDLQuary(URI uri) {
if (uri.toString().endsWith("?wsdl")) {
- logger.warning("URL already has ?wsdl at the end: " + uri.toString());
+ logger.warn("URL already has ?wsdl at the end: " + uri.toString());
// Don't throw exception to be more error tolerant.
return uri;
}
Modified: incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java?rev=1179764&r1=1179763&r2=1179764&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java (original)
+++ incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java Thu Oct 6 18:54:30 2011
@@ -40,6 +40,8 @@ import org.apache.airavata.common.except
import org.apache.xmlbeans.XmlError;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -50,8 +52,6 @@ import org.xmlpull.infoset.XmlNamespace;
import org.xmlpull.mxp1.MXParserFactory;
import org.xmlpull.mxp1_serializer.MXSerializer;
-import xsul5.MLogger;
-
public class XMLUtil {
/**
@@ -66,7 +66,7 @@ public class XMLUtil {
public static final org.xmlpull.v1.builder.XmlInfosetBuilder BUILDER3 = org.xmlpull.v1.builder.XmlInfosetBuilder
.newInstance(new MXParserFactory());
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(XMLUtil.class);
private final static String PROPERTY_SERIALIZER_INDENTATION = "http://xmlpull.org/v1/doc/properties.html#serializer-indentation";
@@ -161,7 +161,7 @@ public class XMLUtil {
Element domElement = document.createElement(xppElement.getName());
for (org.xmlpull.infoset.XmlNamespace namespace : xppElement.namespaces()) {
- logger.finest("namespace: " + namespace);
+ logger.info("namespace: " + namespace);
}
for (org.xmlpull.infoset.XmlAttribute attribute : xppElement.attributes()) {
@@ -175,7 +175,7 @@ public class XMLUtil {
Text text = document.createTextNode((String) object);
domElement.appendChild(text);
} else {
- logger.finest("object.getClass(): " + object.getClass());
+ logger.info("object.getClass(): " + object.getClass());
}
}
return domElement;
@@ -212,7 +212,7 @@ public class XMLUtil {
Iterator nsIt = xppElement.namespaces();
while (nsIt.hasNext()) {
org.xmlpull.v1.builder.XmlNamespace namespace = (org.xmlpull.v1.builder.XmlNamespace) nsIt.next();
- logger.finest("namespace: " + namespace);
+ logger.info("namespace: " + namespace);
// TODO
}
@@ -232,7 +232,7 @@ public class XMLUtil {
Text text = document.createTextNode((String) object);
domElement.appendChild(text);
} else {
- logger.finest("object.getClass(): " + object.getClass());
+ logger.info("object.getClass(): " + object.getClass());
}
}
return domElement;
@@ -298,7 +298,7 @@ public class XMLUtil {
stringToXmlElement(string);
return true;
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
return false;
}
}
@@ -323,8 +323,8 @@ public class XMLUtil {
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < errorList.size(); i++) {
XmlError error = (XmlError) errorList.get(i);
- logger.warning("Message: " + error.getMessage());
- logger.warning("Location of invalid XML: " + error.getCursorLocation().xmlText());
+ logger.warn("Message: " + error.getMessage());
+ logger.warn("Location of invalid XML: " + error.getCursorLocation().xmlText());
stringBuilder.append("Message:" + error.getMessage());
stringBuilder.append("Location of invalid XML: " + error.getCursorLocation().xmlText());
}
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java?rev=1179764&r1=1179763&r2=1179764&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/WSDLUtil.java Thu Oct 6 18:54:30 2011
@@ -21,24 +21,34 @@
package org.apache.airavata.services.gfac.axis2.util;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlAttribute;
import org.xmlpull.infoset.XmlBuilderException;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.XmlNamespace;
-import xsul.XmlConstants;
-import xsul5.MLogger;
-import xsul5.wsdl.*;
-import javax.xml.namespace.QName;
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.*;
-import java.util.LinkedList;
-import java.util.List;
+import xsul.XmlConstants;
+import xsul5.wsdl.WsdlBinding;
+import xsul5.wsdl.WsdlDefinitions;
+import xsul5.wsdl.WsdlPortType;
+import xsul5.wsdl.WsdlPortTypeOperation;
+import xsul5.wsdl.WsdlUtil;
public class WSDLUtil {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(WSDLUtil.class);
/**
* @param definitions3
@@ -337,7 +347,7 @@ public class WSDLUtil {
*/
public static URI appendWSDLQuary(URI uri) {
if (uri.toString().endsWith("?wsdl")) {
- logger.warning("URL already has ?wsdl at the end: " + uri.toString());
+ logger.warn("URL already has ?wsdl at the end: " + uri.toString());
// Don't throw exception to be more error tolerant.
return uri;
}
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/XMLUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/XMLUtil.java?rev=1179764&r1=1179763&r2=1179764&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/XMLUtil.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/XMLUtil.java Thu Oct 6 18:54:30 2011
@@ -21,9 +21,25 @@
package org.apache.airavata.services.gfac.axis2.util;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.xmlbeans.XmlError;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -33,17 +49,6 @@ import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.XmlNamespace;
import org.xmlpull.mxp1.MXParserFactory;
import org.xmlpull.mxp1_serializer.MXSerializer;
-import xsul5.MLogger;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
public class XMLUtil {
@@ -59,7 +64,7 @@ public class XMLUtil {
public static final org.xmlpull.v1.builder.XmlInfosetBuilder BUILDER3 = org.xmlpull.v1.builder.XmlInfosetBuilder
.newInstance(new MXParserFactory());
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(XMLUtil.class);
private final static String PROPERTY_SERIALIZER_INDENTATION = "http://xmlpull.org/v1/doc/properties.html#serializer-indentation";
@@ -154,7 +159,7 @@ public class XMLUtil {
Element domElement = document.createElement(xppElement.getName());
for (XmlNamespace namespace : xppElement.namespaces()) {
- logger.finest("namespace: " + namespace);
+ logger.info("namespace: " + namespace);
}
for (org.xmlpull.infoset.XmlAttribute attribute : xppElement.attributes()) {
@@ -168,7 +173,7 @@ public class XMLUtil {
Text text = document.createTextNode((String) object);
domElement.appendChild(text);
} else {
- logger.finest("object.getClass(): " + object.getClass());
+ logger.info("object.getClass(): " + object.getClass());
}
}
return domElement;
@@ -205,7 +210,7 @@ public class XMLUtil {
Iterator nsIt = xppElement.namespaces();
while (nsIt.hasNext()) {
org.xmlpull.v1.builder.XmlNamespace namespace = (org.xmlpull.v1.builder.XmlNamespace) nsIt.next();
- logger.finest("namespace: " + namespace);
+ logger.info("namespace: " + namespace);
// TODO
}
@@ -225,7 +230,7 @@ public class XMLUtil {
Text text = document.createTextNode((String) object);
domElement.appendChild(text);
} else {
- logger.finest("object.getClass(): " + object.getClass());
+ logger.info("object.getClass(): " + object.getClass());
}
}
return domElement;
@@ -258,7 +263,7 @@ public class XMLUtil {
stringToXmlElement(string);
return true;
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
return false;
}
}
@@ -283,8 +288,8 @@ public class XMLUtil {
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < errorList.size(); i++) {
XmlError error = (XmlError) errorList.get(i);
- logger.warning("Message: " + error.getMessage());
- logger.warning("Location of invalid XML: " + error.getCursorLocation().xmlText());
+ logger.warn("Message: " + error.getMessage());
+ logger.warn("Location of invalid XML: " + error.getCursorLocation().xmlText());
stringBuilder.append("Message:" + error.getMessage());
stringBuilder.append("Location of invalid XML: " + error.getCursorLocation().xmlText());
}