You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2005/12/09 17:22:27 UTC

svn commit: r355529 [3/4] - in /beehive/trunk: system-controls/ system-controls/external/webservice/ system-controls/src/ejb/org/apache/beehive/controls/system/ejb/ system-controls/src/webservice/org/apache/beehive/controls/system/webservice/ system-co...

Modified: beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/ReservedKeywordRpcLit.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/ReservedKeywordRpcLit.wsdl?rev=355529&r1=355528&r2=355529&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/ReservedKeywordRpcLit.wsdl (original)
+++ beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/ReservedKeywordRpcLit.wsdl Fri Dec  9 08:21:32 2005
@@ -53,7 +53,7 @@
                     <xsd:element name="return" nillable="true" type="xsd:int"/>
                     <xsd:element name="short" nillable="true" type="xsd:int"/>
                     <xsd:element name="static" nillable="true" type="xsd:int"/>
-<!-- XMLBeans barfs - XMLBEANS-191                   <xsd:element name="strictfp" nillable="true" type="xsd:int"/> -->
+                    <!-- XMLBeans barfs - XMLBEANS-191                   <xsd:element name="strictfp" nillable="true" type="xsd:int"/> -->
                     <xsd:element name="super" nillable="true" type="xsd:int"/>
                     <xsd:element name="switch" nillable="true" type="xsd:int"/>
                     <xsd:element name="synchronized" nillable="true" type="xsd:int"/>
@@ -111,7 +111,7 @@
             <xsd:element name="return" nillable="true" type="xsd:int"/>
             <xsd:element name="short" nillable="true" type="xsd:int"/>
             <xsd:element name="static" nillable="true" type="xsd:int"/>
-<!--  XMLBeans barfs - XMLBEANS-191          <xsd:element name="strictfp" nillable="true" type="xsd:int"/> -->
+            <!--  XMLBeans barfs - XMLBEANS-191          <xsd:element name="strictfp" nillable="true" type="xsd:int"/> -->
             <xsd:element name="super" nillable="true" type="xsd:int"/>
             <xsd:element name="switch" nillable="true" type="xsd:int"/>
             <xsd:element name="synchronized" nillable="true" type="xsd:int"/>
@@ -171,7 +171,7 @@
         <wsdl:part name="return" type="impl:return"/>
         <wsdl:part name="short" type="impl:short"/>
         <wsdl:part name="static" type="impl:static"/>
-<!--  XMLBeans barfs - XMLBEANS-191      <wsdl:part name="strictfp" type="impl:strictfp"/> -->
+        <!--  XMLBeans barfs - XMLBEANS-191      <wsdl:part name="strictfp" type="impl:strictfp"/> -->
         <wsdl:part name="super" type="impl:super"/>
         <wsdl:part name="switch" type="impl:switch"/>
         <wsdl:part name="synchronized" type="impl:synchronized"/>
@@ -218,14 +218,17 @@
             <wsdl:input message="tns:reservedWordsMsg" name="dot-nameReq"/>
             <wsdl:output message="tns:reservedWordsMsg" name="dot-nameResp"/>
         </wsdl:operation>
+
         <wsdl:operation name="String">
-            <wsdl:input message="tns:reservedWordsMsg" name="String"/>
-            <wsdl:output message="tns:reservedWordsMsg" name="String"/>
+            <wsdl:input message="tns:reservedWordsMsg" name="StringReq"/>
+            <wsdl:output message="tns:reservedWordsMsg" name="StringResp"/>
         </wsdl:operation>
+
         <wsdl:operation name="dot_name4">
             <wsdl:input message="tns:reservedWordsMsg" name="dot_nameReq"/>
             <wsdl:output message="tns:reservedWordsMsg" name="dot_nameResp"/>
         </wsdl:operation>
+
         <wsdl:operation name="dot">
             <wsdl:input message="tns:reservedWordsMsg" name="dotReq"/>
             <wsdl:output message="tns:reservedWordsMsg" name="dotResp"/>
@@ -235,13 +238,15 @@
             <wsdl:input message="tns:reservedWordsMsg" name="do.tReq"/>
             <wsdl:output message="tns:reservedWordsMsg" name="do.tResp"/>
         </wsdl:operation>
+
         <wsdl:operation name="da-sh">
             <wsdl:input message="tns:reservedWordsMsg" name="da-shReq"/>
             <wsdl:output message="tns:reservedWordsMsg" name="da-shResp"/>
         </wsdl:operation>
+
         <wsdl:operation name="under_score">
-            <wsdl:input message="tns:reservedWordsMsg" name="under_score"/>
-            <wsdl:output message="tns:reservedWordsMsg" name="under_score"/>
+            <wsdl:input message="tns:reservedWordsMsg" name="under_scoreReq"/>
+            <wsdl:output message="tns:reservedWordsMsg" name="under_scoreResp"/>
         </wsdl:operation>
 
 
@@ -249,17 +254,18 @@
 
     <wsdl:binding name="ReservedWordsRpcLitSoapBinding" type="impl:ReservedWordsRpcLit">
 
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="abstract">
-        <wsdlsoap:operation soapAction="abstract"/>
-        <wsdl:input name="abstractReq">
-            <wsdlsoap:body namespace="http:/beehive.apache.org/rpc/reservedWords" use="literal"/>
-        </wsdl:input>
-        <wsdl:output name="abstractResp">
-          <wsdlsoap:body namespace="http:/beehive.apache.org/rpc/reservedWords" use="literal"/>
-       </wsdl:output>
+        <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="abstract">
+            <wsdlsoap:operation soapAction="abstract"/>
+            <wsdl:input name="abstractReq">
+                <wsdlsoap:body namespace="http:/beehive.apache.org/rpc/reservedWords" use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="abstractResp">
+                <wsdlsoap:body namespace="http:/beehive.apache.org/rpc/reservedWords" use="literal"/>
+            </wsdl:output>
+
+        </wsdl:operation>
 
-    </wsdl:operation>
         <wsdl:operation name="Exception">
             <wsdlsoap:operation soapAction="Exception"/>
             <wsdl:input name="ExceptionReq">
@@ -270,18 +276,27 @@
             </wsdl:output>
         </wsdl:operation>
 
+        <wsdl:operation name="String">
+            <wsdlsoap:operation soapAction="String"/>
+            <wsdl:input name="StringReq">
+                <wsdlsoap:body namespace="http:/beehive.apache.org/rpc/reservedWords" use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="StringResp">
+                <wsdlsoap:body namespace="http:/beehive.apache.org/rpc/reservedWords" use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
 
-    <wsdl:operation name="String">
-        <wsdlsoap:operation soapAction="String"/>
-        <wsdl:input name="StringReq">
-            <wsdlsoap:body namespace="http:/beehive.apache.org/rpc/reservedWords" use="literal"/>
-        </wsdl:input>
-        <wsdl:output name="StringResp">
-            <wsdlsoap:body namespace="http:/beehive.apache.org/rpc/reservedWords" use="literal"/>
-        </wsdl:output>
-    </wsdl:operation>
+        <wsdl:operation name="dot">
+            <wsdlsoap:operation soapAction="dot"/>
+            <wsdl:input name="dotReq">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="dotResp">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
 
-    <wsdl:operation name="dot.name1">
+        <wsdl:operation name="dot.name1">
             <wsdlsoap:operation soapAction="dot.name1"/>
             <wsdl:input name="dot.nameReq">
                 <wsdlsoap:body use="literal"/>
@@ -320,7 +335,6 @@
                 <wsdlsoap:body use="literal"/>
             </wsdl:output>
         </wsdl:operation>
-
 
         <wsdl:operation name="do.t">
             <wsdlsoap:operation soapAction="do.t"/>

Modified: beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl?rev=355529&r1=355528&r2=355529&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl (original)
+++ beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl Fri Dec  9 08:21:32 2005
@@ -121,16 +121,55 @@
    <complexType name="AddressException">
     <sequence/>
    </complexType>
-   <element name="AddressExceptionFault" type="impl:AddressException"/>
+   <element name="fault" type="impl:AddressException"/>
+   <element name="throwComplexAddressException">
+    <complexType/>
+   </element>
+   <element name="throwComplexAddressExceptionResponse">
+    <complexType>
+     <sequence>
+      <element name="return" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <complexType name="ComplexAddressException">
+    <sequence>
+     <element name="msg1" nillable="true" type="xsd:string"/>
+     <element name="msg2" nillable="true" type="xsd:string"/>
+    </sequence>
+   </complexType>
+   <element name="fault1" type="impl:ComplexAddressException"/>
+   <element name="getPhoneArray">
+    <complexType/>
+   </element>
+   <element name="getPhoneArrayResponse">
+    <complexType>
+     <sequence>
+      <element maxOccurs="unbounded" name="return" type="impl:Phone"/>
+     </sequence>
+    </complexType>
+   </element>
   </schema>
  </wsdl:types>
 
+   <wsdl:message name="throwComplexAddressExceptionResponse">
+
+      <wsdl:part element="impl:throwComplexAddressExceptionResponse" name="parameters"/>
+
+   </wsdl:message>
+
    <wsdl:message name="returnAddressFromBodyResponse">
 
       <wsdl:part element="impl:returnAddressFromBodyResponse" name="parameters"/>
 
    </wsdl:message>
 
+   <wsdl:message name="ComplexAddressException">
+
+      <wsdl:part element="impl:fault1" name="fault"/>
+
+   </wsdl:message>
+
    <wsdl:message name="returnAddressFromBodyRequest">
 
       <wsdl:part element="impl:returnAddressFromBody" name="parameters"/>
@@ -177,7 +216,7 @@
 
    <wsdl:message name="AddressException">
 
-      <wsdl:part element="impl:AddressExceptionFault" name="AddressExceptionFault"/>
+      <wsdl:part element="impl:fault" name="fault"/>
 
    </wsdl:message>
 
@@ -195,6 +234,18 @@
 
    </wsdl:message>
 
+   <wsdl:message name="throwComplexAddressExceptionRequest">
+
+      <wsdl:part element="impl:throwComplexAddressException" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getPhoneArrayRequest">
+
+      <wsdl:part element="impl:getPhoneArray" name="parameters"/>
+
+   </wsdl:message>
+
    <wsdl:message name="throwAddressExceptionRequest">
 
       <wsdl:part element="impl:throwAddressException" name="parameters"/>
@@ -209,6 +260,12 @@
 
    </wsdl:message>
 
+   <wsdl:message name="getPhoneArrayResponse">
+
+      <wsdl:part element="impl:getPhoneArrayResponse" name="parameters"/>
+
+   </wsdl:message>
+
    <wsdl:message name="createAddressInBodyResponse">
 
       <wsdl:part element="impl:createAddressInBodyResponse" name="parameters"/>
@@ -283,6 +340,24 @@
 
       </wsdl:operation>
 
+      <wsdl:operation name="throwComplexAddressException">
+
+         <wsdl:input message="impl:throwComplexAddressExceptionRequest" name="throwComplexAddressExceptionRequest"/>
+
+         <wsdl:output message="impl:throwComplexAddressExceptionResponse" name="throwComplexAddressExceptionResponse"/>
+
+         <wsdl:fault message="impl:ComplexAddressException" name="ComplexAddressException"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getPhoneArray">
+
+         <wsdl:input message="impl:getPhoneArrayRequest" name="getPhoneArrayRequest"/>
+
+         <wsdl:output message="impl:getPhoneArrayResponse" name="getPhoneArrayResponse"/>
+
+      </wsdl:operation>
+
    </wsdl:portType>
 
    <wsdl:binding name="DocumentLiteralWrappedSampleSoapBinding" type="impl:DocumentLiteralWrappedSample">
@@ -434,6 +509,48 @@
             <wsdlsoap:fault name="AddressException" use="literal"/>
 
          </wsdl:fault>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="throwComplexAddressException">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="throwComplexAddressExceptionRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="throwComplexAddressExceptionResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+         <wsdl:fault name="ComplexAddressException">
+
+            <wsdlsoap:fault name="ComplexAddressException" use="literal"/>
+
+         </wsdl:fault>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getPhoneArray">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getPhoneArrayRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getPhoneArrayResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
 
       </wsdl:operation>
 

Added: beehive/trunk/system-controls/test/src/webservice/schemas/ImagesDocLitWrapped.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/schemas/ImagesDocLitWrapped.wsdl?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/schemas/ImagesDocLitWrapped.wsdl (added)
+++ beehive/trunk/system-controls/test/src/webservice/schemas/ImagesDocLitWrapped.wsdl Fri Dec  9 08:21:32 2005
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://images.attachments" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://images.attachments" xmlns:intf="http://images.attachments" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--WSDL created by Apache Axis version: 1.2
+Built on May 03, 2005 (02:20:24 EDT)-->
+ <wsdl:types>
+  <schema elementFormDefault="qualified" targetNamespace="http://images.attachments" xmlns="http://www.w3.org/2001/XMLSchema">
+   <import namespace="http://xml.apache.org/xml-soap"/>
+   <element name="getJpgImage">
+    <complexType/>
+   </element>
+   <element name="getJpgImageResponse">
+    <complexType>
+     <sequence>
+      <element name="return" type="apachesoap:Image"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="getGifImage">
+    <complexType/>
+   </element>
+   <element name="getGifImageResponse">
+    <complexType>
+     <sequence>
+      <element name="return" type="apachesoap:Image"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="getImages">
+    <complexType/>
+   </element>
+   <element name="getImagesResponse">
+    <complexType>
+     <sequence>
+      <element maxOccurs="unbounded" name="return" type="apachesoap:Image"/>
+     </sequence>
+    </complexType>
+   </element>
+  </schema>
+ </wsdl:types>
+
+   <wsdl:message name="getImagesResponse">
+
+      <wsdl:part element="impl:getImagesResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getGifImageResponse">
+
+      <wsdl:part element="impl:getGifImageResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getJpgImageResponse">
+
+      <wsdl:part element="impl:getJpgImageResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getGifImageRequest">
+
+      <wsdl:part element="impl:getGifImage" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getJpgImageRequest">
+
+      <wsdl:part element="impl:getJpgImage" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getImagesRequest">
+
+      <wsdl:part element="impl:getImages" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:portType name="ImagesDocLitWrapped">
+
+      <wsdl:operation name="getJpgImage">
+
+         <wsdl:input message="impl:getJpgImageRequest" name="getJpgImageRequest"/>
+
+         <wsdl:output message="impl:getJpgImageResponse" name="getJpgImageResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getGifImage">
+
+         <wsdl:input message="impl:getGifImageRequest" name="getGifImageRequest"/>
+
+         <wsdl:output message="impl:getGifImageResponse" name="getGifImageResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getImages">
+
+         <wsdl:input message="impl:getImagesRequest" name="getImagesRequest"/>
+
+         <wsdl:output message="impl:getImagesResponse" name="getImagesResponse"/>
+
+      </wsdl:operation>
+
+   </wsdl:portType>
+
+   <wsdl:binding name="ImagesDocLitWrappedSoapBinding" type="impl:ImagesDocLitWrapped">
+
+      <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+      <wsdl:operation name="getJpgImage">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getJpgImageRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getJpgImageResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getGifImage">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getGifImageRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getGifImageResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getImages">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getImagesRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getImagesResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+   </wsdl:binding>
+
+   <wsdl:service name="ImagesDocLitWrappedService">
+
+      <wsdl:port binding="impl:ImagesDocLitWrappedSoapBinding" name="ImagesDocLitWrapped">
+
+         <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/attachments/images/ImagesDocLitWrapped.jws"/>
+
+      </wsdl:port>
+
+   </wsdl:service>
+
+</wsdl:definitions>

Added: beehive/trunk/system-controls/test/src/webservice/schemas/ImagesRpcLit.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/schemas/ImagesRpcLit.wsdl?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/schemas/ImagesRpcLit.wsdl (added)
+++ beehive/trunk/system-controls/test/src/webservice/schemas/ImagesRpcLit.wsdl Fri Dec  9 08:21:32 2005
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://images.attachments" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://images.attachments" xmlns:intf="http://images.attachments" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--WSDL created by Apache Axis version: 1.2
+Built on May 03, 2005 (02:20:24 EDT)-->
+ <wsdl:types>
+  <schema targetNamespace="http://images.attachments" xmlns="http://www.w3.org/2001/XMLSchema">
+   <import namespace="http://xml.apache.org/xml-soap"/>
+   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+   <complexType name="ArrayOf_apachesoap_Image">
+    <sequence>
+     <element maxOccurs="unbounded" minOccurs="0" name="item" type="apachesoap:Image"/>
+    </sequence>
+   </complexType>
+  </schema>
+ </wsdl:types>
+
+   <wsdl:message name="getImagesResponse">
+
+      <wsdl:part name="return" type="impl:ArrayOf_apachesoap_Image"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getGifImageResponse">
+
+      <wsdl:part name="return" type="apachesoap:Image"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getJpgImageResponse">
+
+      <wsdl:part name="return" type="apachesoap:Image"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getGifImageRequest">
+
+   </wsdl:message>
+
+   <wsdl:message name="getJpgImageRequest">
+
+   </wsdl:message>
+
+   <wsdl:message name="getImagesRequest">
+
+   </wsdl:message>
+
+   <wsdl:portType name="ImagesRpcLit">
+
+      <wsdl:operation name="getJpgImage">
+
+         <wsdl:input message="impl:getJpgImageRequest" name="getJpgImageRequest"/>
+
+         <wsdl:output message="impl:getJpgImageResponse" name="getJpgImageResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getGifImage">
+
+         <wsdl:input message="impl:getGifImageRequest" name="getGifImageRequest"/>
+
+         <wsdl:output message="impl:getGifImageResponse" name="getGifImageResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getImages">
+
+         <wsdl:input message="impl:getImagesRequest" name="getImagesRequest"/>
+
+         <wsdl:output message="impl:getImagesResponse" name="getImagesResponse"/>
+
+      </wsdl:operation>
+
+   </wsdl:portType>
+
+   <wsdl:binding name="ImagesRpcLitSoapBinding" type="impl:ImagesRpcLit">
+
+      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+      <wsdl:operation name="getJpgImage">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getJpgImageRequest">
+
+            <wsdlsoap:body namespace="http://images.attachments" use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getJpgImageResponse">
+
+            <wsdlsoap:body namespace="http://images.attachments" use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getGifImage">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getGifImageRequest">
+
+            <wsdlsoap:body namespace="http://images.attachments" use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getGifImageResponse">
+
+            <wsdlsoap:body namespace="http://images.attachments" use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getImages">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getImagesRequest">
+
+            <wsdlsoap:body namespace="http://images.attachments" use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getImagesResponse">
+
+            <wsdlsoap:body namespace="http://images.attachments" use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+   </wsdl:binding>
+
+   <wsdl:service name="ImagesRpcLitService">
+
+      <wsdl:port binding="impl:ImagesRpcLitSoapBinding" name="ImagesRpcLit">
+
+         <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/attachments/images/ImagesRpcLit.jws"/>
+
+      </wsdl:port>
+
+   </wsdl:service>
+
+</wsdl:definitions>

Modified: beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl?rev=355529&r1=355528&r2=355529&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl (original)
+++ beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl Fri Dec  9 08:21:32 2005
@@ -35,7 +35,7 @@
 
    <wsdl:message name="AddressException">
 
-      <wsdl:part name="AddressExceptionFault" type="impl:AddressException"/>
+      <wsdl:part name="fault" type="impl:AddressException"/>
 
    </wsdl:message>
 

Added: beehive/trunk/system-controls/test/src/webservice/schemas/rpcEncoded/ImagesRpcEnc.wsdl
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/schemas/rpcEncoded/ImagesRpcEnc.wsdl?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/schemas/rpcEncoded/ImagesRpcEnc.wsdl (added)
+++ beehive/trunk/system-controls/test/src/webservice/schemas/rpcEncoded/ImagesRpcEnc.wsdl Fri Dec  9 08:21:32 2005
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://images.attachments" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://images.attachments" xmlns:intf="http://images.attachments" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--WSDL created by Apache Axis version: 1.2
+Built on May 03, 2005 (02:20:24 EDT)-->
+ <wsdl:types>
+  <schema targetNamespace="http://images.attachments" xmlns="http://www.w3.org/2001/XMLSchema">
+   <import namespace="http://xml.apache.org/xml-soap"/>
+   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+   <complexType name="ArrayOf_apachesoap_Image">
+    <complexContent>
+     <restriction base="soapenc:Array">
+      <attribute ref="soapenc:arrayType" wsdl:arrayType="apachesoap:Image[]"/>
+     </restriction>
+    </complexContent>
+   </complexType>
+  </schema>
+ </wsdl:types>
+
+   <wsdl:message name="getImagesResponse">
+
+      <wsdl:part name="return" type="impl:ArrayOf_apachesoap_Image"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getGifImageResponse">
+
+      <wsdl:part name="return" type="apachesoap:Image"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getJpgImageResponse">
+
+      <wsdl:part name="return" type="apachesoap:Image"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="getGifImageRequest">
+
+   </wsdl:message>
+
+   <wsdl:message name="getJpgImageRequest">
+
+   </wsdl:message>
+
+   <wsdl:message name="getImagesRequest">
+
+   </wsdl:message>
+
+   <wsdl:portType name="ImagesRpcEnc">
+
+      <wsdl:operation name="getJpgImage">
+
+         <wsdl:input message="impl:getJpgImageRequest" name="getJpgImageRequest"/>
+
+         <wsdl:output message="impl:getJpgImageResponse" name="getJpgImageResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getGifImage">
+
+         <wsdl:input message="impl:getGifImageRequest" name="getGifImageRequest"/>
+
+         <wsdl:output message="impl:getGifImageResponse" name="getGifImageResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getImages">
+
+         <wsdl:input message="impl:getImagesRequest" name="getImagesRequest"/>
+
+         <wsdl:output message="impl:getImagesResponse" name="getImagesResponse"/>
+
+      </wsdl:operation>
+
+   </wsdl:portType>
+
+   <wsdl:binding name="ImagesRpcEncSoapBinding" type="impl:ImagesRpcEnc">
+
+      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+      <wsdl:operation name="getJpgImage">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getJpgImageRequest">
+
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://images.attachments" use="encoded"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getJpgImageResponse">
+
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://images.attachments" use="encoded"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getGifImage">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getGifImageRequest">
+
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://images.attachments" use="encoded"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getGifImageResponse">
+
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://images.attachments" use="encoded"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="getImages">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="getImagesRequest">
+
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://images.attachments" use="encoded"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="getImagesResponse">
+
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://images.attachments" use="encoded"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+   </wsdl:binding>
+
+   <wsdl:service name="ImagesRpcEncService">
+
+      <wsdl:port binding="impl:ImagesRpcEncSoapBinding" name="ImagesRpcEnc">
+
+         <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/attachments/images/ImagesRpcEnc.jws"/>
+
+      </wsdl:port>
+
+   </wsdl:service>
+
+</wsdl:definitions>

Added: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/attachments/ImageAttachments.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/attachments/ImageAttachments.java?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/attachments/ImageAttachments.java (added)
+++ beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/attachments/ImageAttachments.java Fri Dec  9 08:21:32 2005
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.attachments;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.ByteArrayOutputStream;
+import java.awt.*;
+
+/**
+ */
+public abstract class ImageAttachments {
+
+    public abstract Image getJpgImage();
+
+    public abstract Image getGifImage();
+
+    public abstract Image[] getImages();
+
+    protected abstract InputStream getResourceStream(String imageName);
+
+    protected Image loadImage(String imageName) {
+
+//        InputStream is = ImageAttachments.class.getResourceAsStream(imageName);
+        InputStream is = getResourceStream(imageName);
+
+        byte[] buffer = new byte[1024];
+        byte[] content = null;
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+        try {
+            int count;
+            while ((count = is.read(buffer, 0, buffer.length)) > 0) {
+                os.write(buffer, 0, count);
+            }
+            content = os.toByteArray();
+            is.close();
+            os.close();
+
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+            return null;
+        }
+
+        MediaTracker tracker = new MediaTracker(new Component() {});
+        Image img = Toolkit.getDefaultToolkit().createImage(content);
+        tracker.addImage(img, 0);
+        try {
+            tracker.waitForAll();
+        }
+        catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        return img;
+    }
+}

Propchange: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/attachments/ImageAttachments.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/ComplexAddressException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/ComplexAddressException.java?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/ComplexAddressException.java (added)
+++ beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/ComplexAddressException.java Fri Dec  9 08:21:32 2005
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.doclitwrap;
+
+
+public class ComplexAddressException extends Exception implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String _msg1;
+    private String _msg2;
+
+    public ComplexAddressException() { }
+    public ComplexAddressException(String msg1, String msg2) {
+        _msg1 = msg1;
+        _msg2 = msg2;
+    }
+
+    public void setMsg1(String msg1) {
+        _msg1 = msg1;
+    }
+
+    public void setMsg2(String msg2) {
+        _msg1 = msg2;
+    }
+
+    public String getMsg1() { return _msg1; }
+    public String getMsg2() { return _msg2; }
+}

Added: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesDocLitWrapped.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesDocLitWrapped.java?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesDocLitWrapped.java (added)
+++ beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesDocLitWrapped.java Fri Dec  9 08:21:32 2005
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package attachments.images;
+
+import org.apache.beehive.attachments.ImageAttachments;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import java.awt.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+
+/**
+ * Purpose:
+ */
+@WebService()
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL,
+             parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public class ImagesDocLitWrapped extends ImageAttachments {
+
+    @WebMethod()
+    public Image getJpgImage() {
+        return loadImage("resources/bird1.jpg");
+    }
+
+    @WebMethod()
+    public Image getGifImage() {
+        return loadImage("resources/beehive_logo.gif");
+    }
+
+    @WebMethod()
+    public Image[] getImages() {
+        Image[] images = new Image[2];
+        images[0] = getJpgImage();
+        images[1] = getGifImage();
+        return images;
+    }
+
+    protected InputStream getResourceStream(String nm) {
+        return ImagesDocLitWrapped.class.getResourceAsStream(nm);
+    }
+//    private Image loadImage(String imageName) {
+//
+//        InputStream is = attachments.images.ImagesDocLitWrapped.class.getResourceAsStream(imageName);
+//
+//        byte[] buffer = new byte[1024];
+//        byte[] content = null;
+//        ByteArrayOutputStream os = new ByteArrayOutputStream();
+//
+//        try {
+//            int count;
+//            while ((count = is.read(buffer, 0, buffer.length)) > 0) {
+//                os.write(buffer, 0, count);
+//            }
+//            content = os.toByteArray();
+//            is.close();
+//            os.close();
+//
+//        } catch (IOException ioe) {
+//            ioe.printStackTrace();
+//            return null;
+//        }
+//
+//        MediaTracker tracker = new MediaTracker(new Component() {});
+//        Image img = Toolkit.getDefaultToolkit().createImage(content);
+//        tracker.addImage(img, 0);
+//        try {
+//            tracker.waitForAll();
+//        }
+//        catch (InterruptedException e) {
+//            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+//        }
+//
+//        return img;
+//    }
+}

Propchange: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesDocLitWrapped.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcEnc.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcEnc.java?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcEnc.java (added)
+++ beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcEnc.java Fri Dec  9 08:21:32 2005
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package attachments.images;
+
+import org.apache.beehive.attachments.ImageAttachments;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import java.awt.Image;
+import java.io.InputStream;
+
+/**
+ * Purpose:
+ */
+@WebService()
+@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.ENCODED)
+public class ImagesRpcEnc extends ImageAttachments {
+
+    @WebMethod()
+    public Image getJpgImage() {
+        return loadImage("resources/bird1.jpg");
+    }
+
+    @WebMethod()
+    public Image getGifImage() {
+        return loadImage("resources/beehive_logo.gif");
+    }
+
+    @WebMethod()
+    public Image[] getImages() {
+        Image[] images = new Image[2];
+        images[0] = getJpgImage();
+        images[1] = getGifImage();
+        return images;
+    }
+
+    protected InputStream getResourceStream(String nm) {
+        return ImagesRpcEnc.class.getResourceAsStream(nm);
+    }
+}

Propchange: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcEnc.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcLit.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcLit.java?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcLit.java (added)
+++ beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcLit.java Fri Dec  9 08:21:32 2005
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package attachments.images;
+
+import org.apache.beehive.attachments.ImageAttachments;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import java.awt.Image;
+import java.io.InputStream;
+
+/**
+ * Purpose:
+ */
+@WebService()
+@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL,
+             parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public class ImagesRpcLit extends ImageAttachments {
+
+    @WebMethod()
+    public Image getJpgImage() {
+        return loadImage("resources/bird1.jpg");
+    }
+
+    @WebMethod()
+    public Image getGifImage() {
+        return loadImage("resources/beehive_logo.gif");
+    }
+
+    @WebMethod()
+    public Image[] getImages() {
+        Image[] images = new Image[2];
+        images[0] = getJpgImage();
+        images[1] = getGifImage();
+        return images;
+    }
+
+    protected InputStream getResourceStream(String nm) {
+        return ImagesRpcLit.class.getResourceAsStream(nm);
+    }
+}

Propchange: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/ImagesRpcLit.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/resources/beehive_logo.gif
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/resources/beehive_logo.gif?rev=355529&view=auto
==============================================================================
Binary file - no diff available.

Propchange: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/resources/beehive_logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/resources/bird1.jpg
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/resources/bird1.jpg?rev=355529&view=auto
==============================================================================
Binary file - no diff available.

Propchange: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/attachments/images/resources/bird1.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Modified: beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex/DocumentLiteralWrappedSample.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex/DocumentLiteralWrappedSample.java?rev=355529&r1=355528&r2=355529&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex/DocumentLiteralWrappedSample.java (original)
+++ beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex/DocumentLiteralWrappedSample.java Fri Dec  9 08:21:32 2005
@@ -27,6 +27,7 @@
 import org.apache.beehive.doclitwrap.Address;
 import org.apache.beehive.doclitwrap.AddressHolder;
 import org.apache.beehive.doclitwrap.AddressException;
+import org.apache.beehive.doclitwrap.ComplexAddressException;
 import org.apache.beehive.doclitwrap.Phone;
 import org.apache.beehive.doclitwrap.StateType;
 
@@ -127,5 +128,19 @@
     @WebResult(name="ThrowAddressExceptionResult")
     public int throwAddressException(@WebParam(name="in_param") int value) throws AddressException {
         throw new AddressException("AddressException; input value=\"" + value + "\"");
+    }
+
+    @WebMethod()
+    public int throwComplexAddressException() throws ComplexAddressException {
+        throw new ComplexAddressException("FirstMessage", "SecondMessage");
+    }
+
+
+    @WebMethod
+    public Phone[] getPhoneArray() {
+        Phone[] result = new Phone[2];
+        result[0] = new Phone(111, "ex", "123-4567");
+        result[1] = new Phone(222, "ex", "890-1234");
+        return result;
     }
 }

Added: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java (added)
+++ beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java Fri Dec  9 08:21:32 2005
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beehive.controls.system.webservice.units;
+
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import test.SoapMarshallingDocLitWrappedService;
+
+import javax.xml.namespace.QName;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.awt.*;
+
+
+public class ImageAttachementDocLitWrappedTest
+    extends ControlTestCase {
+
+    @Control
+    public test.ImagesDocLitWrappedService client;
+
+    public void testJpgImage() throws Exception {
+        Image img = client.getJpgImage();
+        assertNotNull(img);
+        assertEquals(125, img.getHeight(null));
+        assertEquals(125, img.getWidth(null));
+    }
+
+    public void testGifImage() throws Exception {
+        Image img = client.getGifImage();
+        assertNotNull(img);
+        assertEquals(51, img.getHeight(null));
+        assertEquals(324, img.getWidth(null));
+    }
+
+    public void testImageArray() throws Exception {
+        Image[] images = client.getImages();
+        assertNotNull(images);
+
+        assertEquals(125, images[0].getHeight(null));
+        assertEquals(125, images[0].getWidth(null));
+
+        assertEquals(51, images[1].getHeight(null));
+        assertEquals(324, images[1].getWidth(null));
+    }
+
+    public void setUp() throws Exception {
+        try {
+            super.setUp();
+            initializeControls(this);
+            setMyControlObject(client);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public ImageAttachementDocLitWrappedTest() throws Exception { }
+
+    public static Test suite() { return new TestSuite(ImageAttachementDocLitWrappedTest.class); }
+
+    public static void main(String[] args) { junit.textui.TestRunner.run(suite()); }
+}
\ No newline at end of file

Propchange: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java (added)
+++ beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java Fri Dec  9 08:21:32 2005
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beehive.controls.system.webservice.units;
+
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import test.SoapMarshallingDocLitWrappedService;
+
+import javax.xml.namespace.QName;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.awt.*;
+
+
+public class ImageAttachementRpcEncTest
+    extends ControlTestCase {
+
+    @Control
+    public test.ImagesRpcEncService client;
+
+// TODO: broken suspect bug in WSM needs further investigation
+//    public void testJpgImage() throws Exception {
+//        Image img = client.getJpgImage();
+//        assertNotNull(img);
+//        assertEquals(125, img.getHeight(null));
+//        assertEquals(125, img.getWidth(null));
+//    }
+
+// TODO: broken suspect bug in WSM needs further investigation
+//    public void testGifImage() throws Exception {
+//        Image img = client.getGifImage();
+//        assertNotNull(img);
+//        assertEquals(51, img.getHeight(null));
+//        assertEquals(324, img.getWidth(null));
+//    }
+
+    public void testImageArray() throws Exception {
+        Image[] images = client.getImages();
+        assertNotNull(images);
+        assertEquals(125, images[0].getHeight(null));
+        assertEquals(125, images[0].getWidth(null));
+        assertEquals(51, images[1].getHeight(null));
+        assertEquals(324, images[1].getWidth(null));
+    }
+
+    public void setUp() throws Exception {
+        try {
+            super.setUp();
+            initializeControls(this);
+            setMyControlObject(client);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public ImageAttachementRpcEncTest() throws Exception { }
+
+    public static Test suite() { return new TestSuite(ImageAttachementRpcEncTest.class); }
+
+    public static void main(String[] args) { junit.textui.TestRunner.run(suite()); }
+}
\ No newline at end of file

Propchange: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java?rev=355529&view=auto
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java (added)
+++ beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java Fri Dec  9 08:21:32 2005
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beehive.controls.system.webservice.units;
+
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import test.SoapMarshallingDocLitWrappedService;
+
+import javax.xml.namespace.QName;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.awt.*;
+
+
+public class ImageAttachementRpcLitTest
+    extends ControlTestCase {
+
+    @Control
+    public test.ImagesRpcLitService client;
+
+    public void testJpgImage() throws Exception {
+        Image img = client.getJpgImage();
+        assertNotNull(img);
+        assertEquals(125, img.getHeight(null));
+        assertEquals(125, img.getWidth(null));
+    }
+
+    public void testGifImage() throws Exception {
+        Image img = client.getGifImage();
+        assertNotNull(img);
+        assertEquals(51, img.getHeight(null));
+        assertEquals(324, img.getWidth(null));
+    }
+
+    public void testImageArray() throws Exception {
+        Image[] images = client.getImages();
+        assertNotNull(images);
+        assertEquals(125, images[0].getHeight(null));
+        assertEquals(125, images[0].getWidth(null));
+        assertEquals(51, images[1].getHeight(null));
+        assertEquals(324, images[1].getWidth(null));
+    }
+
+    public void setUp() throws Exception {
+        try {
+            super.setUp();
+            initializeControls(this);
+            setMyControlObject(client);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public ImageAttachementRpcLitTest() throws Exception { }
+
+    public static Test suite() { return new TestSuite(ImageAttachementRpcLitTest.class); }
+
+    public static void main(String[] args) { junit.textui.TestRunner.run(suite()); }
+}
\ No newline at end of file

Propchange: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java?rev=355529&r1=355528&r2=355529&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java (original)
+++ beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java Fri Dec  9 08:21:32 2005
@@ -101,11 +101,10 @@
     public void testCreateAddressInBody() throws Exception {
         web.complex3.Address addr = web.complex3.Address.Factory.newInstance();
         GenericHolder<web.complex3.Address> gHolder = new GenericHolder<web.complex3.Address>(addr);
-        IntHolder iHolder = new IntHolder();
 
-        client.createAddressInBody(gHolder, iHolder);
+        int result = client.createAddressInBody(gHolder);
 
-        assertEquals(77, iHolder.value);
+        assertEquals(77, result);
 
         addr = gHolder.value;
         assertEquals("PA", addr.getState().getState());
@@ -121,11 +120,10 @@
     public void testCreateAddressInHeader() throws Exception {
         web.complex3.Address addr = web.complex3.Address.Factory.newInstance();
         GenericHolder<web.complex3.Address> gHolder = new GenericHolder<web.complex3.Address>(addr);
-        IntHolder iHolder = new IntHolder();
 
-        client.createAddressInHeader(gHolder, iHolder);
+        int result = client.createAddressInHeader(gHolder);
 
-        assertEquals(-1, iHolder.value);
+        assertEquals(-1, result);
 
         addr = gHolder.value;
         assertEquals("CA", addr.getState().getState());
@@ -166,18 +164,16 @@
         assertEquals(addr.getZip() + 1, returnAddr.getZip());
     }
 
-/*  Not working...
     public void testThrowAddressException() throws Exception {
 
         try {
             client.throwAddressException(66);
         } catch (Exception e) {
-            assertEquals("org.apache.beehive.rpclit.AddressException: AddressException; input value=\"66\"", e.getMessage());
+            assertEquals("org.apache.beehive.rpclit.AddressException: This is a sample message for:\n\tAddressException; input value=\"66\"", e.getMessage());
             return;
         }
         fail("Expected AddressException to be thrown!");
     }
-*/
 
     public void setUp() throws Exception {
         try {

Modified: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java?rev=355529&r1=355528&r2=355529&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java (original)
+++ beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java Fri Dec  9 08:21:32 2005
@@ -34,14 +34,18 @@
     @Control
     public SoapMarshallingRpcEncArrayTypesService client;
 
+    public void testNothing() throws Exception {
+        assertTrue(true);
+    }
+
     public void testEchobooleanArray() throws Exception {
         boolean[] array = new boolean[]{true, false, true};
-        assertTrue(Arrays.equals(array, (boolean[])client.echoboolean(array)));
+        assertTrue(Arrays.equals(array, client.echoboolean(array)));
     }
 
     public void testEchoBooleanArray() throws Exception {
         Boolean[] array = new Boolean[]{true, false, true};
-        assertTrue(Arrays.equals(array, (Boolean[])client.echoBoolean(array)));
+        assertTrue(Arrays.equals(array, client.echoBoolean(array)));
     }
 
     public void testEchobyteArray() throws Exception {
@@ -51,72 +55,72 @@
 
     public void testEchoByteArray() throws Exception {
         Byte[] array = new Byte[] {Byte.MAX_VALUE, Byte.MIN_VALUE};
-        assertTrue(Arrays.equals(array, (Byte[])client.echoByte(array)));
+        assertTrue(Arrays.equals(array, client.echoByte(array)));
     }
 
     public void testEchoshortArray() throws Exception {
         short[] array = new short[]{Short.MAX_VALUE, 0, Short.MAX_VALUE};
-        assertTrue(Arrays.equals(array, (short[])client.echoshort(array)));
+        assertTrue(Arrays.equals(array, client.echoshort(array)));
     }
 
     public void testEchoShortArray() throws Exception {
         Short[] array = new Short[]{Short.MAX_VALUE, Short.MIN_VALUE};
-        assertTrue(Arrays.equals(array, (Short[])client.echoShort(array)));
+        assertTrue(Arrays.equals(array, client.echoShort(array)));
     }
 
     public void testEchointArray() throws Exception {
         int[] array = new int[]{Integer.MAX_VALUE, 0, Integer.MAX_VALUE};
-        assertTrue(Arrays.equals(array, (int[])client.echoint(array)));
+        assertTrue(Arrays.equals(array, client.echoint(array)));
     }
 
     public void testEchoIntegerArray() throws Exception {
         Integer[] array = new Integer[]{Integer.MAX_VALUE, Integer.MIN_VALUE};
-        assertTrue(Arrays.equals(array, (Integer[])client.echoInteger(array)));
+        assertTrue(Arrays.equals(array, client.echoInteger(array)));
     }
 
     public void testEcholongArray() throws Exception {
         long[] array = new long[]{Long.MAX_VALUE, 0, Long.MAX_VALUE};
-        assertTrue(Arrays.equals(array, (long[])client.echolong(array)));
+        assertTrue(Arrays.equals(array, client.echolong(array)));
     }
 
     public void testEchoLongArray() throws Exception {
         Long[] array = new Long[]{Long.MAX_VALUE, Long.MIN_VALUE};
-        assertTrue(Arrays.equals(array, (Long[])client.echoLong(array)));
+        assertTrue(Arrays.equals(array, client.echoLong(array)));
     }
 
     public void testEchoBigIntegerArray() throws Exception {
         BigInteger[] array = new BigInteger[]{BigInteger.TEN, BigInteger.ONE, BigInteger.TEN};
-        assertTrue(Arrays.equals(array, (BigInteger[])client.echoBigInteger(array)));
+        assertTrue(Arrays.equals(array, client.echoBigInteger(array)));
     }
 
     public void testEchofloatArray() throws Exception {
         float[] array = new float[]{Float.MAX_VALUE, 0, Float.MAX_VALUE};
-        assertTrue(Arrays.equals(array, (float[])client.echofloat(array)));
+        assertTrue(Arrays.equals(array, client.echofloat(array)));
     }
 
     public void testEchoFloatArray() throws Exception {
         Float[] array = new Float[]{Float.MAX_VALUE, Float.MIN_VALUE};
-        assertTrue(Arrays.equals(array, (Float[])client.echoFloat(array)));
+        assertTrue(Arrays.equals(array, client.echoFloat(array)));
     }
 
     public void testEchodoubleArray() throws Exception {
         double[] array = new double[]{Double.MAX_VALUE, 0, Double.MAX_VALUE};
-        assertTrue(Arrays.equals(array, (double[])client.echodouble(array)));
+        assertTrue(Arrays.equals(array, client.echodouble(array)));
     }
 
     public void testEchoDoubleArray() throws Exception {
         Double[] array = new Double[]{Double.MAX_VALUE, Double.MIN_VALUE};
-        assertTrue(Arrays.equals(array, (Double[])client.echoDouble(array)));
+        assertTrue(Arrays.equals(array, client.echoDouble(array)));
     }
 
     public void testEchoBigDecimalArray() throws Exception {
         BigDecimal[] array = new BigDecimal[]{BigDecimal.TEN, BigDecimal.ONE, BigDecimal.TEN};
-        assertTrue(Arrays.equals(array, (BigDecimal[])client.echoBigDecimal(array)));
+        assertTrue(Arrays.equals(array, client.echoBigDecimal(array)));
     }
 
     public void testEchoStringArray() throws Exception {
         String[] array = new String[]{"Hello", ",", "World!"};
-        assertTrue(Arrays.equals(array, (String[])client.echoString(array)));
+        assertTrue(Arrays.equals(array, client.echoString(array)));
     }
 
 // @todo: appears to be a bug in AXIS - see JavaUtils.convert() there are special cases for converting
@@ -134,7 +138,7 @@
         Calendar cal = new GregorianCalendar();
         cal.setTimeInMillis(123456789);
         Calendar[] array = new Calendar[] {cal, cal};
-        Calendar[] result = (Calendar[])client.echoCalendar(array);
+        Calendar[] result = client.echoCalendar(array);
         assertEquals(0, cal.compareTo(result[0]));
         assertEquals(0, cal.compareTo(result[1]));
     }
@@ -142,7 +146,7 @@
     public void testEchoQNameArray() throws Exception {
         QName qname = new QName("http://foo.bar", "foofoo");
         QName array[] = new QName[]{qname, qname};
-        assertTrue(Arrays.equals(array, (QName[])client.echoQName(array)));
+        assertTrue(Arrays.equals(array, client.echoQName(array)));
     }
 
     public void setUp() throws Exception {

Modified: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java?rev=355529&r1=355528&r2=355529&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java (original)
+++ beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java Fri Dec  9 08:21:32 2005
@@ -34,31 +34,22 @@
     @Control
     public SoapMarshallingRpcLitArrayTypesService client;
 
-
     public void testEchobooleanArray() throws Exception {
-        soapMarshalling.ArrayOfXsdBoolean ar = soapMarshalling.ArrayOfXsdBoolean.Factory.newInstance();
-        ar.addItem(true);
-        ar.addItem(false);
-
-        soapMarshalling.ArrayOfXsdBoolean result = client.echoboolean(ar);
-        boolean[] array = result.getItemArray();
-        assertEquals(2, array.length);
-        assertEquals(true, array[0]);
-        assertEquals(false, array[1]);
+        boolean[] ar = new boolean[] {true, false};
+        boolean[] result = client.echoboolean(ar);
+        assertEquals(2, result.length);
+        assertEquals(true, result[0]);
+        assertEquals(false, result[1]);
     }
 
     public void testEchoBooleanArray() throws Exception {
-        soapMarshalling.ArrayOfXsdBoolean ar = soapMarshalling.ArrayOfXsdBoolean.Factory.newInstance();
-        ar.addItem(true);
-        ar.addItem(false);
-        ar.addItem(true);
-
-        soapMarshalling.ArrayOfXsdBoolean result = client.echoBoolean(ar);
-        boolean[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(true, array[0]);
-        assertEquals(false, array[1]);
-        assertEquals(true, array[2]);
+        boolean[] ar = new boolean[] {true, false, true};
+
+        boolean[] result = client.echoBoolean(ar);
+        assertEquals(3, result.length);
+        assertEquals(true, result[0]);
+        assertEquals(false, result[1]);
+        assertEquals(true, result[2]);
     }
 
     public void testEchobyteArray() throws Exception {
@@ -66,200 +57,130 @@
         assertTrue(Arrays.equals(array, client.echobyte(array)));
     }
 
-    public void testEchoByteArray() throws Exception {
-        soapMarshalling.ArrayOfXsdByte ar = soapMarshalling.ArrayOfXsdByte.Factory.newInstance();
-        ar.addItem(Byte.MAX_VALUE);
-        ar.addItem(Byte.MIN_VALUE);
-        ar.addItem(Byte.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdByte result = client.echoByte(ar);
-        byte[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Byte.MAX_VALUE, array[0]);
-        assertEquals(Byte.MIN_VALUE, array[1]);
-        assertEquals(Byte.MAX_VALUE, array[2]);
-    }
+//    public void testEchoByteArray() throws Exception {
+//        byte[] ar = new byte[]{Byte.MAX_VALUE, Byte.MIN_VALUE, Byte.MAX_VALUE};
+//        byte[] result = client.echoByte(ar);
+//        assertEquals(3, result.length);
+//        assertEquals(Byte.MAX_VALUE, result[0]);
+//        assertEquals(Byte.MIN_VALUE, result[1]);
+//        assertEquals(Byte.MAX_VALUE, result[2]);
+//    }
 
     public void testEchoshortArray() throws Exception {
-        soapMarshalling.ArrayOfXsdShort ar = soapMarshalling.ArrayOfXsdShort.Factory.newInstance();
-        ar.addItem(Short.MAX_VALUE);
-        ar.addItem(Short.MIN_VALUE);
-        ar.addItem(Short.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdShort result = client.echoshort(ar);
-        short[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Short.MAX_VALUE, array[0]);
-        assertEquals(Short.MIN_VALUE, array[1]);
-        assertEquals(Short.MAX_VALUE, array[2]);
+        short[] ar = new short[] {Short.MAX_VALUE, Short.MIN_VALUE, Short.MAX_VALUE};
+        short[] result = client.echoshort(ar);
+        assertEquals(3, result.length);
+        assertEquals(Short.MAX_VALUE, result[0]);
+        assertEquals(Short.MIN_VALUE, result[1]);
+        assertEquals(Short.MAX_VALUE, result[2]);
     }
 
     public void testEchoShortArray() throws Exception {
-        soapMarshalling.ArrayOfXsdShort ar = soapMarshalling.ArrayOfXsdShort.Factory.newInstance();
-        ar.addItem(Short.MAX_VALUE);
-        ar.addItem(Short.MIN_VALUE);
-        ar.addItem(Short.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdShort result = client.echoShort(ar);
-        short[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Short.MAX_VALUE, array[0]);
-        assertEquals(Short.MIN_VALUE, array[1]);
-        assertEquals(Short.MAX_VALUE, array[2]);
+        short[] ar = new short[] {Short.MAX_VALUE, Short.MIN_VALUE, Short.MAX_VALUE};
+        short[] result = client.echoShort(ar);
+        assertEquals(3, result.length);
+        assertEquals(Short.MAX_VALUE, result[0]);
+        assertEquals(Short.MIN_VALUE, result[1]);
+        assertEquals(Short.MAX_VALUE, result[2]);
     }
 
     public void testEchointArray() throws Exception {
-        soapMarshalling.ArrayOfXsdInt ar = soapMarshalling.ArrayOfXsdInt.Factory.newInstance();
-        ar.addItem(Integer.MAX_VALUE);
-        ar.addItem(Integer.MIN_VALUE);
-        ar.addItem(Integer.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdInt result = client.echoint(ar);
-        int[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Integer.MAX_VALUE, array[0]);
-        assertEquals(Integer.MIN_VALUE, array[1]);
-        assertEquals(Integer.MAX_VALUE, array[2]);
+        int[] ar = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE};
+        int[] result = client.echoint(ar);
+        assertEquals(3, result.length);
+        assertEquals(Integer.MAX_VALUE, result[0]);
+        assertEquals(Integer.MIN_VALUE, result[1]);
+        assertEquals(Integer.MAX_VALUE, result[2]);
     }
 
     public void testEchoIntegerArray() throws Exception {
-        soapMarshalling.ArrayOfXsdInt ar = soapMarshalling.ArrayOfXsdInt.Factory.newInstance();
-        ar.addItem(Integer.MAX_VALUE);
-        ar.addItem(Integer.MIN_VALUE);
-        ar.addItem(Integer.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdInt result = client.echoInteger(ar);
-        int[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Integer.MAX_VALUE, array[0]);
-        assertEquals(Integer.MIN_VALUE, array[1]);
-        assertEquals(Integer.MAX_VALUE, array[2]);
+        int[] ar = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE};
+        int[] result = client.echoInteger(ar);
+        assertEquals(3, result.length);
+        assertEquals(Integer.MAX_VALUE, result[0]);
+        assertEquals(Integer.MIN_VALUE, result[1]);
+        assertEquals(Integer.MAX_VALUE, result[2]);
     }
 
     public void testEcholongArray() throws Exception {
-        soapMarshalling.ArrayOfXsdLong ar = soapMarshalling.ArrayOfXsdLong.Factory.newInstance();
-        ar.addItem(Long.MAX_VALUE);
-        ar.addItem(Long.MIN_VALUE);
-        ar.addItem(Long.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdLong result = client.echolong(ar);
-        long[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Long.MAX_VALUE, array[0]);
-        assertEquals(Long.MIN_VALUE, array[1]);
-        assertEquals(Long.MAX_VALUE, array[2]);
+        long[] ar = new long[] {Long.MAX_VALUE,  Long.MIN_VALUE, Long.MAX_VALUE};
+        long[] result = client.echolong(ar);
+        assertEquals(3, result.length);
+        assertEquals(Long.MAX_VALUE, result[0]);
+        assertEquals(Long.MIN_VALUE, result[1]);
+        assertEquals(Long.MAX_VALUE, result[2]);
     }
 
     public void testEchoLongArray() throws Exception {
-        soapMarshalling.ArrayOfXsdLong ar = soapMarshalling.ArrayOfXsdLong.Factory.newInstance();
-        ar.addItem(Long.MAX_VALUE);
-        ar.addItem(Long.MIN_VALUE);
-        ar.addItem(Long.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdLong result = client.echoLong(ar);
-        long[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Long.MAX_VALUE, array[0]);
-        assertEquals(Long.MIN_VALUE, array[1]);
-        assertEquals(Long.MAX_VALUE, array[2]);
+        long[] ar = new long[] {Long.MAX_VALUE,  Long.MIN_VALUE, Long.MAX_VALUE};
+        long[] result = client.echoLong(ar);
+        assertEquals(3, result.length);
+        assertEquals(Long.MAX_VALUE, result[0]);
+        assertEquals(Long.MIN_VALUE, result[1]);
+        assertEquals(Long.MAX_VALUE, result[2]);
     }
 
     public void testEchoBigIntegerArray() throws Exception {
-        soapMarshalling.ArrayOfXsdInteger ar = soapMarshalling.ArrayOfXsdInteger.Factory.newInstance();
-        ar.addItem(BigInteger.TEN);
-        ar.addItem(BigInteger.ONE);
-        ar.addItem(BigInteger.TEN);
-
-        soapMarshalling.ArrayOfXsdInteger result = client.echoBigInteger(ar);
-        BigInteger[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(BigInteger.TEN, array[0]);
-        assertEquals(BigInteger.ONE, array[1]);
-        assertEquals(BigInteger.TEN, array[2]);
+        BigInteger[] ar = new BigInteger[] {BigInteger.TEN, BigInteger.ONE, BigInteger.TEN};
+        BigInteger[] result = client.echoBigInteger(ar);
+        assertEquals(3, result.length);
+        assertEquals(BigInteger.TEN, result[0]);
+        assertEquals(BigInteger.ONE, result[1]);
+        assertEquals(BigInteger.TEN, result[2]);
     }
 
     public void testEchofloatArray() throws Exception {
-        soapMarshalling.ArrayOfXsdFloat ar = soapMarshalling.ArrayOfXsdFloat.Factory.newInstance();
-        ar.addItem(Float.MAX_VALUE);
-        ar.addItem(Float.MIN_VALUE);
-        ar.addItem(Float.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdFloat result = client.echofloat(ar);
-        float[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Float.MAX_VALUE, array[0]);
-        assertEquals(Float.MIN_VALUE, array[1]);
-        assertEquals(Float.MAX_VALUE, array[2]);
+        float[] ar = new float[] {Float.MAX_VALUE,  Float.MIN_VALUE, Float.MAX_VALUE};
+        float[] result = client.echofloat(ar);
+        assertEquals(3, result.length);
+        assertEquals(Float.MAX_VALUE, result[0]);
+        assertEquals(Float.MIN_VALUE, result[1]);
+        assertEquals(Float.MAX_VALUE, result[2]);
     }
 
     public void testEchoFloatArray() throws Exception {
-        soapMarshalling.ArrayOfXsdFloat ar = soapMarshalling.ArrayOfXsdFloat.Factory.newInstance();
-        ar.addItem(Float.MAX_VALUE);
-        ar.addItem(Float.MIN_VALUE);
-        ar.addItem(Float.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdFloat result = client.echoFloat(ar);
-        float[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Float.MAX_VALUE, array[0]);
-        assertEquals(Float.MIN_VALUE, array[1]);
-        assertEquals(Float.MAX_VALUE, array[2]);
+        float[] ar = new float[] {Float.MAX_VALUE,  Float.MIN_VALUE, Float.MAX_VALUE};
+        float[] result = client.echoFloat(ar);
+        assertEquals(3, result.length);
+        assertEquals(Float.MAX_VALUE, result[0]);
+        assertEquals(Float.MIN_VALUE, result[1]);
+        assertEquals(Float.MAX_VALUE, result[2]);
     }
 
     public void testEchodoubleArray() throws Exception {
-        soapMarshalling.ArrayOfXsdDouble ar = soapMarshalling.ArrayOfXsdDouble.Factory.newInstance();
-        ar.addItem(Double.MAX_VALUE);
-        ar.addItem(Double.MIN_VALUE);
-        ar.addItem(Double.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdDouble result = client.echodouble(ar);
-        double[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Double.MAX_VALUE, array[0]);
-        assertEquals(Double.MIN_VALUE, array[1]);
-        assertEquals(Double.MAX_VALUE, array[2]);
+        double[] ar = new double[] {Double.MAX_VALUE, Double.MIN_VALUE, Double.MAX_VALUE};
+        double[] result = client.echodouble(ar);
+        assertEquals(3, result.length);
+        assertEquals(Double.MAX_VALUE, result[0]);
+        assertEquals(Double.MIN_VALUE, result[1]);
+        assertEquals(Double.MAX_VALUE, result[2]);
     }
 
     public void testEchoDoubleArray() throws Exception {
-        soapMarshalling.ArrayOfXsdDouble ar = soapMarshalling.ArrayOfXsdDouble.Factory.newInstance();
-        ar.addItem(Double.MAX_VALUE);
-        ar.addItem(Double.MIN_VALUE);
-        ar.addItem(Double.MAX_VALUE);
-
-        soapMarshalling.ArrayOfXsdDouble result = client.echoDouble(ar);
-        double[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(Double.MAX_VALUE, array[0]);
-        assertEquals(Double.MIN_VALUE, array[1]);
-        assertEquals(Double.MAX_VALUE, array[2]);
+        double[] ar = new double[] {Double.MAX_VALUE, Double.MIN_VALUE, Double.MAX_VALUE};
+        double[] result = client.echoDouble(ar);
+        assertEquals(3, result.length);
+        assertEquals(Double.MAX_VALUE, result[0]);
+        assertEquals(Double.MIN_VALUE, result[1]);
+        assertEquals(Double.MAX_VALUE, result[2]);
     }
 
     public void testEchoBigDecimalArray() throws Exception {
-        soapMarshalling.ArrayOfXsdDecimal ar = soapMarshalling.ArrayOfXsdDecimal.Factory.newInstance();
-        ar.addItem(BigDecimal.TEN);
-        ar.addItem(BigDecimal.ONE);
-        ar.addItem(BigDecimal.TEN);
-
-        soapMarshalling.ArrayOfXsdDecimal result = client.echoBigDecimal(ar);
-        BigDecimal[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals(BigDecimal.TEN, array[0]);
-        assertEquals(BigDecimal.ONE, array[1]);
-        assertEquals(BigDecimal.TEN, array[2]);
+        BigDecimal[] ar = new BigDecimal[] {BigDecimal.TEN,  BigDecimal.ONE, BigDecimal.TEN};
+        BigDecimal[] result = client.echoBigDecimal(ar);
+        assertEquals(3, result.length);
+        assertEquals(BigDecimal.TEN, result[0]);
+        assertEquals(BigDecimal.ONE, result[1]);
+        assertEquals(BigDecimal.TEN, result[2]);
     }
 
     public void testEchoStringArray() throws Exception {
-        soapMarshalling.ArrayOfXsdString ar = soapMarshalling.ArrayOfXsdString.Factory.newInstance();
-        ar.addItem("Hello");
-        ar.addItem(",");
-        ar.addItem("World!");
-
-        soapMarshalling.ArrayOfXsdString result = client.echoString(ar);
-        String[] array = result.getItemArray();
-        assertEquals(3, array.length);
-        assertEquals("Hello", array[0]);
-        assertEquals(",", array[1]);
-        assertEquals("World!", array[2]);
+        String[] ar = new String[] {"Hello", ",", "World!"};
+        String[] result = client.echoString(ar);
+        assertEquals(3, result.length);
+        assertEquals("Hello", result[0]);
+        assertEquals(",", result[1]);
+        assertEquals("World!", result[2]);
     }
 
 //        public void testEchoDateArray() throws Exception {
@@ -280,16 +201,11 @@
         public void testEchoCalendarArray() throws Exception {
             Calendar cal = new GregorianCalendar();
             cal.setTimeInMillis(123456789);
-
-            soapMarshalling.ArrayOfXsdDateTime ar = soapMarshalling.ArrayOfXsdDateTime.Factory.newInstance();
-            ar.addItem(cal);
-            ar.addItem(cal);
-
-            soapMarshalling.ArrayOfXsdDateTime result = client.echoCalendar(ar);
-            Calendar[] cResult = result.getItemArray();
-            assertEquals(2, cResult.length);
-            assertEquals(0, cal.compareTo(cResult[0]));
-            assertEquals(0, cal.compareTo(cResult[1]));
+            Calendar[] ar = new Calendar[] {cal, cal};
+            Calendar[] result = client.echoCalendar(ar);
+            assertEquals(2, result.length);
+            assertEquals(0, cal.compareTo(result[0]));
+            assertEquals(0, cal.compareTo(result[1]));
         }
 
 //    public void testEchoQNameArray() throws Exception {
@@ -306,7 +222,6 @@
 //        assertTrue(qname1.toString().equals(array[0].toString()));
 //        assertTrue(qname2.toString().equals(array[1].toString()));
 //    }
-
 
     public void setUp() throws Exception {
         try {

Modified: beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java?rev=355529&r1=355528&r2=355529&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java (original)
+++ beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java Fri Dec  9 08:21:32 2005
@@ -25,6 +25,10 @@
 import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
 import org.apache.beehive.wsm.databinding.GenericHolder;
 import org.apache.log4j.Logger;
+import org.apache.axis.AxisFault;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import test.DocumentLiteralWrappedSampleService;
 
 public class DocLitWrapWebServiceTest extends ControlTestCase {
@@ -34,6 +38,15 @@
     @Control
     public DocumentLiteralWrappedSampleService client;
 
+    public void testPhones() throws Exception {
+        web.complex.Phone[] phones;
+        phones = client.getPhoneArray();
+
+        assertEquals(111, phones[0].getAreaCode());
+        assertEquals(222, phones[1].getAreaCode());
+
+    }
+
     public void testReturnAddressFromBody() throws Exception {
 
         web.complex.StateType state = web.complex.StateType.Factory.newInstance();
@@ -101,6 +114,7 @@
 
     public void testCreateAddressInBody() throws Exception {
         web.complex.Address addr = client.createAddressInBody();
+        
         assertEquals("WA", addr.getState().getState());
         assertEquals(425, addr.getPhoneNumber().getAreaCode());
         assertEquals("555", addr.getPhoneNumber().getExchange());
@@ -155,17 +169,40 @@
         assertEquals(addr.getZip() + 1, returnAddr.getZip());
     }
 
-// todo: fix this test
-//    public void testThrowAddressException() throws Exception {
-//
-//        try {
-//            client.throwAddressException(66);
-//        } catch (Exception e) {
-//            assertEquals("org.apache.beehive.doclitwrap.AddressException: AddressException; input value=\"66\"", e.getMessage());
-//            return;
-//        }
-//        fail("Expected AddressException to be thrown!");
-//    }
+    public void testThrowAddressException() throws Exception {
+
+        try {
+            client.throwAddressException(66);
+        } catch (Exception e) {
+            assertEquals("org.apache.beehive.doclitwrap.AddressException: AddressException; input value=\"66\"", e.getMessage());
+            return;
+        }
+        fail("Expected AddressException to be thrown!");
+    }
+
+    public void testThrowComplexAddreessException() throws Exception {
+        try {
+            client.throwComplexAddressException();
+        } catch (Exception e) {
+            assertTrue(e instanceof AxisFault);
+            Element[] el = ((AxisFault)e).getFaultDetails();
+            assertNotNull(el);
+
+            NodeList children = el[0].getChildNodes();
+            assertTrue(children.getLength() == 2);
+
+            Node child = children.item(0);
+            assertEquals("msg1", child.getLocalName());
+            assertEquals("FirstMessage", child.getFirstChild().getNodeValue());
+
+            child = children.item(1);
+            assertEquals("msg2", child.getLocalName());
+            assertEquals("SecondMessage", child.getFirstChild().getNodeValue());
+
+             return;
+        }
+        fail("Expected ComplexAddressException to be thrown!");
+    }
 
     public void setUp() throws Exception {
         try {