You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/05/06 04:28:10 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java Utils.java
dims 2005/05/05 19:28:10
Modified: java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java
Utils.java
Log:
get test.wsdl.marshall working again. emit returnItemType only for known problematic cases.
Revision Changes Path
1.95 +8 -4 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.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- JavaDeployWriter.java 4 May 2005 09:45:27 -0000 1.94
+++ JavaDeployWriter.java 6 May 2005 02:28:09 -0000 1.95
@@ -73,6 +73,9 @@
/** Field emitter */
protected Emitter emitter;
+ /** Field use */
+ Use use = Use.DEFAULT;
+
/**
* Constructor.
*
@@ -327,7 +330,6 @@
boolean hasMIME = Utils.hasMIME(bEntry);
String prefix = WSDDConstants.NS_PREFIX_WSDD_JAVA;
String styleStr = "";
- Use use = Use.DEFAULT;
Iterator iterator =
bEntry.getBinding().getExtensibilityElements().iterator();
@@ -580,9 +582,11 @@
pw.print(Utils.genQNameAttributeString(returnItemQName, "tns"));
pw.print("\"");
}
- if(type.getComponentType()!=null){
- QName returnItemType = type.getComponentType();
- if (returnItemType != null) {
+ QName returnItemType = Utils.getItemType(type);
+ if(returnItemType!=null && use == Use.ENCODED){
+ if (Constants.isSchemaXSD(returnItemType.getNamespaceURI()) &&
+ !(returnItemType.getLocalPart().equals("hexBinary")||
+ returnItemType.getLocalPart().equals("base64Binary"))) {
pw.print(" returnItemType=\"");
pw.print(Utils.genQNameAttributeString(returnItemType, "tns2"));
pw.print("\"");
1.94 +7 -0 ws-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Utils.java 18 Apr 2005 17:17:12 -0000 1.93
+++ Utils.java 6 May 2005 02:28:10 -0000 1.94
@@ -1305,4 +1305,11 @@
}
return te.getItemQName();
}
+
+ public static QName getItemType(TypeEntry te) {
+ if (te instanceof DefinedElement) {
+ te = te.getRefType();
+ }
+ return te.getComponentType();
+ }
} // class Utils