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 2004/07/07 01:19:41 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java JavaGeneratorFactory.java
gdaniels 2004/07/06 16:19:41
Modified: java/src/org/apache/axis/wsdl/symbolTable SchemaUtils.java
SymbolTable.java
java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java
JavaGeneratorFactory.java
Log:
Wrapped params with no namespace need to retain their unqualified
status in the generated deploy.wsdd. This solves the problem of
generating non-functional services for some WSDLs (wrapped ones
with elementFormDefault set to unqualified), but does not
yet fix the fact that the generated WSDL for these services still has
elementFormDefault set to qualified.
Also a few bits of cleanup/spelling corrections.
Revision Changes Path
1.44 +2 -3 ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
Index: SchemaUtils.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- SchemaUtils.java 2 Jul 2004 13:23:07 -0000 1.43
+++ SchemaUtils.java 6 Jul 2004 23:19:40 -0000 1.44
@@ -478,8 +478,7 @@
* element from the provided node. Only the first annotation element and
* the first documentation element in the annotation element will be used.
*
- * @param root Parent node.
- * @param path Path of element names to text of interest, delimited by "/".
+ * @param typeNode Parent node.
*/
public static String getAnnotationDocumentation(Node typeNode) {
Node annotationNode = typeNode.getFirstChild();
@@ -691,7 +690,7 @@
nodeName = Utils.findQName("", nodeName.getLocalPart());
} else if (form == null) {
- // check elementForDefault on schema element
+ // check elementFormDefault on schema element
String def = Utils.getScopedAttribute(elementNode,
"elementFormDefault");
1.102 +5 -4 ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- SymbolTable.java 2 Jul 2004 13:24:53 -0000 1.101
+++ SymbolTable.java 6 Jul 2004 23:19:40 -0000 1.102
@@ -2810,11 +2810,12 @@
* @param bEntry
* @param operation
* @param input
- * @throws IOException
*/
- private void setBodyType(
- String use, BindingEntry bEntry, Operation operation, boolean input)
- throws IOException {
+ private void setBodyType(String use,
+ BindingEntry bEntry,
+ Operation operation,
+ boolean input)
+ {
if (use == null) {
// Deprecated
1.86 +1 -2 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Index: JavaDeployWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- JavaDeployWriter.java 22 Jun 2004 16:58:26 -0000 1.85
+++ JavaDeployWriter.java 6 Jul 2004 23:19:40 -0000 1.86
@@ -569,8 +569,7 @@
pw.print(" <parameter");
- if ((paramQName == null)
- || "".equals(paramQName.getNamespaceURI())) {
+ if (paramQName == null) {
pw.print(" name=\"" + param.getName() + "\"");
} else {
pw.print(" qname=\""
1.52 +1 -1 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Index: JavaGeneratorFactory.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- JavaGeneratorFactory.java 5 Jun 2004 11:05:49 -0000 1.51
+++ JavaGeneratorFactory.java 6 Jul 2004 23:19:40 -0000 1.52
@@ -505,7 +505,7 @@
/** Refactored to call recursively for JAX-RPC 1.1 spec 4.2.5. */
protected int javifyTypeEntryName(SymbolTable symbolTable, TypeEntry entry, HashMap anonQNames, int uniqueNum) {
- TypeEntry tEntry = (TypeEntry) entry;
+ TypeEntry tEntry = entry;
String dims = tEntry.getDimensions();
TypeEntry refType = tEntry.getRefType();
while (refType != null) {