geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1124890 - /geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
Date Thu, 19 May 2011 15:04:23 GMT
Author: xuhaihong
Date: Thu May 19 15:04:23 2011
New Revision: 1124890

URL: http://svn.apache.org/viewvc?rev=1124890&view=rev
Log:
AXIS2 4999 Only ignore request/response wrapper class detection if bare style is used.

Modified:
    geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java

Modified: geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java?rev=1124890&r1=1124889&r2=1124890&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
(original)
+++ geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
Thu May 19 15:04:23 2011
@@ -96,7 +96,7 @@ class ArtifactProcessor {
 
     void build() {
         for (EndpointDescription ed : serviceDesc.getEndpointDescriptions()) {
-            if (ed.getEndpointInterfaceDescription() != null && ed.getEndpointInterfaceDescription().getSoapBindingParameterStyle()
== SOAPBinding.ParameterStyle.WRAPPED) {
+            if (ed.getEndpointInterfaceDescription() != null) {
                 for (OperationDescription opDesc : ed.getEndpointInterfaceDescription()
                     .getOperations()) {
 
@@ -105,37 +105,38 @@ class ArtifactProcessor {
                     String simpleName = getSimpleClassName(declaringClassName);
                     String methodName = opDesc.getJavaMethodName();
 
-
-                    // There is no default for @RequestWrapper/@ResponseWrapper classname
 None is listed in Sec. 7.3 on p. 80 of
-                    // the JAX-WS spec, BUT Conformance(Using javax.xml.ws.RequestWrapper)
in Sec 2.3.1.2 on p. 13
-                    // says the entire annotation "...MAY be omitted if all its properties
would have default values."
-                    // We will assume that this statement gives us the liberty to find a
wrapper class/build a wrapper class or 
-                    // implement an engine w/o the wrapper class.
-
-                    // @RequestWrapper className processing
-                    String requestWrapperName = opDesc.getRequestWrapperClassName();
-                    String foundRequestWrapperName = getWrapperClass("@RequestWrapper",
-                        requestWrapperName, 
-                        packageName, 
-                        javaMethodToClassName(methodName),
-                        ed.getAxisService().getClassLoader(),
-                        serviceDesc);
-
-                    if (foundRequestWrapperName != null) {
-                        requestWrapperMap.put(opDesc, foundRequestWrapperName);
-                    }
-
-                    // @ResponseWrapper className processing
-                    String responseWrapperName = opDesc.getResponseWrapperClassName();
-                    String foundResponseWrapperName = getWrapperClass("@ResponseWrapper",
-                        responseWrapperName, 
-                        packageName, 
-                        javaMethodToClassName(methodName) + "Response",
-                        ed.getAxisService().getClassLoader(),
-                        serviceDesc);
-
-                    if (foundResponseWrapperName != null) {
-                        responseWrapperMap.put(opDesc, foundResponseWrapperName);
+                    if(ed.getEndpointInterfaceDescription().getSoapBindingParameterStyle()
== SOAPBinding.ParameterStyle.WRAPPED){
+                        // There is no default for @RequestWrapper/@ResponseWrapper classname
 None is listed in Sec. 7.3 on p. 80 of
+                        // the JAX-WS spec, BUT Conformance(Using javax.xml.ws.RequestWrapper)
in Sec 2.3.1.2 on p. 13
+                        // says the entire annotation "...MAY be omitted if all its properties
would have default values."
+                        // We will assume that this statement gives us the liberty to find
a wrapper class/build a wrapper class or 
+                        // implement an engine w/o the wrapper class.
+    
+                        // @RequestWrapper className processing
+                        String requestWrapperName = opDesc.getRequestWrapperClassName();
+                        String foundRequestWrapperName = getWrapperClass("@RequestWrapper",
+                            requestWrapperName, 
+                            packageName, 
+                            javaMethodToClassName(methodName),
+                            ed.getAxisService().getClassLoader(),
+                            serviceDesc);
+    
+                        if (foundRequestWrapperName != null) {
+                            requestWrapperMap.put(opDesc, foundRequestWrapperName);
+                        }
+    
+                        // @ResponseWrapper className processing
+                        String responseWrapperName = opDesc.getResponseWrapperClassName();
+                        String foundResponseWrapperName = getWrapperClass("@ResponseWrapper",
+                            responseWrapperName, 
+                            packageName, 
+                            javaMethodToClassName(methodName) + "Response",
+                            ed.getAxisService().getClassLoader(),
+                            serviceDesc);
+    
+                        if (foundResponseWrapperName != null) {
+                            responseWrapperMap.put(opDesc, foundResponseWrapperName);
+                        }
                     }
 
                     for (FaultDescription faultDesc : opDesc.getFaultDescriptions()) {



Mime
View raw message