svn commit: r1382245 - in /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter: JavaClassToDBCConverter.java JavaMethodsToMDCConverter.java

[veithen]

Author: veithen
Date: Sat Sep  8 07:56:30 2012
New Revision: 1382245

URL: http://svn.apache.org/viewvc?rev=1382245&view=rev
Log:
AXIS2-4927: Allow the JAX-WS runtime to run properly on Java 1.6 without 
endorsing the JAX-WS 2.2 libs.

Modified:
    
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
    
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java

Modified: 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java?rev=1382245&r1=1382244&r2=1382245&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
 Sat Sep  8 07:56:30 2012
@@ -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/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java?rev=1382245&r1=1382244&r2=1382245&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
 Sat Sep  8 07:56:30 2012
@@ -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);
         }
     }