Author: veithen
Date: Sat Apr 20 09:01:02 2013
New Revision: 1470128
URL: http://svn.apache.org/r1470128
Log:
AXIS2-4927: Merged r1382245 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1382245
Modified:
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java?rev=1470128&r1=1470127&r2=1470128&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
Sat Apr 20 09:01:02 2013
@@ -381,7 +381,11 @@ public class JavaClassToDBCConverter {
webFaultAnnot.setFaultBean(webFault.faultBean());
webFaultAnnot.setName(webFault.name());
webFaultAnnot.setTargetNamespace(webFault.targetNamespace());
- webFaultAnnot.setMessageName(webFault.messageName());
+ try {
+ webFaultAnnot.setMessageName(webFault.messageName());
+ } catch (NoSuchMethodError ex) {
+ // Ignore: we are running on Java 1.6 and the JAX-WS 2.2 libs
have not been endorsed
+ }
composite.setWebFaultAnnot(webFaultAnnot);
}
}
Modified:
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java?rev=1470128&r1=1470127&r2=1470128&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Sat Apr 20 09:01:02 2013
@@ -200,7 +200,11 @@ public class JavaMethodsToMDCConverter {
rwAnnot.setClassName(requestWrapper.className());
rwAnnot.setLocalName(requestWrapper.localName());
rwAnnot.setTargetNamespace(requestWrapper.targetNamespace());
- rwAnnot.setPartName(requestWrapper.partName());
+ try {
+ rwAnnot.setPartName(requestWrapper.partName());
+ } catch (NoSuchMethodError ex) {
+ // Ignore: we are running on Java 1.6 and the JAX-WS 2.2 libs
have not been endorsed
+ }
mdc.setRequestWrapperAnnot(rwAnnot);
}
}
@@ -221,7 +225,11 @@ public class JavaMethodsToMDCConverter {
rwAnnot.setClassName(responseWrapper.className());
rwAnnot.setLocalName(responseWrapper.localName());
rwAnnot.setTargetNamespace(responseWrapper.targetNamespace());
- rwAnnot.setPartName(responseWrapper.partName());
+ try {
+ rwAnnot.setPartName(responseWrapper.partName());
+ } catch (NoSuchMethodError ex) {
+ // Ignore: we are running on Java 1.6 and the JAX-WS 2.2 libs
have not been endorsed
+ }
mdc.setResponseWrapperAnnot(rwAnnot);
}
}
Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/saaj:r1382245
