Author: alessio.soldano(a)jboss.com
Date: 2013-03-20 11:30:02 -0400 (Wed, 20 Mar 2013)
New Revision: 543
Modified:
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLLocatorImpl.java
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WiseEntityResolver.java
Log:
[WISE-199] Fix logger usage in WSDLResolver
Modified:
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLLocatorImpl.java
===================================================================
---
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLLocatorImpl.java 2013-03-20
14:41:18 UTC (rev 542)
+++
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLLocatorImpl.java 2013-03-20
15:30:02 UTC (rev 543)
@@ -28,7 +28,7 @@
import javax.wsdl.xml.WSDLLocator;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -56,7 +56,9 @@
}
public InputSource getBaseInputSource() {
- log.trace("getBaseInputSource [wsdlUrl=" + wsdlLocation + "]");
+ if (log.isTraceEnabled()) {
+ log.trace("getBaseInputSource [wsdlUrl=" + wsdlLocation + "]");
+ }
try {
InputStream inputStream = connection.open(wsdlLocation);
if (inputStream == null)
@@ -73,7 +75,9 @@
}
public InputSource getImportInputSource(String parent, String resource) {
- log.trace("getImportInputSource [parent=" + parent + ",resource=" +
resource + "]");
+ if (log.isTraceEnabled()) {
+ log.trace("getImportInputSource [parent=" + parent +
",resource=" + resource + "]");
+ }
URL parentURL = null;
try {
@@ -115,7 +119,9 @@
}
try {
- log.trace("Trying to resolve: " + wsdlImport);
+ if (log.isTraceEnabled()) {
+ log.trace("Trying to resolve: " + wsdlImport);
+ }
InputSource inputSource = entityResolver.resolveEntity(wsdlImport, wsdlImport);
if (inputSource != null) {
latestImportURI = wsdlImport;
Modified:
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java
===================================================================
---
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java 2013-03-20
14:41:18 UTC (rev 542)
+++
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java 2013-03-20
15:30:02 UTC (rev 543)
@@ -44,7 +44,7 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wise.core.utils.IDGenerator;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.DOMUtils;
@@ -173,6 +173,7 @@
String baseURI = parentURL.toExternalForm();
Iterator<?> it = parentDefinition.getImports().values().iterator();
+ final boolean debugLog = log.isDebugEnabled();
while (it.hasNext()) {
for (Import wsdlImport : (List<Import>) it.next()) {
String locationURI = wsdlImport.getLocationURI();
@@ -187,7 +188,7 @@
URL targetURL = new URL(baseURI.substring(0, baseURI.lastIndexOf("/") + 1) +
"wsdl-" + IDGenerator.nextVal() + ".wsdl");
String newLocationURI = targetURL.getPath();
File targetFile = new File(newLocationURI);
- log.debug("targetFile: " + targetFile);
+ if (debugLog) log.debug("targetFile: " + targetFile);
targetFile.getParentFile().mkdirs();
saved.put(locationURI, newLocationURI);
saved.put(newLocationURI, newLocationURI);
@@ -213,7 +214,7 @@
fw.close();
}
- log.debug("WSDL import saved to: " + targetURL);
+ if (debugLog) log.debug("WSDL import saved to: " + targetURL);
}
}
}
@@ -270,7 +271,7 @@
try {
DOMWriter domWriter = new DOMWriter(fos);
domWriter.print(subDoc);
- log.debug("XMLSchema import saved to: " + xsdURL);
+ if (log.isDebugEnabled()) log.debug("XMLSchema import saved to: " +
xsdURL);
} finally {
try {
fos.close();
Modified:
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WiseEntityResolver.java
===================================================================
---
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WiseEntityResolver.java 2013-03-20
14:41:18 UTC (rev 542)
+++
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WiseEntityResolver.java 2013-03-20
15:30:02 UTC (rev 543)
@@ -26,7 +26,7 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.util.xml.JBossEntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Show replies by date