You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2002/08/08 17:17:12 UTC
cvs commit: xml-axis/java/src/org/apache/axis/wsdl/toJava Emitter.java JavaBeanFaultWriter.java JavaBeanHelperWriter.java JavaBindingWriter.java JavaClassWriter.java JavaDeployWriter.java JavaEnumTypeWriter.java JavaFaultWriter.java JavaGeneratorFactory.java JavaHolderWriter.java JavaInterfaceWriter.java JavaServiceImplWriter.java JavaSkelWriter.java JavaStubWriter.java JavaTestCaseWriter.java JavaTypeWriter.java JavaUndeployWriter.java Namespaces.java Utils.java
gdaniels 2002/08/08 08:17:12
Modified: java/src/org/apache/axis/transport/http
SimpleAxisWorker.java
java/src/org/apache/axis/wsdl/gen NoopFactory.java
WSDL2.java
java/src/org/apache/axis/wsdl/symbolTable
BaseTypeMapping.java Parameters.java
SchemaUtils.java SymbolTable.java Utils.java
java/src/org/apache/axis/wsdl/toJava Emitter.java
JavaBeanFaultWriter.java JavaBeanHelperWriter.java
JavaBindingWriter.java JavaClassWriter.java
JavaDeployWriter.java JavaEnumTypeWriter.java
JavaFaultWriter.java JavaGeneratorFactory.java
JavaHolderWriter.java JavaInterfaceWriter.java
JavaServiceImplWriter.java JavaSkelWriter.java
JavaStubWriter.java JavaTestCaseWriter.java
JavaTypeWriter.java JavaUndeployWriter.java
Namespaces.java Utils.java
Log:
Sweep sweep, dust dust...
(a little housecleaning)
Revision Changes Path
1.13 +31 -2 xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java
Index: SimpleAxisWorker.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SimpleAxisWorker.java 18 Jul 2002 16:41:15 -0000 1.12
+++ SimpleAxisWorker.java 8 Aug 2002 15:17:10 -0000 1.13
@@ -60,6 +60,8 @@
import org.apache.axis.Constants;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
+import org.apache.axis.description.ServiceDesc;
+import org.apache.axis.description.OperationDesc;
import org.apache.axis.encoding.Base64;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPFault;
@@ -76,6 +78,8 @@
import java.net.Socket;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.Iterator;
+import java.util.ArrayList;
public class SimpleAxisWorker implements Runnable {
@@ -332,10 +336,35 @@
}
}
+ StringBuffer sb = new StringBuffer();
+ sb.append("<h2>And now... Some Services</h2>\n");
+ Iterator i = engine.getConfig().getDeployedServices();
+ out.write("<ul>\n".getBytes());
+ while (i.hasNext()) {
+ ServiceDesc sd = (ServiceDesc)i.next();
+ sb.append("<li>\n");
+ sb.append(sd.getName());
+ sb.append(" <a href=\"../services/");
+ sb.append(sd.getName());
+ sb.append("?wsdl\"><i>(wsdl)</i></a></li>\n");
+ ArrayList operations = sd.getOperations();
+ if (!operations.isEmpty()) {
+ sb.append("<ul>\n");
+ for (Iterator it = operations.iterator(); it.hasNext();) {
+ OperationDesc desc = (OperationDesc) it.next();
+ sb.append("<li>" + desc.getName());
+ }
+ sb.append("</ul>\n");
+ }
+ }
+ sb.append("</ul>\n");
+
+ byte [] bytes = sb.toString().getBytes();
+
out.write(HTML_MIME_STUFF);
- putInt(buf, out, cannedHTMLResponse.length);
+ putInt(buf, out, bytes.length);
out.write(SEPARATOR);
- out.write(cannedHTMLResponse);
+ out.write(bytes);
out.flush();
return;
}
1.4 +0 -1 xml-axis/java/src/org/apache/axis/wsdl/gen/NoopFactory.java
Index: NoopFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/gen/NoopFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NoopFactory.java 20 Jun 2002 20:35:47 -0000 1.3
+++ NoopFactory.java 8 Aug 2002 15:17:10 -0000 1.4
@@ -60,7 +60,6 @@
import javax.wsdl.PortType;
import javax.xml.namespace.QName;
import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
import org.apache.axis.encoding.TypeMapping;
import org.apache.axis.encoding.DefaultSOAP12TypeMappingImpl;
1.10 +4 -4 xml-axis/java/src/org/apache/axis/wsdl/gen/WSDL2.java
Index: WSDL2.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/gen/WSDL2.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WSDL2.java 28 Jun 2002 18:00:30 -0000 1.9
+++ WSDL2.java 8 Aug 2002 15:17:10 -0000 1.10
@@ -132,7 +132,7 @@
/**
* addOptions
* Add option descriptions to the tool.
- * @param CLOptionDescriptor[] the options
+ * @param newOptions CLOptionDescriptor[] the options
*/
protected void addOptions(CLOptionDescriptor[] newOptions) {
if (newOptions != null && newOptions.length > 0) {
@@ -146,7 +146,7 @@
/**
* Parse an option
- * @param CLOption is the option
+ * @param option CLOption is the option
*/
protected void parseOption(CLOption option) {
switch (option.getId()) {
@@ -253,7 +253,7 @@
/**
* run
* checkes the command-line arguments and runs the tool.
- * @param String[] command-line arguments.
+ * @param args String[] command-line arguments.
*/
protected void run(String[] args) {
// Parse the arguments
@@ -294,7 +294,7 @@
/**
* Main
* Run the tool with the specified command-line arguments
- * @param String[] command-line arguments
+ * @param args String[] command-line arguments
*/
public static void main(String[] args) {
WSDL2 wsdl2 = new WSDL2();
1.3 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/BaseTypeMapping.java
Index: BaseTypeMapping.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/BaseTypeMapping.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseTypeMapping.java 20 Jun 2002 20:35:47 -0000 1.2
+++ BaseTypeMapping.java 8 Aug 2002 15:17:10 -0000 1.3
@@ -62,7 +62,7 @@
/**
* If the qname is registered in the target language,
* return the name of the registered type.
- * @param QName representing a type
+ * @param qName QName representing a type
* @return name of the registered type or null if not registered.
*/
public abstract String getBaseName(QName qName);
1.5 +0 -2 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Parameters.java
Index: Parameters.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Parameters.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Parameters.java 2 Aug 2002 16:41:41 -0000 1.4
+++ Parameters.java 8 Aug 2002 15:17:10 -0000 1.5
@@ -57,8 +57,6 @@
import java.util.Map;
import java.util.Vector;
-import javax.xml.namespace.QName;
-
/**
* This class simply collects all the parameter or message data for an operation into one place.
*/
1.11 +2 -2 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
Index: SchemaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SchemaUtils.java 1 Jul 2002 16:09:38 -0000 1.10
+++ SchemaUtils.java 8 Aug 2002 15:17:10 -0000 1.11
@@ -193,7 +193,7 @@
return v;
} else {
// This may be a simpleType, return the type with the name "value"
- QName simpleQName = getSimpleTypeBase(node, symbolTable);
+ QName simpleQName = getSimpleTypeBase(node);
if (simpleQName != null) {
TypeEntry simpleType = symbolTable.getType(simpleQName);
if (simpleType != null) {
@@ -580,7 +580,7 @@
* If the specified node represents a 'normal' non-enumeration simpleType,
* the QName of the simpleType base is returned.
*/
- public static QName getSimpleTypeBase(Node node, SymbolTable symbolTable) {
+ public static QName getSimpleTypeBase(Node node) {
QName baseQName = null;
if (node == null) {
1.22 +0 -6 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SymbolTable.java 7 Aug 2002 14:07:55 -0000 1.21
+++ SymbolTable.java 8 Aug 2002 15:17:10 -0000 1.22
@@ -56,7 +56,6 @@
package org.apache.axis.wsdl.symbolTable;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -109,8 +108,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.axis.utils.URLHashSet;
-import org.apache.axis.wsdl.gen.Generator;
-
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -159,7 +156,6 @@
public static final String ANON_TOKEN = ">";
private Definition def = null;
- private Document doc = null;
private String wsdlURI = null;
/**
@@ -372,7 +368,6 @@
WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
reader.setFeature("javax.wsdl.verbose", verbose);
this.def = reader.readWSDL(context, doc);
- this.doc = doc;
add(context, def, doc);
} // populate
@@ -1011,7 +1006,6 @@
boolean literalInput = false;
boolean literalOutput = false;
- String bindingName = "unknown";
if (bindingEntry != null) {
literalInput = (bindingEntry.getInputBodyType(operation) == BindingEntry.USE_LITERAL);
literalOutput = (bindingEntry.getOutputBodyType(operation) == BindingEntry.USE_LITERAL);
1.15 +1 -2 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Utils.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Utils.java 20 Jun 2002 20:35:47 -0000 1.14
+++ Utils.java 8 Aug 2002 15:17:11 -0000 1.15
@@ -83,7 +83,7 @@
* "nillable=true" attribute, the type should be an Integer (not an int).
* So in these circumstances, this routine is called with xsd:int to
* get a suitable qname (soapenc:int) which maps to Integer.
- * @param QName
+ * @param qName QName
*/
public static QName getNillableQName(QName qName) {
QName rc = qName;
@@ -268,7 +268,6 @@
* @param node of the reference
* @param forElement output parameter is set to true if QName is for an element
* (i.e. ref= or element= attribute was used).
- * @param QName of type or element (depending on forElement setting)
*/
public static QName getNodeTypeRefQName(Node node, BooleanHolder forElement) {
if (node == null) return null;
1.48 +1 -3 xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Emitter.java 16 Jul 2002 18:32:46 -0000 1.47
+++ Emitter.java 8 Aug 2002 15:17:11 -0000 1.48
@@ -63,7 +63,6 @@
import java.util.List;
import java.util.Properties;
-import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.wsdl.WSDLException;
@@ -282,11 +281,10 @@
/**
* Sets the <code>WriterFactory Class</code> to use
- * @param className the name of the factory <code>Class</code>
+ * @param factory the name of the factory <code>Class</code>
*/
public void setFactory(String factory) {
try {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
setFactory((GeneratorFactory)
ClassUtils.forName(factory).newInstance());
}
1.2 +0 -8 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java
Index: JavaBeanFaultWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaBeanFaultWriter.java 14 May 2002 23:46:34 -0000 1.1
+++ JavaBeanFaultWriter.java 8 Aug 2002 15:17:11 -0000 1.2
@@ -54,17 +54,9 @@
*/
package org.apache.axis.wsdl.toJava;
-import java.io.IOException;
-
import java.util.Vector;
-import org.apache.axis.utils.JavaUtils;
-
-import org.apache.axis.wsdl.symbolTable.ElementDecl;
-import org.apache.axis.wsdl.symbolTable.SchemaUtils;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
-
-import org.w3c.dom.Node;
/**
* This is Wsdl2java's Complex Faylt Writer.
1.17 +2 -7 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
Index: JavaBeanHelperWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JavaBeanHelperWriter.java 10 Jul 2002 17:41:46 -0000 1.16
+++ JavaBeanHelperWriter.java 8 Aug 2002 15:17:11 -0000 1.17
@@ -58,9 +58,6 @@
import java.io.PrintWriter;
import java.util.Vector;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
import javax.xml.namespace.QName;
@@ -69,8 +66,6 @@
import org.apache.axis.wsdl.symbolTable.ElementDecl;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
-import org.w3c.dom.Node;
-
/**
* This is Wsdl2java's Helper Type Writer. It writes the <typeName>.java file.
*/
@@ -197,8 +192,8 @@
if (elements != null) {
for (int i = 0; i < elements.size(); i++) {
ElementDecl elem = (ElementDecl)elements.get(i);
- String elemName = elem.getName().getLocalPart();
- String javaName = Utils.xmlNameToJava(elemName);
+ // String elemName = elem.getName().getLocalPart();
+ // String javaName = Utils.xmlNameToJava(elemName);
// Changed the code to write meta data
// for all of the elements in order to
1.13 +0 -3 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
Index: JavaBindingWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBindingWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaBindingWriter.java 20 Jun 2002 20:35:47 -0000 1.12
+++ JavaBindingWriter.java 8 Aug 2002 15:17:11 -0000 1.13
@@ -56,10 +56,7 @@
import java.io.IOException;
-import java.util.HashMap;
-
import javax.wsdl.Binding;
-import javax.xml.namespace.QName;
import org.apache.axis.utils.JavaUtils;
1.3 +2 -5 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaClassWriter.java
Index: JavaClassWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaClassWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaClassWriter.java 20 Jun 2002 20:35:47 -0000 1.2
+++ JavaClassWriter.java 8 Aug 2002 15:17:11 -0000 1.3
@@ -58,12 +58,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.xml.namespace.QName;
-
import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.wsdl.symbolTable.SymTabEntry;
-
/**
* Emitter knows about WSDL writers, one each for PortType, Binding, Service,
* Definition, Type. But for some of these WSDL types, Wsdl2java generates
@@ -155,8 +151,9 @@
/**
* Constructor.
* @param emitter The emitter instance
- * @param fulClassName The fully qualified class name of the class
+ * @param fullClassName The fully qualified class name of the class
* to be generated.
+ * @param type
*/
protected JavaClassWriter(
Emitter emitter,
1.56 +0 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Index: JavaDeployWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- JavaDeployWriter.java 2 Aug 2002 16:41:41 -0000 1.55
+++ JavaDeployWriter.java 8 Aug 2002 15:17:11 -0000 1.56
@@ -335,7 +335,6 @@
Operation operation = bindingOper.getOperation();
OperationType type = operation.getStyle();
String javaOperName = JavaUtils.xmlNameToJava(operation.getName());
- String operationName = operation.getName();
// These operation types are not supported. The signature
// will be a string stating that fact.
1.12 +1 -5 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java
Index: JavaEnumTypeWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JavaEnumTypeWriter.java 25 Jun 2002 14:45:56 -0000 1.11
+++ JavaEnumTypeWriter.java 8 Aug 2002 15:17:11 -0000 1.12
@@ -63,13 +63,10 @@
import org.apache.axis.wsdl.symbolTable.TypeEntry;
-import org.w3c.dom.Node;
-
/**
* This is Wsdl2java's Complex Type Writer. It writes the <typeName>.java file.
*/
public class JavaEnumTypeWriter extends JavaClassWriter {
- private TypeEntry type;
private Vector elements;
/**
@@ -79,7 +76,6 @@
Emitter emitter,
TypeEntry type, Vector elements) {
super(emitter, type.getName(), "enumType");
- this.type = type;
this.elements = elements;
} // ctor
@@ -256,7 +252,7 @@
* Get the enumeration names for the values.
* The name is affected by whether all of the values of the enumeration
* can be expressed as valid java identifiers.
- * @param Vector base and values vector from getEnumerationBaseAndValues
+ * @param bv Vector base and values vector from getEnumerationBaseAndValues
* @return Vector names of enum value identifiers.
*/
public static Vector getEnumValueIds(Vector bv) {
1.12 +0 -2 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaFaultWriter.java
Index: JavaFaultWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaFaultWriter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JavaFaultWriter.java 24 Jul 2002 16:15:04 -0000 1.11
+++ JavaFaultWriter.java 8 Aug 2002 15:17:11 -0000 1.12
@@ -62,8 +62,6 @@
import javax.wsdl.Fault;
import javax.xml.namespace.QName;
-import org.apache.axis.utils.JavaUtils;
-
import org.apache.axis.wsdl.symbolTable.Parameter;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
1.18 +4 -6 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Index: JavaGeneratorFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JavaGeneratorFactory.java 2 Aug 2002 16:41:41 -0000 1.17
+++ JavaGeneratorFactory.java 8 Aug 2002 15:17:11 -0000 1.18
@@ -84,7 +84,6 @@
import org.apache.axis.wsdl.symbolTable.BaseTypeMapping;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
-import org.apache.axis.wsdl.symbolTable.DefinedElement;
import org.apache.axis.wsdl.symbolTable.Element;
import org.apache.axis.wsdl.symbolTable.MessageEntry;
import org.apache.axis.wsdl.symbolTable.Parameter;
@@ -375,7 +374,7 @@
// If there is already an existing type, there will be a
// collision. If there is an existing anon type, there will be a
// collision. In both cases, the java type name should be mangled.
- TypeEntry existing = symbolTable.getType(typeQName);
+ symbolTable.getType(typeQName);
if (anonQNames.get(typeQName) != null) {
localName += "Type" + uniqueNum++;
typeQName = new QName(typeQName.getNamespaceURI(), localName);
@@ -404,7 +403,7 @@
* all MessageEntries for faults are tagged with the
* EXCEPTION_CLASS_NAME variable, which indicates the java exception
* class name.
- * @param SymbolTable
+ * @param symbolTable SymbolTable
*/
private void setFaultContext(SymbolTable symbolTable) {
Iterator it = symbolTable.getHashMap().values().iterator();
@@ -445,8 +444,8 @@
* Helper routine for the setFaultContext method above.
* Examines the indicated fault and sets COMPLEX_TYPE_FAULT
* and EXCEPTION_CLASS_NAME as appropriate.
- * @param Fault to analyze
- * @param SymbolTable
+ * @param fault Fault to analyze
+ * @param symbolTable SymbolTable
*/
private void setFaultContext(Fault fault,
SymbolTable symbolTable) {
@@ -861,7 +860,6 @@
String javifiedName = Utils.xmlNameToJava(p.getName());
if (p.getMode() == Parameter.IN) {
- String typeString;
signature = signature + Utils.getParameterTypeName(p) + " " + javifiedName;
}
else {
1.13 +0 -4 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
Index: JavaHolderWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaHolderWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaHolderWriter.java 24 Jul 2002 16:15:04 -0000 1.12
+++ JavaHolderWriter.java 8 Aug 2002 15:17:11 -0000 1.13
@@ -57,10 +57,6 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.xml.namespace.QName;
-
-import org.apache.axis.utils.JavaUtils;
-
import org.apache.axis.wsdl.symbolTable.TypeEntry;
/**
1.12 +0 -2 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java
Index: JavaInterfaceWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JavaInterfaceWriter.java 7 Jun 2002 12:45:08 -0000 1.11
+++ JavaInterfaceWriter.java 8 Aug 2002 15:17:11 -0000 1.12
@@ -62,8 +62,6 @@
import javax.wsdl.Operation;
import javax.wsdl.PortType;
-import org.apache.axis.utils.JavaUtils;
-
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
1.19 +0 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
Index: JavaServiceImplWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JavaServiceImplWriter.java 2 Aug 2002 22:12:48 -0000 1.18
+++ JavaServiceImplWriter.java 8 Aug 2002 15:17:11 -0000 1.19
@@ -70,7 +70,6 @@
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.WSDLUtils;
-import org.apache.axis.utils.XMLUtils;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
1.42 +0 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
Index: JavaSkelWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- JavaSkelWriter.java 2 Aug 2002 16:41:41 -0000 1.41
+++ JavaSkelWriter.java 8 Aug 2002 15:17:11 -0000 1.42
@@ -78,7 +78,6 @@
import org.apache.axis.wsdl.symbolTable.Parameter;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
-import org.apache.axis.wsdl.symbolTable.TypeEntry;
import org.apache.axis.utils.JavaUtils;
1.81 +0 -6 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
Index: JavaStubWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- JavaStubWriter.java 2 Aug 2002 16:41:41 -0000 1.80
+++ JavaStubWriter.java 8 Aug 2002 15:17:11 -0000 1.81
@@ -65,9 +65,7 @@
import java.util.Vector;
import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
import javax.wsdl.Fault;
import javax.wsdl.Operation;
import javax.wsdl.OperationType;
@@ -75,7 +73,6 @@
import javax.wsdl.PortType;
import javax.xml.namespace.QName;
-import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPOperation;
import org.apache.axis.utils.JavaUtils;
@@ -83,7 +80,6 @@
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.CollectionType;
import org.apache.axis.wsdl.symbolTable.Element;
-import org.apache.axis.wsdl.symbolTable.DefinedElement;
import org.apache.axis.wsdl.symbolTable.Parameter;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
@@ -131,8 +127,6 @@
protected void writeFileBody(PrintWriter pw) throws IOException {
PortType portType = binding.getPortType();
- String portTypeName =
- (String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
boolean isRPC = true;
if (bEntry.getBindingStyle() == BindingEntry.STYLE_DOCUMENT) {
isRPC = false;
1.37 +0 -2 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
Index: JavaTestCaseWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- JavaTestCaseWriter.java 2 Aug 2002 22:12:48 -0000 1.36
+++ JavaTestCaseWriter.java 8 Aug 2002 15:17:11 -0000 1.37
@@ -67,7 +67,6 @@
import javax.wsdl.OperationType;
import javax.wsdl.Port;
import javax.wsdl.PortType;
-import javax.wsdl.Service;
import org.apache.axis.utils.JavaUtils;
@@ -75,7 +74,6 @@
import org.apache.axis.wsdl.symbolTable.Parameter;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
-import org.apache.axis.wsdl.symbolTable.SchemaUtils;
import org.apache.axis.wsdl.symbolTable.ServiceEntry;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
1.14 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
Index: JavaTypeWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTypeWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JavaTypeWriter.java 20 Jun 2002 20:35:48 -0000 1.13
+++ JavaTypeWriter.java 8 Aug 2002 15:17:11 -0000 1.14
@@ -109,7 +109,7 @@
node, symbolTable);
if (base == null) {
QName baseQName = SchemaUtils.getSimpleTypeBase(
- node, symbolTable);
+ node);
if (baseQName != null) {
base = symbolTable.getType(baseQName);
}
1.9 +0 -3 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java
Index: JavaUndeployWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JavaUndeployWriter.java 20 Jun 2002 20:35:48 -0000 1.8
+++ JavaUndeployWriter.java 8 Aug 2002 15:17:11 -0000 1.9
@@ -60,17 +60,14 @@
import java.util.Iterator;
import java.util.Map;
-import javax.wsdl.Binding;
import javax.wsdl.Definition;
import javax.wsdl.Port;
-import javax.xml.namespace.QName;
import javax.wsdl.Service;
import org.apache.axis.deployment.wsdd.WSDDConstants;
import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
/**
1.5 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/Namespaces.java
Index: Namespaces.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Namespaces.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Namespaces.java 9 Apr 2002 15:41:30 -0000 1.4
+++ Namespaces.java 8 Aug 2002 15:17:11 -0000 1.5
@@ -203,7 +203,7 @@
/**
* Set a package name that overrides the namespace map
*
- * @param a java package name (e.g. com.foo)
+ * @param defaultPackage a java package name (e.g. com.foo)
*/
public void setDefaultPackage(String defaultPackage) {
this.defaultPackage = defaultPackage;
1.46 +5 -6 xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Utils.java 7 Aug 2002 21:02:11 -0000 1.45
+++ Utils.java 8 Aug 2002 15:17:11 -0000 1.46
@@ -201,8 +201,8 @@
/**
* Add package to name
- * @param String full name of the class.
- * @param String name of the package to append
+ * @param className full name of the class.
+ * @param newPkg name of the package to append
* @return String name with package name added
*/
public static String addPackageName(String className, String newPkg) {
@@ -220,8 +220,8 @@
* Given a fault, return the fully qualified Java class name
* of the exception to be generated from this fault
*
- * @param fault - The WSDL fault object
- * @param symbolTable - the symbol table
+ * @param fault The WSDL fault object
+ * @param emitter the Emitter being used
* @return A Java class name for the fault
*/
public static String getFullExceptionName(
@@ -517,13 +517,12 @@
* Return the operation QName. The namespace is determined from
* the soap:body namespace, if it exists, otherwise it is "".
*
- * @param operation the operation
+ * @param bindingOper the operation
* @return the operation QName
*/
public static QName getOperationQName(BindingOperation bindingOper) {
Operation operation = bindingOper.getOperation();
String operationName = operation.getName();
- String javaOperName = JavaUtils.xmlNameToJava(operation.getName());
QName elementQName = null;
String ns = null;