Author: veithen
Date: Sun Mar 2 16:09:53 2014
New Revision: 1573327
URL: http://svn.apache.org/r1573327
Log:
Improved debug logging.
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java?rev=1573327&r1=1573326&r2=1573327&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Sun Mar 2 16:09:53 2014
@@ -64,7 +64,7 @@ import java.util.Vector;
* This is Wsdl2java's implementation of the GeneratorFactory
*/
public class JavaGeneratorFactory implements GeneratorFactory {
- private static final Log log_ =
+ private static final Log log =
LogFactory.getLog(JavaGeneratorFactory.class.getName());
/** Field emitter */
@@ -450,6 +450,10 @@ public class JavaGeneratorFactory implem
gen.generate();
}
} // generate
+
+ public String toString() {
+ return "Writers[baseWriter=" + baseWriter + ",writers=" + writers
+ ",entry.name=" + (entry == null ? "N/A" : entry.getName()) + "]";
+ }
} // class Writers
/**
@@ -459,6 +463,9 @@ public class JavaGeneratorFactory implem
* @param generator
*/
public void addGenerator(Class wsdlClass, Class generator) {
+ if (log.isDebugEnabled()) {
+ log.debug("Adding generator for " + wsdlClass.getName() + ": " +
generator.getName());
+ }
// This is just a hack right now... it just works with Service
if (Message.class.isAssignableFrom(wsdlClass)) {
@@ -1237,6 +1244,10 @@ public class JavaGeneratorFactory implem
}
entry.setName(newName);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Symbol table of type " + entry.getClass().getName() + "
mangled: " + name + " -> " + newName);
+ }
}
/**
@@ -1644,7 +1655,7 @@ public class JavaGeneratorFactory implem
doInclude = true;
}
else {
- log_.info(
+ log.info(
"excluding code generation for non-included QName:" + qName);
}
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java?rev=1573327&r1=1573326&r2=1573327&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
Sun Mar 2 16:09:53 2014
@@ -202,4 +202,8 @@ public class JavaTypeWriter implements G
protected Generator getHolderWriter(Emitter emitter, TypeEntry type) {
return new JavaHolderWriter(emitter, type);
}
+
+ public String toString() {
+ return "JavaTypeWriter[typeWriter=" + typeWriter + ",holderWriter=" +
holderWriter + "]";
+ }
} // class JavaTypeWriter
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java?rev=1573327&r1=1573326&r2=1573327&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
Sun Mar 2 16:09:53 2014
@@ -15,8 +15,10 @@
*/
package org.apache.axis.wsdl.toJava;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.utils.Messages;
import org.apache.axis.wsdl.gen.Generator;
+import org.apache.commons.logging.Log;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -76,6 +78,7 @@ import java.util.StringTokenizer;
* </dl>
*/
public abstract class JavaWriter implements Generator {
+ private static final Log log =
LogFactory.getLog(JavaWriter.class.getName());
/** This controls how many characters per line for javadoc comments */
protected final static int LINE_LENGTH = 65;
@@ -121,6 +124,10 @@ public abstract class JavaWriter impleme
}
}
+ if (log.isDebugEnabled()) {
+ log.debug("Start generating file " + file);
+ }
+
PrintWriter pw = getPrintWriter(file);
writeFileHeader(pw);
Modified:
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java?rev=1573327&r1=1573326&r2=1573327&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
(original)
+++
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
Sun Mar 2 16:09:53 2014
@@ -15,6 +15,7 @@
*/
package org.apache.axis.wsdl.gen;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.utils.Messages;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.CollectionElement;
@@ -26,6 +27,7 @@ import org.apache.axis.wsdl.symbolTable.
import org.apache.axis.wsdl.symbolTable.Type;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
import org.apache.axis.wsdl.symbolTable.Utils;
+import org.apache.commons.logging.Log;
import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -34,6 +36,7 @@ import javax.wsdl.Binding;
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.xml.parsers.ParserConfigurationException;
+
import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
@@ -44,6 +47,7 @@ import java.util.Vector;
* This is a class with no documentation.
*/
public class Parser {
+ private static final Log log = LogFactory.getLog(Parser.class.getName());
/** Field debug */
protected boolean debug = false;
@@ -442,6 +446,13 @@ public class Parser {
// do nothing.
}
+ private static void generate(Generator gen) throws IOException {
+ if (log.isDebugEnabled()) {
+ log.debug("Invoking generator " + gen);
+ }
+ gen.generate();
+ }
+
/**
* Method generate
*
@@ -505,7 +516,7 @@ public class Parser {
}
if (gen != null) {
- gen.generate();
+ generate(gen);
}
}
}
@@ -514,7 +525,7 @@ public class Parser {
// outside of the recursive emit method.
Generator gen = genFactory.getGenerator(def, symbolTable);
- gen.generate();
+ generate(gen);
} // generate
/**
@@ -549,7 +560,7 @@ public class Parser {
&& (type.getBaseType() == null)) {
Generator gen = genFactory.getGenerator(type, symbolTable);
- gen.generate();
+ generate(gen);
}
}
@@ -576,7 +587,7 @@ public class Parser {
&& (type.getBaseType() == null)) {
Generator gen = genFactory.getGenerator(type, symbolTable);
- gen.generate();
+ generate(gen);
}
}
} // generateTypes
