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 de...@apache.org on 2007/06/01 09:02:32 UTC

svn commit: r543410 - in /webservices/axis2/trunk/java/modules: java2wsdl/test-resources/BaseDataTypes.wsdl kernel/src/org/apache/axis2/deployment/ModuleBuilder.java

Author: deepal
Date: Fri Jun  1 00:02:31 2007
New Revision: 543410

URL: http://svn.apache.org/viewvc?view=rev&rev=543410
Log:
fixing build error in BaseDataTypes
- We do not need to get the module name attribute as module name.

Modified:
    webservices/axis2/trunk/java/modules/java2wsdl/test-resources/BaseDataTypes.wsdl
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java

Modified: webservices/axis2/trunk/java/modules/java2wsdl/test-resources/BaseDataTypes.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/test-resources/BaseDataTypes.wsdl?view=diff&rev=543410&r1=543409&r2=543410
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/test-resources/BaseDataTypes.wsdl (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/test-resources/BaseDataTypes.wsdl Fri Jun  1 00:02:31 2007
@@ -1,311 +1,365 @@
-<wsdl:definitions xmlns:axis2="http://tempuri.org" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:ns="http://tempuri.org/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://tempuri.org">
+<wsdl:definitions xmlns:axis2="http://tempuri.org"
+                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+                  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+                  xmlns:ns="http://tempuri.org/xsd"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  targetNamespace="http://tempuri.org">
     <wsdl:types>
-        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://tempuri.org/xsd">
+        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                   attributeFormDefault="qualified"
+                   elementFormDefault="qualified"
+                   targetNamespace="http://tempuri.org/xsd">
             <xs:element name="retBool">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inBool" nillable="true" type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="inBool" nillable="true"
+                                    type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retBoolResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retSByte">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inSByte" nillable="true" type="xs:byte"/>
+                        <xs:element minOccurs="0" name="inSByte" nillable="true"
+                                    type="xs:byte"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retSByteResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:byte"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:byte"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retByteArray">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inByteArray" nillable="true" type="xs:base64Binary"/>
+                        <xs:element minOccurs="0" name="inByteArray"
+                                    nillable="true" type="xs:base64Binary"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retByteArrayResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:base64Binary"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:base64Binary"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDouble">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inDouble" nillable="true" type="xs:double"/>
+                        <xs:element minOccurs="0" name="inDouble"
+                                    nillable="true" type="xs:double"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDoubleResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:double"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:double"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retFloat">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inFloat" nillable="true" type="xs:float"/>
+                        <xs:element minOccurs="0" name="inFloat" nillable="true"
+                                    type="xs:float"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retFloatResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:float"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:float"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retSingle">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inSingle" nillable="true" type="xs:float"/>
+                        <xs:element minOccurs="0" name="inSingle"
+                                    nillable="true" type="xs:float"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retSingleResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:float"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:float"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retChar">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inChar" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="inChar" nillable="true"
+                                    type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retCharResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retInt">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inInt" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="inInt" nillable="true"
+                                    type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retIntResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUShort">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inUShort" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="inUShort"
+                                    nillable="true" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUShortResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retObject">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inObject" nillable="true" type="xs:anyType"/>
+                        <xs:element minOccurs="0" name="inObject"
+                                    nillable="true" type="xs:anyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retObjectResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:anyType"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:anyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retGuid">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inGuid" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="inGuid" nillable="true"
+                                    type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retGuidResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retString">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inString" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="inString"
+                                    nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retStringResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUri">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inUri" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="inUri" nillable="true"
+                                    type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUriResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDecimal">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inDecimal" nillable="true" type="xs:decimal"/>
+                        <xs:element minOccurs="0" name="inDecimal"
+                                    nillable="true" type="xs:decimal"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDecimalResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:decimal"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:decimal"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retULong">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inULong" nillable="true" type="xs:integer"/>
+                        <xs:element minOccurs="0" name="inULong" nillable="true"
+                                    type="xs:integer"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retULongResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:integer"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:integer"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDateTime">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inDateTime" nillable="true" type="xs:dateTime"/>
+                        <xs:element minOccurs="0" name="inDateTime"
+                                    nillable="true" type="xs:dateTime"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDateTimeResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:dateTime"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:dateTime"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retTimeSpan">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inTimeSpan" nillable="true" type="xs:anyType"/>
+                        <xs:element minOccurs="0" name="inTimeSpan"
+                                    nillable="true" type="xs:anyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retTimeSpanResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:anyType"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:anyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retQName">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inQName" nillable="true" type="xs:anyType"/>
+                        <xs:element minOccurs="0" name="inQName" nillable="true"
+                                    type="xs:anyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retQNameResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:anyType"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:anyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retLong">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inLong" nillable="true" type="xs:long"/>
+                        <xs:element minOccurs="0" name="inLong" nillable="true"
+                                    type="xs:long"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retLongResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:long"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:long"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUInt">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inUInt" nillable="true" type="xs:long"/>
+                        <xs:element minOccurs="0" name="inUInt" nillable="true"
+                                    type="xs:long"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUIntResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:long"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:long"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retByte">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inByte" nillable="true" type="xs:short"/>
+                        <xs:element minOccurs="0" name="inByte" nillable="true"
+                                    type="xs:short"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retByteResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:short"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:short"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retShort">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="inShort" nillable="true" type="xs:short"/>
+                        <xs:element minOccurs="0" name="inShort" nillable="true"
+                                    type="xs:short"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retShortResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="return" nillable="true" type="xs:short"/>
+                        <xs:element minOccurs="0" name="return" nillable="true"
+                                    type="xs:short"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -445,96 +499,184 @@
     </wsdl:message>
     <wsdl:portType name="BaseDataTypesPortType">
         <wsdl:operation name="retBool">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retBool" message="axis2:retBoolMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retBoolResponseMessage" wsaw:Action="urn:retBool"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retBool"
+                        message="axis2:retBoolMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retBoolResponseMessage"
+                         wsaw:Action="urn:retBool"/>
         </wsdl:operation>
         <wsdl:operation name="retSByte">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retSByte" message="axis2:retSByteMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retSByteResponseMessage" wsaw:Action="urn:retSByte"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retSByte"
+                        message="axis2:retSByteMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retSByteResponseMessage"
+                         wsaw:Action="urn:retSByte"/>
         </wsdl:operation>
         <wsdl:operation name="retByteArray">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retByteArray" message="axis2:retByteArrayMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retByteArrayResponseMessage" wsaw:Action="urn:retByteArray"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retByteArray"
+                        message="axis2:retByteArrayMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retByteArrayResponseMessage"
+                         wsaw:Action="urn:retByteArray"/>
         </wsdl:operation>
         <wsdl:operation name="retDouble">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retDouble" message="axis2:retDoubleMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retDoubleResponseMessage" wsaw:Action="urn:retDouble"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retDouble"
+                        message="axis2:retDoubleMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retDoubleResponseMessage"
+                         wsaw:Action="urn:retDouble"/>
         </wsdl:operation>
         <wsdl:operation name="retFloat">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retFloat" message="axis2:retFloatMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retFloatResponseMessage" wsaw:Action="urn:retFloat"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retFloat"
+                        message="axis2:retFloatMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retFloatResponseMessage"
+                         wsaw:Action="urn:retFloat"/>
         </wsdl:operation>
         <wsdl:operation name="retSingle">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retSingle" message="axis2:retSingleMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retSingleResponseMessage" wsaw:Action="urn:retSingle"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retSingle"
+                        message="axis2:retSingleMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retSingleResponseMessage"
+                         wsaw:Action="urn:retSingle"/>
         </wsdl:operation>
         <wsdl:operation name="retChar">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retChar" message="axis2:retCharMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retCharResponseMessage" wsaw:Action="urn:retChar"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retChar"
+                        message="axis2:retCharMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retCharResponseMessage"
+                         wsaw:Action="urn:retChar"/>
         </wsdl:operation>
         <wsdl:operation name="retInt">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retInt" message="axis2:retIntMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retIntResponseMessage" wsaw:Action="urn:retInt"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retInt" message="axis2:retIntMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retIntResponseMessage"
+                         wsaw:Action="urn:retInt"/>
         </wsdl:operation>
         <wsdl:operation name="retUShort">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retUShort" message="axis2:retUShortMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retUShortResponseMessage" wsaw:Action="urn:retUShort"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retUShort"
+                        message="axis2:retUShortMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retUShortResponseMessage"
+                         wsaw:Action="urn:retUShort"/>
         </wsdl:operation>
         <wsdl:operation name="retObject">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retObject" message="axis2:retObjectMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retObjectResponseMessage" wsaw:Action="urn:retObject"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retObject"
+                        message="axis2:retObjectMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retObjectResponseMessage"
+                         wsaw:Action="urn:retObject"/>
         </wsdl:operation>
         <wsdl:operation name="retGuid">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retGuid" message="axis2:retGuidMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retGuidResponseMessage" wsaw:Action="urn:retGuid"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retGuid"
+                        message="axis2:retGuidMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retGuidResponseMessage"
+                         wsaw:Action="urn:retGuid"/>
         </wsdl:operation>
         <wsdl:operation name="retString">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retString" message="axis2:retStringMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retStringResponseMessage" wsaw:Action="urn:retString"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retString"
+                        message="axis2:retStringMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retStringResponseMessage"
+                         wsaw:Action="urn:retString"/>
         </wsdl:operation>
         <wsdl:operation name="retUri">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retUri" message="axis2:retUriMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retUriResponseMessage" wsaw:Action="urn:retUri"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retUri" message="axis2:retUriMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retUriResponseMessage"
+                         wsaw:Action="urn:retUri"/>
         </wsdl:operation>
         <wsdl:operation name="retDecimal">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retDecimal" message="axis2:retDecimalMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retDecimalResponseMessage" wsaw:Action="urn:retDecimal"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retDecimal"
+                        message="axis2:retDecimalMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retDecimalResponseMessage"
+                         wsaw:Action="urn:retDecimal"/>
         </wsdl:operation>
         <wsdl:operation name="retULong">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retULong" message="axis2:retULongMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retULongResponseMessage" wsaw:Action="urn:retULong"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retULong"
+                        message="axis2:retULongMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retULongResponseMessage"
+                         wsaw:Action="urn:retULong"/>
         </wsdl:operation>
         <wsdl:operation name="retDateTime">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retDateTime" message="axis2:retDateTimeMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retDateTimeResponseMessage" wsaw:Action="urn:retDateTime"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retDateTime"
+                        message="axis2:retDateTimeMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retDateTimeResponseMessage"
+                         wsaw:Action="urn:retDateTime"/>
         </wsdl:operation>
         <wsdl:operation name="retTimeSpan">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retTimeSpan" message="axis2:retTimeSpanMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retTimeSpanResponseMessage" wsaw:Action="urn:retTimeSpan"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retTimeSpan"
+                        message="axis2:retTimeSpanMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retTimeSpanResponseMessage"
+                         wsaw:Action="urn:retTimeSpan"/>
         </wsdl:operation>
         <wsdl:operation name="retQName">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retQName" message="axis2:retQNameMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retQNameResponseMessage" wsaw:Action="urn:retQName"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retQName"
+                        message="axis2:retQNameMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retQNameResponseMessage"
+                         wsaw:Action="urn:retQName"/>
         </wsdl:operation>
         <wsdl:operation name="retLong">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retLong" message="axis2:retLongMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retLongResponseMessage" wsaw:Action="urn:retLong"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retLong"
+                        message="axis2:retLongMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retLongResponseMessage"
+                         wsaw:Action="urn:retLong"/>
         </wsdl:operation>
         <wsdl:operation name="retUInt">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retUInt" message="axis2:retUIntMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retUIntResponseMessage" wsaw:Action="urn:retUInt"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retUInt"
+                        message="axis2:retUIntMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retUIntResponseMessage"
+                         wsaw:Action="urn:retUInt"/>
         </wsdl:operation>
         <wsdl:operation name="retByte">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retByte" message="axis2:retByteMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retByteResponseMessage" wsaw:Action="urn:retByte"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retByte"
+                        message="axis2:retByteMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retByteResponseMessage"
+                         wsaw:Action="urn:retByte"/>
         </wsdl:operation>
         <wsdl:operation name="retShort">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" wsaw:Action="urn:retShort" message="axis2:retShortMessage"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" message="axis2:retShortResponseMessage" wsaw:Action="urn:retShort"/>
+            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        wsaw:Action="urn:retShort"
+                        message="axis2:retShortMessage"/>
+            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                         message="axis2:retShortResponseMessage"
+                         wsaw:Action="urn:retShort"/>
         </wsdl:operation>
     </wsdl:portType>
-    <wsdl:binding name="BaseDataTypesSOAP11Binding" type="axis2:BaseDataTypesPortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <wsdl:binding name="BaseDataTypesSOAP11Binding"
+                  type="axis2:BaseDataTypesPortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
+                      style="document"/>
         <wsdl:operation name="retBool">
             <soap:operation soapAction="urn:retBool" style="document"/>
             <wsdl:input>
@@ -734,8 +876,10 @@
             </wsdl:output>
         </wsdl:operation>
     </wsdl:binding>
-    <wsdl:binding name="BaseDataTypesSOAP12Binding" type="axis2:BaseDataTypesPortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <wsdl:binding name="BaseDataTypesSOAP12Binding"
+                  type="axis2:BaseDataTypesPortType">
+        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"
+                        style="document"/>
         <wsdl:operation name="retBool">
             <soap12:operation soapAction="urn:retBool" style="document"/>
             <wsdl:input>
@@ -936,11 +1080,15 @@
         </wsdl:operation>
     </wsdl:binding>
     <wsdl:service name="BaseDataTypes">
-        <wsdl:port name="BaseDataTypesSOAP11port" binding="axis2:BaseDataTypesSOAP11Binding">
-            <soap:address location="http://localhost:8080/axis2/services/BaseDataTypes"/>
+        <wsdl:port name="BaseDataTypesSOAP11port"
+                   binding="axis2:BaseDataTypesSOAP11Binding">
+            <soap:address
+                    location="http://localhost:8080/axis2/services/BaseDataTypes"/>
         </wsdl:port>
-        <wsdl:port name="BaseDataTypesSOAP12port" binding="axis2:BaseDataTypesSOAP12Binding">
-            <soap12:address location="http://localhost:8080/axis2/services/BaseDataTypes"/>
+        <wsdl:port name="BaseDataTypesSOAP12port"
+                   binding="axis2:BaseDataTypesSOAP12Binding">
+            <soap12:address
+                    location="http://localhost:8080/axis2/services/BaseDataTypes"/>
         </wsdl:port>
     </wsdl:service>
-</wsdl:definitions>
+</wsdl:definitions>
\ No newline at end of file

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?view=diff&rev=543410&r1=543409&r2=543410
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Fri Jun  1 00:02:31 2007
@@ -83,14 +83,6 @@
     public void populateModule() throws DeploymentException {
         try {
             OMElement moduleElement = buildOM();
-
-            OMAttribute nameAtt = moduleElement.getAttribute(new QName("name"));
-            if (nameAtt != null) {
-                String moduleName = nameAtt.getAttributeValue();
-                if (moduleName != null && !"".equals(moduleName))
-                    module.setName(moduleName);
-            }
-
             // Setting Module Class , if it is there
             OMAttribute moduleClassAtt = moduleElement.getAttribute(new QName(TAG_CLASS_NAME));
 
@@ -289,7 +281,7 @@
             // processing <wsp:PolicyReference> .. </..> elements
             Iterator policyRefElements = operation.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY_REF));
 
-            if (policyRefElements != null && policyRefElements.hasNext()) {
+            if (policyRefElements != null && policyElements.hasNext()) {
                 processPolicyRefElements(PolicyInclude.AXIS_MODULE_OPERATION_POLICY, policyRefElements, module.getPolicyInclude());
             }
 



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