axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From barre...@apache.org
Subject svn commit: r528225 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Date Thu, 12 Apr 2007 20:40:57 GMT
Author: barrettj
Date: Thu Apr 12 13:40:56 2007
New Revision: 528225

URL: http://svn.apache.org/viewvc?view=rev&rev=528225
Log:
AXIS2-2522
Contributed by Dustin Amrhein.  WSDL is only attached for SOAP11.  If the WSDL exists, it
should be attached to the service for SOAP12 as well.

Modified:
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?view=diff&rev=528225&r1=528224&r2=528225
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Thu Apr 12 13:40:56 2007
@@ -384,12 +384,38 @@
                         "EndpointDescription: Unable to add parameters to AxisService");
             }
         }
+        else {
+            // Need to account for SOAP 1.2 WSDL when supplied with application
+            Parameter wsdlDefParameter = new Parameter();
+            wsdlDefParameter.setName(MDQConstants.WSDL_DEFINITION);
+            Parameter wsdlLocationParameter = new Parameter();
+            wsdlLocationParameter.setName(MDQConstants.WSDL_LOCATION);
+            if (getServiceDescriptionImpl().getWSDLWrapper() != null) {
+                wsdlLocationParameter.setValue(getAnnoWebServiceWSDLLocation());
+                wsdlDefParameter.setValue(getServiceDescriptionImpl().getWSDLWrapper()
+                    .getDefinition());
+            }
+            // No WSDL supplied and we do not generate for non-SOAP 1.1/HTTP
+            // endpoints
+            else {
+                wsdlLocationParameter.setValue(null);
+                wsdlDefParameter.setValue(null);
+            }
+            try {
+                axisService.addParameter(wsdlDefParameter);
+                axisService.addParameter(wsdlLocationParameter);
+
+            } catch (Exception e) {
+                throw ExceptionFactory
+                    .makeWebServiceException("EndpointDescription: Unable to add parameters
to AxisService");
+            }
+        }
     }
 
     /**
-     * Create from an annotated implementation or SEI class. Note this is currently used
only on the
-     * server-side (this probably won't change).
-     *
+     * Create from an annotated implementation or SEI class. Note this is
+     * currently used only on the server-side (this probably won't change).
+     * 
      * @param theClass An implemntation or SEI class
      * @param portName May be null; if so the annotation is used
      * @param parent



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message