scheu 2002/10/15 07:58:46
Modified: java/src/org/apache/axis/wsdl/symbolTable FaultInfo.java
java/src/org/apache/axis/wsdl/toJava JavaSkelWriter.java
JavaStubWriter.java
Log:
setScopedProperty stub changes, skeleton change, NPE fix
Revision Changes Path
1.4 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/FaultInfo.java
Index: FaultInfo.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/FaultInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FaultInfo.java 14 Oct 2002 20:02:22 -0000 1.3
+++ FaultInfo.java 15 Oct 2002 14:58:46 -0000 1.4
@@ -209,7 +209,7 @@
}
// Literal, so get the element's type
TypeEntry entry = st.getElement(part.getElementName());
- if (entry != null) {
+ if (entry != null && entry.getRefType() != null) {
return entry.getRefType().getQName();
}
}
1.52 +5 -0
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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- JavaSkelWriter.java 14 Oct 2002 16:44:16 -0000 1.51
+++ JavaSkelWriter.java 15 Oct 2002 14:58:46 -0000 1.52
@@ -283,11 +283,16 @@
FaultInfo faultInfo = (FaultInfo) it.next();
QName faultQName = faultInfo.getQName();
QName faultXMLType = faultInfo.getXMLType();
+ String faultName = faultInfo.getName();
String className =
Utils.getFullExceptionName(
faultInfo.getMessage(), symbolTable);
pw.println(" _fault = " +
"new org.apache.axis.description.FaultDesc();");
+ if (faultName != null) {
+ pw.println(" _fault.setName(\"" +
+ faultName + "\");");
+ }
if (faultQName != null) {
pw.println(" _fault.setQName(" +
Utils.getNewQName(faultQName) + ");");
1.103 +3 -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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- JavaStubWriter.java 10 Oct 2002 15:12:15 -0000 1.102
+++ JavaStubWriter.java 15 Oct 2002 14:58:46 -0000 1.103
@@ -228,10 +228,7 @@
pw.println(" java.util.Enumeration keys =
super.cachedProperties.keys();");
pw.println(" while (keys.hasMoreElements()) {");
pw.println(" java.lang.String key = (java.lang.String)
keys.nextElement();");
- pw.println(" if(_call.isPropertySupported(key))");
- pw.println(" _call.setProperty(key,
super.cachedProperties.get(key));");
- pw.println(" else");
- pw.println(" _call.setScopedProperty(key,
super.cachedProperties.get(key));");
+ pw.println(" _call.setProperty(key,
super.cachedProperties.get(key));");
pw.println(" }");
if (typeMappingCount > 0) {
pw.println(" // " + Messages.getMessage("typeMap00"));
@@ -644,7 +641,7 @@
// Turn off encoding
pw.println(" _call.setEncodingStyle(null);");
// turn off XSI types
- pw.println("
_call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);");
+ pw.println("
_call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);");
}
if (hasMIME || use == Use.LITERAL) {
// If it is literal, turn off multirefs.
@@ -652,7 +649,7 @@
// If there are any MIME types, turn off multirefs.
// I don't know enough about the guts to know why
// attachments don't work with multirefs, but they don't.
- pw.println("
_call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);");
+ pw.println("
_call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);");
}
Style style = Style.getStyle(opStyle, bEntry.getBindingStyle());
