You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sc...@apache.org on 2007/07/17 14:33:49 UTC
svn commit: r556904 -
/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Author: scheu
Date: Tue Jul 17 05:33:47 2007
New Revision: 556904
URL: http://svn.apache.org/viewvc?view=rev&rev=556904
Log:
AXIS2-2543
Contributor:Roy Wood
Minor change to ensure that WSDL is generated for only SOAP 1.1 based bindings.
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=556904&r1=556903&r2=556904
==============================================================================
--- 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 Tue Jul 17 05:33:47 2007
@@ -296,18 +296,21 @@
WsdlComposite wsdlComposite = null;
String bindingType = getBindingType();
- boolean isSOAP12 = (bindingType.equals( javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
- || bindingType.equals(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING))
- ? true : false;
- //Determine if we need to generate WSDL
- //First, make sure that this is not a SOAP 1.2 based binding, per JAXWS spec. we cannot
- //generate WSDL if the binding type is SOAP 1.2 based.
- //Then, assuming the composite does not contain a
- //Wsdl Definition, go ahead and generate it
+ boolean isSOAP11 =
+ (bindingType.equals(javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_BINDING) ||
+ bindingType.equals(javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING))
+ ? true : false;
+
+
+ // Determine if we need to generate WSDL
+ // First, make sure that this is only a SOAP 1.1 based binding, per JAXWS spec. we cannot
+ // generate WSDL if the binding type is not SOAP 1.1 based.
+ // Then, assuming the composite does not contain a
+ // Wsdl Definition, go ahead and generate it
// REVIEW: I think this should this be isSOAP11 so the generators are only called for
// SOAP11; i.e. NOT for SOAP12 or XML/HTTP bindings.
- if (!isSOAP12) {
+ if (isSOAP11){
if (
(isEndpointBased() &&
DescriptionUtils.isEmpty(getAnnoWebServiceEndpointInterface()))
@@ -341,7 +344,7 @@
+ composite.getClassName());
}
- if (!isSOAP12) {
+ if (isSOAP11){
//Save the WSDL Location and the WsdlDefinition, value depends on whether wsdl was generated
Parameter wsdlLocationParameter = new Parameter();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: [axis2] Re: svn commit: r556904 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Posted by R J Scheuerle Jr <sc...@us.ibm.com>.
Short Answer: The fix does not change SOAP 1.2 WSDL generation.
Long Answer::
The intent of the original code was to generate WSDL only for SOAP 1.1, as
prescribed by JAX-WS.
However the developer did not consider the XML/HTTP scenario.
The new code checks for SOAP 1.1 (instead of checking for !SOAP1.2)..
Sorry for the confusion.
Rich Scheuerle
IBM Web Services
Apache Axis2 (scheu@apache.org)
512-838-5115 (IBM TL 678-5115).
Sanjiva Weerawarana <sa...@opensource.lk> wrote on 07/17/2007 11:53:15
AM:
> scheu@apache.org wrote:
> > Author: scheu
> > Date: Tue Jul 17 05:33:47 2007
> > New Revision: 556904
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=556904
> > Log:
> > AXIS2-2543
> > Contributor:Roy Wood
> > Minor change to ensure that WSDL is generated for only SOAP 1.1
> based bindings.
>
> Sorry .. I don't quite understand the change but can you please confirm
> that this commit is not taking out SOAP 1.2 WSDL generation?
>
> Sanjiva.
> --
> Sanjiva Weerawarana, Ph.D.
> Founder & Director; Lanka Software Foundation; http://www.opensource.lk/
> Founder, Chairman & CEO; WSO2, Inc.; http://www.wso2.com/
> Director; Open Source Initiative; http://www.opensource.org/
> Member; Apache Software Foundation; http://www.apache.org/
> Visiting Lecturer; University of Moratuwa; http://www.cse.mrt.ac.lk/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-dev-help@ws.apache.org
>
[axis2] Re: svn commit: r556904 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Posted by Sanjiva Weerawarana <sa...@opensource.lk>.
scheu@apache.org wrote:
> Author: scheu
> Date: Tue Jul 17 05:33:47 2007
> New Revision: 556904
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=556904
> Log:
> AXIS2-2543
> Contributor:Roy Wood
> Minor change to ensure that WSDL is generated for only SOAP 1.1 based bindings.
Sorry .. I don't quite understand the change but can you please confirm
that this commit is not taking out SOAP 1.2 WSDL generation?
Sanjiva.
--
Sanjiva Weerawarana, Ph.D.
Founder & Director; Lanka Software Foundation; http://www.opensource.lk/
Founder, Chairman & CEO; WSO2, Inc.; http://www.wso2.com/
Director; Open Source Initiative; http://www.opensource.org/
Member; Apache Software Foundation; http://www.apache.org/
Visiting Lecturer; University of Moratuwa; http://www.cse.mrt.ac.lk/
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org