Author: veithen
Date: Tue Oct 16 18:10:05 2012
New Revision: 1398908
URL: http://svn.apache.org/viewvc?rev=1398908&view=rev
Log:
Merged latest changes from trunk.
Modified:
axis/axis1/java/branches/AXIS-1984/ (props changed)
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
axis/axis1/java/branches/AXIS-1984/src/site/apt/changelogs/1_4_1.apt
axis/axis1/java/branches/AXIS-1984/test/wsdl/interop/ (props changed)
Propchange: axis/axis1/java/branches/AXIS-1984/
------------------------------------------------------------------------------
Merged /axis/axis1/java/trunk:r1398421-1398907
Modified:
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java?rev=1398908&r1=1398907&r2=1398908&view=diff
==============================================================================
---
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
(original)
+++
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Tue Oct 16 18:10:05 2012
@@ -15,7 +15,6 @@
*/
package org.apache.axis.wsdl.toJava;
-import org.apache.axis.Constants;
import org.apache.axis.deployment.wsdd.WSDDConstants;
import org.apache.axis.description.OperationDesc;
import org.apache.axis.description.ServiceDesc;
@@ -41,8 +40,8 @@ import javax.wsdl.Operation;
import javax.wsdl.OperationType;
import javax.wsdl.Port;
import javax.wsdl.Service;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
import javax.xml.namespace.QName;
import java.io.File;
import java.io.FileOutputStream;
@@ -370,20 +369,8 @@ public class JavaDeployWriter extends Ja
while (iterator.hasNext()) {
Object obj = iterator.next();
- if (obj instanceof SOAPBinding) {
+ if (obj instanceof SOAPBinding || obj instanceof SOAP12Binding) {
use = Use.ENCODED;
- } else if (obj instanceof UnknownExtensibilityElement) {
-
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if (name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("binding")) {
- use = Use.ENCODED;
- }
}
}
Modified:
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java?rev=1398908&r1=1398907&r2=1398908&view=diff
==============================================================================
---
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
(original)
+++
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
Tue Oct 16 18:10:05 2012
@@ -15,7 +15,6 @@
*/
package org.apache.axis.wsdl.toJava;
-import org.apache.axis.Constants;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
@@ -30,9 +29,10 @@ import javax.wsdl.BindingOperation;
import javax.wsdl.BindingOutput;
import javax.wsdl.Operation;
import javax.wsdl.OperationType;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Body;
+import javax.wsdl.extensions.soap12.SOAP12Operation;
import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.PrintWriter;
@@ -363,22 +363,10 @@ public class JavaSkelWriter extends Java
soapAction = ((SOAPOperation) obj).getSoapActionURI();
break;
- } else if (obj instanceof UnknownExtensibilityElement) {
+ } else if (obj instanceof SOAP12Operation) {
+ soapAction = ((SOAP12Operation) obj).getSoapActionURI();
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if
(name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("operation")) {
- if (unkElement.getElement().getAttribute("soapAction")
- != null) {
- soapAction = unkElement.getElement().getAttribute(
- "soapAction");
- }
- }
+ break;
}
}
@@ -418,31 +406,19 @@ public class JavaSkelWriter extends Java
}
break;
- } else if (obj instanceof UnknownExtensibilityElement) {
+ } else if (obj instanceof SOAP12Body) {
+ namespace = ((SOAP12Body) obj).getNamespaceURI();
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if (name.getNamespaceURI().equals(
- Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("body")) {
- namespace = unkElement.getElement().getAttribute(
- "namespace");
-
- if (namespace == null) {
- namespace =
-
symbolTable.getDefinition().getTargetNamespace();
- }
-
- if (namespace == null) {
- namespace = "";
- }
+ if (namespace == null) {
+ namespace =
+
symbolTable.getDefinition().getTargetNamespace();
+ }
- break;
+ if (namespace == null) {
+ namespace = "";
}
+
+ break;
}
}
}
Modified:
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java?rev=1398908&r1=1398907&r2=1398908&view=diff
==============================================================================
---
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
(original)
+++
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
Tue Oct 16 18:10:05 2012
@@ -15,7 +15,6 @@
*/
package org.apache.axis.wsdl.toJava;
-import org.apache.axis.Constants;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.constants.Style;
import org.apache.axis.constants.Use;
@@ -42,9 +41,10 @@ import javax.wsdl.Operation;
import javax.wsdl.OperationType;
import javax.wsdl.Part;
import javax.wsdl.PortType;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+import javax.wsdl.extensions.soap12.SOAP12Operation;
import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.PrintWriter;
@@ -338,22 +338,11 @@ public class JavaStubWriter extends Java
"
_call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);");
pw.println(
"
_call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC);");
- } else if (obj instanceof UnknownExtensibilityElement) {
-
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if (name.getNamespaceURI().equals(
- Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("binding")) {
- pw.println(
- "
_call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP12_CONSTANTS);");
- pw.println(
- "
_call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP12_ENC);");
- }
+ } else if (obj instanceof SOAP12Binding) {
+ pw.println(
+ "
_call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP12_CONSTANTS);");
+ pw.println(
+ "
_call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP12_ENC);");
}
}
}
@@ -431,24 +420,11 @@ public class JavaStubWriter extends Java
opStyle = ((SOAPOperation) obj).getStyle();
break;
- } else if (obj instanceof UnknownExtensibilityElement) {
-
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if
(name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("operation")) {
- if (unkElement.getElement().getAttribute("soapAction")
- != null) {
- soapAction = unkElement.getElement().getAttribute(
- "soapAction");
- }
+ } else if (obj instanceof SOAP12Operation) {
+ soapAction = ((SOAP12Operation) obj).getSoapActionURI();
+ opStyle = ((SOAP12Operation) obj).getStyle();
- opStyle =
unkElement.getElement().getAttribute("style");
- }
+ break;
}
}
@@ -574,18 +550,10 @@ public class JavaStubWriter extends Java
opStyle = ((SOAPOperation) obj).getStyle();
break;
- } else if (obj instanceof UnknownExtensibilityElement) {
+ } else if (obj instanceof SOAP12Operation) {
+ opStyle = ((SOAP12Operation) obj).getStyle();
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if
(name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("operation")) {
- opStyle =
unkElement.getElement().getAttribute("style");
- }
+ break;
}
}
@@ -1093,19 +1061,9 @@ public class JavaStubWriter extends Java
if (obj instanceof SOAPBinding) {
pw.println(
"
_call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);");
- } else if (obj instanceof UnknownExtensibilityElement) {
-
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if (name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("binding")) {
- pw.println(
- "
_call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP12_CONSTANTS);");
- }
+ } else if (obj instanceof SOAP12Binding) {
+ pw.println(
+ "
_call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP12_CONSTANTS);");
}
}
Modified:
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java?rev=1398908&r1=1398907&r2=1398908&view=diff
==============================================================================
---
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
(original)
+++
axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
Tue Oct 16 18:10:05 2012
@@ -26,8 +26,8 @@ import org.w3c.dom.NodeList;
import javax.wsdl.BindingOperation;
import javax.wsdl.Message;
import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Operation;
import javax.xml.namespace.QName;
import javax.xml.rpc.holders.BooleanHolder;
import java.io.File;
@@ -773,21 +773,10 @@ public class Utils extends org.apache.ax
SOAPOperation soapOp = (SOAPOperation) elem;
action = soapOp.getSoapActionURI();
found = true;
- } else if (elem instanceof UnknownExtensibilityElement) {
-
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) elem;
- QName name =
- unkElement.getElementType();
-
- if (name.getNamespaceURI().equals(
- Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("operation")) {
- action = unkElement.getElement().getAttribute(
- "soapAction");
- found = true;
- }
+ } else if (elem instanceof SOAP12Operation) {
+ SOAP12Operation soapOp = (SOAP12Operation) elem;
+ action = soapOp.getSoapActionURI();
+ found = true;
}
}
return action;
Modified:
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java?rev=1398908&r1=1398907&r2=1398908&view=diff
==============================================================================
---
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
(original)
+++
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
Tue Oct 16 18:10:05 2012
@@ -17,13 +17,11 @@
package org.apache.axis.utils;
import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.Constants;
import org.apache.commons.logging.Log;
import javax.wsdl.Port;
import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.xml.namespace.QName;
+import javax.wsdl.extensions.soap12.SOAP12Address;
import java.util.List;
import java.util.ListIterator;
@@ -42,14 +40,8 @@ public class WSDLUtils {
Object obj = li.next();
if (obj instanceof SOAPAddress) {
return ((SOAPAddress) obj).getLocationURI();
- } else if (obj instanceof UnknownExtensibilityElement){
- //TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
(UnknownExtensibilityElement) obj;
- QName name = unkElement.getElementType();
- if(name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP) &&
- name.getLocalPart().equals("address")) {
- return unkElement.getElement().getAttribute("location");
- }
+ } else if (obj instanceof SOAP12Address){
+ return ((SOAP12Address) obj).getLocationURI();
}
}
// didn't find it
Modified:
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java?rev=1398908&r1=1398907&r2=1398908&view=diff
==============================================================================
---
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
(original)
+++
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
Tue Oct 16 18:10:05 2012
@@ -58,6 +58,11 @@ import javax.wsdl.extensions.soap.SOAPBo
import javax.wsdl.extensions.soap.SOAPFault;
import javax.wsdl.extensions.soap.SOAPHeader;
import javax.wsdl.extensions.soap.SOAPHeaderFault;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+import javax.wsdl.extensions.soap12.SOAP12Body;
+import javax.wsdl.extensions.soap12.SOAP12Fault;
+import javax.wsdl.extensions.soap12.SOAP12Header;
+import javax.wsdl.extensions.soap12.SOAP12HeaderFault;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
@@ -2500,24 +2505,14 @@ public class SymbolTable {
} else {
bEntry.setBindingType(BindingEntry.TYPE_HTTP_GET);
}
- } else if (obj instanceof UnknownExtensibilityElement) {
-
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if
(name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("binding")) {
- bEntry.setBindingType(BindingEntry.TYPE_SOAP);
-
- String style =
- unkElement.getElement().getAttribute("style");
+ } else if (obj instanceof SOAP12Binding) {
+ bEntry.setBindingType(BindingEntry.TYPE_SOAP);
+
+ SOAP12Binding sb = (SOAP12Binding) obj;
+ String style = sb.getStyle();
- if ("rpc".equalsIgnoreCase(style)) {
- bEntry.setBindingStyle(Style.RPC);
- }
+ if ("rpc".equalsIgnoreCase(style)) {
+ bEntry.setBindingStyle(Style.RPC);
}
}
}
@@ -2660,6 +2655,35 @@ public class SymbolTable {
operation,
addMIMETypes(
bEntry, (MIMEMultipartRelated) obj,
operation), input);
+ } else if (obj instanceof SOAP12Body) {
+ setBodyType(((SOAP12Body) obj).getUse(), bEntry, operation,
+ input);
+ } else if (obj instanceof SOAP12Header) {
+ SOAP12Header header = (SOAP12Header) obj;
+
+ setBodyType(header.getUse(), bEntry, operation, input);
+
+ // Note, this only works for explicit headers - those whose
+ // parts come from messages used in the portType's operation
+ // input/output clauses - it does not work for implicit
+ // headers - those whose parts come from messages not used in
+ // the portType's operation's input/output clauses. I don't
+ // know what we're supposed to emit for implicit headers.
+ bEntry.setHeaderPart(operation.getName(), header.getPart(),
+ input
+ ? BindingEntry.IN_HEADER
+ : BindingEntry.OUT_HEADER);
+
+ // Add any soap12:headerFault info to the faults array
+ Iterator headerFaults =
header.getSOAP12HeaderFaults().iterator();
+
+ while (headerFaults.hasNext()) {
+ SOAP12HeaderFault headerFault =
+ (SOAP12HeaderFault) headerFaults.next();
+
+ faults.add(new FaultInfo(headerFault.getMessage(),
headerFault.getPart(),
+ headerFault.getUse(),
headerFault.getNamespaceURI(), this));
+ }
} else if (obj instanceof UnknownExtensibilityElement) {
UnknownExtensibilityElement unkElement =
(UnknownExtensibilityElement) obj;
@@ -2670,61 +2694,6 @@ public class SymbolTable {
&& name.getLocalPart().equals("message")) {
fillInDIMEInformation(unkElement, input, operation,
bEntry);
}
-
- // TODO: After WSDL4J supports soap12, change this code
- if (name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("body")) {
- setBodyType(unkElement.getElement().getAttribute("use"),
- bEntry, operation, input);
- }
-
- // TODO: After WSDL4J supports soap12, change this code
- if (name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("header")) {
- setBodyType(unkElement.getElement().getAttribute("use"),
- bEntry, operation, input);
-
- // Note, this only works for explicit headers - those whose
- // parts come from messages used in the portType's
operation
- // input/output clauses - it does not work for implicit
- // headers - those whose parts come from messages not used
in
- // the portType's operation's input/output clauses. I
don't
- // know what we're supposed to emit for implicit headers.
- bEntry.setHeaderPart(
- operation.getName(),
- unkElement.getElement().getAttribute("part"), input
- ? BindingEntry.IN_HEADER
- : BindingEntry.OUT_HEADER);
-
- // Add any soap12:headerFault info to the faults array
- NodeList headerFaults =
- unkElement.getElement().getChildNodes();
-
- for (int i = 0; i < headerFaults.getLength(); i++) {
- String faultMessage =
-
unkElement.getElement().getAttribute("message");
- String faultPart =
- unkElement.getElement().getAttribute("part");
- String faultUse =
- unkElement.getElement().getAttribute("use");
- String faultNamespaceURI =
-
unkElement.getElement().getAttribute("namespace");
- QName faultMessageQName = null;
- int sep = faultMessage.indexOf(':');
-
- if (sep == -1) {
- faultMessageQName = new QName(faultMessage);
- } else {
- faultMessageQName =
- new QName(faultMessage.substring(0, sep),
- faultMessage.substring(sep + 1));
- }
-
- faults.add(new FaultInfo(faultMessageQName, faultPart,
- faultUse, faultNamespaceURI,
- this));
- }
- }
}
}
} // fillInBindingInfo
@@ -2863,29 +2832,12 @@ public class SymbolTable {
soapFaultNamespace = ((SOAPFault) obj).getNamespaceURI();
break;
- } else if (obj instanceof UnknownExtensibilityElement) {
+ } else if (obj instanceof SOAP12Fault) {
+ foundSOAPFault = true;
+ soapFaultUse = ((SOAP12Fault) obj).getUse();
+ soapFaultNamespace = ((SOAP12Fault) obj).getNamespaceURI();
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if
(name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("fault")) {
- if (unkElement.getElement().getAttribute("use")
- != null) {
- soapFaultUse =
-
unkElement.getElement().getAttribute("use");
- }
-
- if (unkElement.getElement().getAttribute("namespace")
- != null) {
- soapFaultNamespace =
- unkElement.getElement().getAttribute(
- "namespace");
- }
- }
+ break;
}
}
@@ -3010,27 +2962,16 @@ public class SymbolTable {
if (use.equalsIgnoreCase("literal")) {
bodyType = Use.LITERAL;
}
- } else if (obj instanceof UnknownExtensibilityElement) {
-
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) obj;
- QName name =
- unkElement.getElementType();
-
- if
(name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("body")) {
- String use =
- unkElement.getElement().getAttribute("use");
+ } else if (obj instanceof SOAP12Body) {
+ String use = ((SOAP12Body) obj).getUse();
- if (use == null) {
- throw new IOException(
- Messages.getMessage("noUse",
op.getName()));
- }
+ if (use == null) {
+ throw new IOException(
+ Messages.getMessage("noUse", op.getName()));
+ }
- if (use.equalsIgnoreCase("literal")) {
- bodyType = Use.LITERAL;
- }
+ if (use.equalsIgnoreCase("literal")) {
+ bodyType = Use.LITERAL;
}
}
}
Modified:
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java?rev=1398908&r1=1398907&r2=1398908&view=diff
==============================================================================
---
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
(original)
+++
axis/axis1/java/branches/AXIS-1984/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
Tue Oct 16 18:10:05 2012
@@ -31,9 +31,9 @@ import javax.wsdl.Input;
import javax.wsdl.Operation;
import javax.wsdl.Part;
import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.mime.MIMEMultipartRelated;
import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap12.SOAP12Body;
import javax.xml.namespace.QName;
import javax.xml.rpc.holders.BooleanHolder;
import java.util.*;
@@ -1012,18 +1012,8 @@ public class Utils {
}
}
}
- } else if (elem instanceof UnknownExtensibilityElement) {
-
- // TODO: After WSDL4J supports soap12, change this code
- UnknownExtensibilityElement unkElement =
- (UnknownExtensibilityElement) elem;
- QName name =
- unkElement.getElementType();
-
- if
(name.getNamespaceURI().equals(Constants.URI_WSDL12_SOAP)
- && name.getLocalPart().equals("body")) {
- ns = unkElement.getElement().getAttribute("namespace");
- }
+ } else if (elem instanceof SOAP12Body) {
+ ns = ((SOAP12Body)elem).getNamespaceURI();
}
}
}
Modified: axis/axis1/java/branches/AXIS-1984/src/site/apt/changelogs/1_4_1.apt
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-1984/src/site/apt/changelogs/1_4_1.apt?rev=1398908&r1=1398907&r2=1398908&view=diff
==============================================================================
--- axis/axis1/java/branches/AXIS-1984/src/site/apt/changelogs/1_4_1.apt
(original)
+++ axis/axis1/java/branches/AXIS-1984/src/site/apt/changelogs/1_4_1.apt Tue
Oct 16 18:10:05 2012
@@ -43,4 +43,6 @@ Changes from 1.4 final
Note that this is only supported by the maven-wsdl2java-plugin, but not
by the corresponding Ant task
or command line tool. The feature can be used to consume MTOM enabled
services. Check the
{{{../maven/maven-wsdl2java-plugin/java-xml-type-mappings.html}plugin
documentation}} for more information.
+
+ * WSDL4J has been upgraded from 1.5.1 to 1.6.2.
Propchange: axis/axis1/java/branches/AXIS-1984/test/wsdl/interop/
------------------------------------------------------------------------------
Merged /webservices/axis/branches/AXIS_1_4_FINAL/test/wsdl/interop:r356166
Merged /axis/axis1/java/trunk/test/wsdl/interop:r1398421-1398907
Merged /axis/axis1/java/tags/1.4/test/wsdl/interop:r396062-1225644
