You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/07/26 20:03:07 UTC

svn commit: r225365 [1/5] - in /incubator/beehive/trunk: netui/test/webapps/drt/ system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ system-controls/test/src/webservice/ system-controls/test/src/webservice/jcxgen-tests/...

Author: ekoneil
Date: Tue Jul 26 11:02:03 2005
New Revision: 225365

URL: http://svn.apache.org/viewcvs?rev=225365&view=rev
Log:
Contribution from Chad Schoettger that fixes a bunch of issues with the service control and adds additional web service tests.

The following is the description from BEEHIVE-861.

<snip>
I've finished a first pass for system control DRTs. In this patch includes new DRTs for RPC literal and encoded style services and well as a number of fixes for DOC style services/tests. I have also added a DRT suite for testing headers.

The DRT framework has been modified to now verify that the WSDL's for the DRTs are what we excpect by starting tomcat and getting the WSDLs for the services we are testing against and comparing them to the ones in the DRT area. If this check fails, the DRTs will fail. I found that this was quite helpful in diagnosing DRT issues when they failed.

This patch also includes fixes for the following JIRA issues:

BEEHIVE-817
BEEHIVE-837
BEEHIVE-852
BEEHIVE-853
BEEHIVE-854
BEEHIVE-855
BEEHIVE-856
BEEHIVE-857
BEEHIVE-858
BEEHIVE-859 
</snip>

BB: self
DRT: Beehive / service control pass




Added:
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderDocLitEndpoint.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderRpcLitEndpoint.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/rpcEncoded/
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/rpcEncoded/HeaderRpcEncEndpoint.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/rpcEncoded/SoapMarshallingRpcEnc.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/rpcEncoded/SoapMarshallingRpcEncArrayTypes.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/header/
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/header/AddressHolder.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/header/HeaderAddress.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/header/HeaderEndpoint.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/header/
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/header/HeaderDocLitEndpoint.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/header/HeaderRpcEncEndpoint.jws   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/header/HeaderRpcLitEndpoint.jws   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/HeaderDocLitEndpointTest.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcEncEndpointTest.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcLitEndpointTest.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncTest.java   (with props)
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java   (with props)
Removed:
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralBareSample.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/schemas/po.xsd
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitbare/
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex2/
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/DocLitBareWebServiceTest.java
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/webservice/
    incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/
Modified:
    incubator/beehive/trunk/netui/test/webapps/drt/build.xml
    incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs
    incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
    incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/SoapMarshallingDocLitBare.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/SoapMarshallingDocLitBareArrayTypes.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/SoapMarshallingDocLitWrapped.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/SoapMarshallingDocLitWrappedArrayTypes.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/SoapMarshallingRpcLit.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/schemas/SoapMarshallingRpcLitArrayTypes.wsdl
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/soapMarshalling/ISoapMarshalling.java
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/soapMarshalling/ISoapMarshallingArrayTypes.java
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingDocLitBare.jws
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingDocLitBareArrayTypes.jws
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingDocLitWrapped.jws
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingDocLitWrappedArrayTypes.jws
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingRpcEnc.jws
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingRpcEncArrayTypes.jws
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingRpcLit.jws
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingRpcLitArrayTypes.jws
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex/DocumentLiteralWrappedSample.java
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareArrayTypesTest.java
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareTest.java
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedArrayTypesTest.java
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedTest.java
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitTest.java
    incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java
    incubator/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/AxisHook.java
    incubator/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
    incubator/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/wsdl/Utilities.java
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/wsdl/WSDLParser.java

Modified: incubator/beehive/trunk/netui/test/webapps/drt/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/build.xml?rev=225365&r1=225364&r2=225365&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/build.xml Tue Jul 26 11:02:03 2005
@@ -26,7 +26,16 @@
     <!-- Targets for building a webapp                                    -->
     <!--                                                                  -->
     <!-- ================================================================ -->
-    <target name="build" description="Build webapp">
+
+    <!-- 
+      Build this test webapp.  This target both copies the Beehive runtime and
+      compiles Java / annotated Java sources.
+
+      Options:
+        - "nobuild" == this option will disable the application build and can be used when just 
+                       updating the Beehive webapp runtime.
+      -->
+    <target name="build" description="Build webapp" unless="nobuild">
         <echo message="--------------------------------------------------"/>
         <echo message="|     NetUI coreWeb DRT webapp build starting    |"/>
         <echo message="--------------------------------------------------"/>
@@ -46,8 +55,14 @@
         <echo message="--------------------------------------------------"/>
     </target>
 
+    <!--
+      Update the Beehive runtime used in the webapp.  
+
+      Options:
+        - "struts.version" == configure the Struts version used to run tests.  The default value is 1.2.  Supported
+                              values include "1.1" and "1.2".
+      -->
     <target name="update.runtime" description="Update the NetUI runtime in the webapp without building the resources">
-        <!-- the default version of Struts for the DRTs.  To override, pass -Dstruts.version=1.1 on the command line -->
         <property name="struts.version" value="1.2"/>
 
         <echo>struts.version: ${struts.version}</echo>

Modified: incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs?rev=225365&r1=225364&r2=225365&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs (original)
+++ incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs Tue Jul 26 11:02:03 2005
@@ -350,27 +350,34 @@
                                        mWSTM.getSoapBinding().getStyle(),
                                        mWSTM.getSoapBinding().getUse());
 
+            final QName headerParamQName;
+            if(omStyle == SOAPBinding.Style.RPC) {
+                headerParamQName = new QName(nxtArgMetaData.getWpName());
+            } else {
+                headerParamQName = new QName(nxtArgMetaData.getWpTargetNamespace(), nxtArgMetaData.getWpName());
+            }
+
             if(nxtArgMetaData.isWpHeader()) {
-                // TODO: addParameterAsHeader is Axis specific, later abstract
-                // out Axis from this implementation
+                // TODO: addParameterAsHeader is Axis specific, later abstract out Axis from this implementation
                 logger.debug("Argument: " + nxtArgMetaData.getWpName()
                     + " in method: " + method.getName()
                     + " is send as soap header");
-                ((org.apache.axis.client.Call)call).addParameterAsHeader(
-                    new QName(nxtArgMetaData.getWpTargetNamespace(),
-                              nxtArgMetaData.getWpName()),
-                    registeredTypeQName, javaTypeFromClass, mode, mode);
+
+                ((org.apache.axis.client.Call)call).addParameterAsHeader(headerParamQName, registeredTypeQName,
+                                                                         javaTypeFromClass, mode, mode);
             }
             else {
                 logger.debug("Argument: " + nxtArgMetaData.getWpName()
                     + " in method: " + method.getName()
                     + " is send in the soap body");
-                call.addParameter(nxtArgMetaData.getWpName(), registeredTypeQName, javaTypeFromClass, mode);
+                  ((org.apache.axis.client.Call)call).addParameter(headerParamQName, registeredTypeQName,
+                                                                   javaTypeFromClass, mode);
             }
         }
+
         // register the return type
-        if(!wmm.isOneWay()) {
-            Class javaTypeFromClass = method.getReturnType();
+        final Class javaTypeFromClass = method.getReturnType();
+        if(!wmm.isOneWay() && javaTypeFromClass != void.class) {
             QName resultsRegisteredTypeQName = registrar.registerType(
                 javaTypeFromClass,
                 wmm.getXmlReturnType(),
@@ -378,9 +385,10 @@
                 mWSTM.getSoapBinding().getUse());
 
             call.setReturnType(resultsRegisteredTypeQName, javaTypeFromClass);
-        }
-        else
+        } else {
             call.setReturnType(registrar.getVoidType());
+        }
+
         // AXIS dependecy... this is needed for the Handlers
         call.setProperty(org.apache.axis.client.Call.JAXRPC_PORTTYPE_NAME,
                          portType);

Modified: incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/build.xml?rev=225365&r1=225364&r2=225365&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/build.xml Tue Jul 26 11:02:03 2005
@@ -24,13 +24,16 @@
 
     <!-- client properties -->
     <property name="junit-source.dir" location="tests"/>
-    <property name="controls-source.dir" location="webservice-controls"/>
     <property name="build.root.dir" location="build"/>
     <property name="client.build" location="${build.root.dir}/client"/>
     <property name="client.beansrc" location="${client.build}/beansrc"/>
+    <property name="client.axisgen" location="${client.build}/axisgen"/>
     <property name="client.xmlbeangen" location="${client.build}/xmlbeangen"/>
     <property name="client.classes" location="${client.build}/classes"/>
+    <property name="client.wsdls" location="${client.build}/wsdls"/>
+
     <property name="wsdls.dir" location="schemas"/>
+    <property name="rpc.encoded.wsdls.dir" location="${wsdls.dir}/rpcEncoded"/>
     <property name="client.jcxgensrc" location="${client.build}/jcxsrc"/>
     <property name="client.jcxgen.packageName" value="test"/>
 
@@ -62,11 +65,17 @@
         <path refid="junit.dependency.path"/>
         <path refid="xbean.dependency.path"/>
         <path refid="log4j.dependency.path"/>
-        <path refid="velocity.dependency.path"/>
+<!--        <path refid="velocity.dependency.path"/> -->
         <path refid="commons-logging.dependency.path"/>
         <path refid="commons-discovery.dependency.path"/>
     </path>
 
+    <!-- define task for axis bean generator -->
+    <taskdef name="axisbeanbuild" classname="org.apache.beehive.wsm.axis.ant.AxisTypeGeneratorTask">
+        <classpath>
+            <path refid="client.classpath"/>
+        </classpath>
+    </taskdef>
 
     <target name="drt_debug">
         <antcall target="build-client"/>
@@ -81,8 +90,8 @@
             <formatter type="plain"/>
             <batchtest filtertrace="off" todir="${log.dir}">
                 <fileset dir="${junit-source.dir}">
-        <!--            <include name="**/SanityTest.java"/> -->
-                    <include name="**/SoapMarshallingRpcLitTest.java"/>
+<!--                    <include name="**/SanityTest.java"/>   -->
+<include name="**/SoapMarshallingRpcLitArrayTypesTest.java"/>
                 </fileset>
             </batchtest>
         </junit>
@@ -92,10 +101,9 @@
     <!-- =================================================================== -->
     <!-- drt - run the webservice control DRTs                               -->
     <!-- =================================================================== -->
-    <target name="drt" description="Run the web service control drts.">
+    <target name="drt" depends="clean" description="Run the web service control drts.">
 
         <antcall target="clean"/>
-        <antcall target="build-client"/>
         <antcall target="build-webapp"/>
 
         <ant dir="jcxgen-tests" target="drt" inheritAll="false"/>
@@ -104,7 +112,7 @@
         <echo message="|     Web service control DRTs starting          |"/>
         <echo message="--------------------------------------------------"/>
 
-        <parallel>
+        <parallel failonany="true">
             <start-server shmem="false" javaOptions=""/>
             <sequential>
                 <echo message="Wait for server to start at URL: ${waitfor.url}"/>
@@ -117,6 +125,12 @@
 
                 <antcall target="deploy-webapps"/>
 
+                <!-- Validate the wsdls we have against those returned from WSM, fail if any diffs -->
+                <antcall target="check-wsdls"/>
+
+                <!-- wsdls have been validated and we are good to go - build the services controls -->
+                <antcall target="build-client"/>
+
                 <echo message="** junit logfiles written to ${log.dir} **"/>
                 <junit failureproperty="drtfailed"
                        printsummary="on"
@@ -150,31 +164,21 @@
     <!-- build - build the junit tests and webservice controls               -->
     <!-- =================================================================== -->
     <target name="build-client" description="Build the tests and controls for the drts.">
-        
-        <antcall target="dirs"/>
-        <antcall target="generate_jcxs"/>
 
         <echo message="--------------------------------------------------"/>
         <echo message="|     Web service control client build starting   |"/>
         <echo message="--------------------------------------------------"/>
 
+        <antcall target="dirs"/>
+        <antcall target="generate_jcxs"/>
+
         <!-- build webservice controls generated from wsdl files -->
         <build-controls srcdir="${client.jcxgensrc}"
                         destdir="${client.classes}"
                         tempdir="${client.beansrc}"
                         classpathref="client.classpath"/>
 
-        <!-- build the webservice controls -->
-        <build-controls srcdir="${controls-source.dir}"
-                        destdir="${client.classes}"
-                        tempdir="${client.beansrc}"
-                        classpathref="client.classpath"/>
-
         <copy todir="${client.classes}">
-            <fileset dir="${controls-source.dir}">
-                <include name="**/*.wsdl"/>
-                <include name="**/*.properties"/>
-            </fileset>
             <fileset dir="${client.jcxgensrc}">
                 <include name="**/*.wsdl"/>
             </fileset>
@@ -223,9 +227,9 @@
         <mkdir dir="${webapp.classes}"/>
         <mkdir dir="${webapp.beansrc}"/>
         <build-controls srcdir="${webapp.src}"
-                           destdir="${webapp.classes}"
-                           tempdir="${webapp.beansrc}"
-                           classpathref="client.classpath"/>
+                        destdir="${webapp.classes}"
+                        tempdir="${webapp.beansrc}"
+                        classpathref="client.classpath"/>
 
         <build-webservices srcdir="${webapp.ws.src}"
                            destdir="${webapp.classes}"
@@ -249,10 +253,29 @@
 
         <!-- TODO: add support for ignoreDuplicates to build-schemas macro? -->
         <xmlbeanbuild classpathref="xbean.dependency.path"
-                      schema="${wsdls.dir}"
                       classgendir="${client.classes}"
                       failonerror="true"
-                      ignoreDuplicatesInNamespaces="http://soapMarshalling"/>
+                      ignoreDuplicatesInNamespaces="http://soapMarshalling,http://header">
+            <fileset dir="${wsdls.dir}">
+                <include name="*.wsdl"/>
+            </fileset>
+        </xmlbeanbuild>
+
+        <!-- rpc encoded must be generated from the axis bean generator -->
+        <axisbeanbuild wsdldir="${rpc.encoded.wsdls.dir}" outputdir="${client.axisgen}"/>
+
+        <javac srcdir="${client.axisgen}" destdir="${client.classes}" classpathref="client.classpath" debug="true"/>
+
+        <!--
+            <taskdef name="serviceControlGen"
+                     classname="org.apache.beehive.controls.system.webservice.generator.ServiceControlGeneratorTask"
+                     classpathref="client.classpath"/>
+
+            <serviceControlGen srcDir="${wsdls.dir}" destDir="${client.jcxgensrc}" destPackageName="${client.jcxgen.packageName}"/>
+            <serviceControlGen srcDir="${rpc.encoded.wsdls.dir}" destDir="${client.jcxgensrc}" destPackageName="${client.jcxgen.packageName}"/>
+        <serviceControlGen srcDir="${wsdls.dir}" destDir="${client.jcxgensrc}" classpathRef="client.classpath" destPackageName="${client.jcxgen.packageName}"/>
+        <serviceControlGen srcDir="${rpc.encoded.wsdls.dir}" destDir="${client.jcxgensrc}" classpathRef="client.classpath" destPackageName="${client.jcxgen.packageName}"/>
+        -->
 
         <java classname="org.apache.beehive.controls.system.webservice.generator.ExtensionMaker"
               dir="${basedir}" fork="true" failOnError="true">
@@ -264,35 +287,88 @@
                        -pkg ${client.jcxgen.packageName} "/>
         </java>
 
+        <!-- gen the rpc encoded controls -->
+        <java classname="org.apache.beehive.controls.system.webservice.generator.ExtensionMaker"
+              dir="${basedir}" fork="true" failOnError="true">
+            <classpath>
+                <path refid="client.classpath"/>
+            </classpath>
+            <arg line="-gen_root ${client.jcxgensrc}
+                       -wsdl ${rpc.encoded.wsdls.dir}
+                       -pkg ${client.jcxgen.packageName} "/>
+        </java>
+
+
         <copy todir="${client.jcxgensrc}/${client.jcxgen.packageName}">
             <fileset dir="${wsdls.dir}">
+                <include name="*.wsdl"/>
+            </fileset>
+
+            <fileset dir="${rpc.encoded.wsdls.dir}">
                 <include name="**/*.wsdl"/>
             </fileset>
         </copy>
     </target>
 
     <!-- =================================================================== -->
+    <!-- Verify that the webservice generates an identical wsdl to the DRT   -->
+    <!-- wsdl we keep a copy of.                                             -->
+    <!-- =================================================================== -->
+    <target name="check-wsdls" description="Verify that the webservice wsdl matches our DRT wsdl.">
+
+        <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitWrapped"
+                    drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitWrappedArrayTypes"
+                    drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitBare"
+                    drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitBareArrayTypes"
+                    drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcLit" drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcLitArrayTypes"
+                    drtWsdlDir="${wsdls.dir}"/>
+
+        <check-wsdl webservicePath="header" webserviceName="HeaderDocLitEndpoint" drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="header" webserviceName="HeaderRpcLitEndpoint" drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="header" webserviceName="HeaderRpcEncEndpoint" drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
+
+        <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcEnc"
+                    drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
+        <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcEncArrayTypes"
+                    drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
+
+        <check-wsdl webservicePath="web/complex" webserviceName="DocumentLiteralWrappedSample"
+                    drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="web/complex3" webserviceName="RpcLiteralSample" drtWsdlDir="${wsdls.dir}"/>
+        <check-wsdl webservicePath="web/webparam" webserviceName="WebParamDocumentLiteralSample"
+                    drtWsdlDir="${wsdls.dir}"/>
+
+
+    </target>
+
+    <!-- =================================================================== -->
     <!-- clean                                                               -->
     <!-- =================================================================== -->
     <target name="clean">
         <delete dir="${build.root.dir}"/>
-        <delete dir="${log.dir}"/>
     </target>
 
     <!-- =================================================================== -->
     <!-- create directories for the build                                    -->
     <!-- =================================================================== -->
     <target name="dirs">
-        <mkdir dir="${controls-source.dir}"/>
         <mkdir dir="${client.build}"/>
         <mkdir dir="${client.beansrc}"/>
         <mkdir dir="${client.classes}"/>
         <mkdir dir="${client.xmlbeangen}"/>
+        <mkdir dir="${client.axisgen}"/>
         <mkdir dir="${client.jcxgensrc}"/>
+        <mkdir dir="${client.wsdls}"/>
         <mkdir dir="${webapp.build.dir}"/>
         <mkdir dir="${log.dir}"/>
     </target>
 
+
     <!-- ================================================================ -->
     <!--                                                                  -->
     <!-- Targets for running the web service control drts on tomcat       -->
@@ -356,4 +432,31 @@
         <redeploy-webapp contextPath="${context.path}"/>
     </target>
 
+
+    <!-- =================================================================== -->
+    <!-- Check a DRT wsdl against the one generated from the webservice      -->
+    <!-- =================================================================== -->
+    <macrodef name="check-wsdl">
+        <attribute name="webserviceName"/>
+        <attribute name="webservicePath"/>
+        <attribute name="drtWsdlDir"/>
+
+        <sequential>
+            <get src="${webapp.waitfor.url}/@{webservicePath}/@{webserviceName}.jws?wsdl"
+                 dest="${client.wsdls}/@{webserviceName}.wsdl"/>
+
+            <!-- based on the platform the generated wsdl may contain CR/LF line endings -->
+            <fixcrlf srcdir="@{drtWsdlDir}" eol="lf" includes="@{webserviceName}.wsdl"/>
+            <fixcrlf srcdir="${client.wsdls}" eol="lf" includes="**/@{webserviceName}.wsdl"/>
+
+            <fail message="ERROR: WSDL generated by webservice, ${client.wsdls}/@{webserviceName}.wsdl, does not match DRT WSDL @{drtWsdlDir}/@{webserviceName}.wsdl !">
+                <condition>
+                    <not>
+                        <filesmatch file1="@{drtWsdlDir}/@{webserviceName}.wsdl"
+                                    file2="${client.wsdls}/@{webserviceName}.wsdl"/>
+                    </not>
+                </condition>
+            </fail>
+        </sequential>
+    </macrodef>
 </project>

Modified: incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml?rev=225365&r1=225364&r2=225365&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml Tue Jul 26 11:02:03 2005
@@ -72,6 +72,9 @@
     <!-- =================================================================== -->
     <target name="build" depends="dirs, generate_jcxs" description="Build the tests and controls for the drts.">
 
+        <echo message="-----------------------------------------------------"/>
+        <echo message="|     Web service control generation build starting |"/>
+        <echo message="-----------------------------------------------------"/>
         <build-controls srcdir="${jcxgen.gensrc}"
                         destdir="${jcxgen.classes}"
                         tempdir="${jcxgen.beansrc}"
@@ -88,6 +91,10 @@
                         destdir="${jcxgen.classes}"
                         tempdir="${jcxgen.beansrc}"
                         classpathref="jcxgen.classpath"/>
+
+        <echo message="-----------------------------------------------------"/>
+        <echo message="|     Web service control generation build completed |"/>
+        <echo message="-----------------------------------------------------"/>
     </target>
 
 

Modified: incubator/beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl?rev=225365&r1=225364&r2=225365&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl (original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl Tue Jul 26 11:02:03 2005
@@ -1,456 +1,456 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://complex.web" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://complex.web" xmlns:intf="http://complex.web" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://complex.web" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://complex.web" xmlns:intf="http://complex.web" 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://complex.web" xmlns="http://www.w3.org/2001/XMLSchema">
-   <element name="returnAddressFromBody">
-    <complexType>
-     <sequence>
-      <element name="in_param_body" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Phone">
-    <sequence>
-     <element name="areaCode" nillable="true" type="xsd:int"/>
-     <element name="exchange" nillable="true" type="xsd:string"/>
-     <element name="number" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="StateType">
-    <sequence>
-     <element name="state" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="Address">
-    <sequence>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:Phone"/>
-     <element name="state" nillable="true" type="impl:StateType"/>
-     <element name="streetName" nillable="true" type="xsd:string"/>
-     <element name="streetNum" nillable="true" type="xsd:int"/>
-     <element name="zip" nillable="true" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="returnAddressFromBodyResponse">
-    <complexType>
-     <sequence>
-      <element name="ReturnAddressFromBodyResult" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="in_param_header" type="impl:Address"/>
-   <element name="returnAddressFromHeader">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <element name="returnAddressFromHeaderResponse">
-    <complexType>
-     <sequence>
-      <element name="ReturnAddressFromHeaderResult" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="createAddressInBody">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <element name="createAddressInBodyResponse">
-    <complexType>
-     <sequence>
-      <element name="ReturnCreateAddressInBodyResult" type="xsd:int"/>
-      <element name="out_param_body" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="createAddressInHeader">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <element name="out_param_header" type="impl:Address"/>
-   <element name="createAddressInHeaderResponse">
-    <complexType>
-     <sequence>
-      <element name="ReturnCreateAddressInHeaderResult" type="xsd:int"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="changeAddressInBody">
-    <complexType>
-     <sequence>
-      <element name="inout_param_body" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="changeAddressInBodyResponse">
-    <complexType>
-     <sequence>
-      <element name="ChangeAddressInBodyResult" type="xsd:int"/>
-      <element name="inout_param_body" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="inout_param_header" type="impl:Address"/>
-   <element name="changeAddressInHeader">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <element name="inout_param_header1" type="impl:Address"/>
-   <element name="changeAddressInHeaderResponse">
-    <complexType>
-     <sequence>
-      <element name="ChangeAddressInHeaderResult" type="xsd:int"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="throwAddressException">
-    <complexType>
-     <sequence>
-      <element name="in_param" type="xsd:int"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="throwAddressExceptionResponse">
-    <complexType>
-     <sequence>
-      <element name="ThrowAddressExceptionResult" type="xsd:int"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="AddressException">
-    <sequence/>
-   </complexType>
-   <element name="fault" type="impl:AddressException"/>
-  </schema>
- </wsdl:types>
+Built on May 03, 2005 (02:20:24 EDT)-->
+ <wsdl:types>
+  <schema elementFormDefault="qualified" targetNamespace="http://complex.web" xmlns="http://www.w3.org/2001/XMLSchema">
+   <element name="returnAddressFromBody">
+    <complexType>
+     <sequence>
+      <element name="in_param_body" type="impl:Address"/>
+     </sequence>
+    </complexType>
+   </element>
+   <complexType name="Phone">
+    <sequence>
+     <element name="areaCode" nillable="true" type="xsd:int"/>
+     <element name="exchange" nillable="true" type="xsd:string"/>
+     <element name="number" nillable="true" type="xsd:string"/>
+    </sequence>
+   </complexType>
+   <complexType name="StateType">
+    <sequence>
+     <element name="state" nillable="true" type="xsd:string"/>
+    </sequence>
+   </complexType>
+   <complexType name="Address">
+    <sequence>
+     <element name="city" nillable="true" type="xsd:string"/>
+     <element name="phoneNumber" nillable="true" type="impl:Phone"/>
+     <element name="state" nillable="true" type="impl:StateType"/>
+     <element name="streetName" nillable="true" type="xsd:string"/>
+     <element name="streetNum" nillable="true" type="xsd:int"/>
+     <element name="zip" nillable="true" type="xsd:int"/>
+    </sequence>
+   </complexType>
+   <element name="returnAddressFromBodyResponse">
+    <complexType>
+     <sequence>
+      <element name="ReturnAddressFromBodyResult" type="impl:Address"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="in_param_header" type="impl:Address"/>
+   <element name="returnAddressFromHeader">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="returnAddressFromHeaderResponse">
+    <complexType>
+     <sequence>
+      <element name="ReturnAddressFromHeaderResult" type="impl:Address"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="createAddressInBody">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="createAddressInBodyResponse">
+    <complexType>
+     <sequence>
+      <element name="ReturnCreateAddressInBodyResult" type="xsd:int"/>
+      <element name="out_param_body" type="impl:Address"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="createAddressInHeader">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="out_param_header" type="impl:Address"/>
+   <element name="createAddressInHeaderResponse">
+    <complexType>
+     <sequence>
+      <element name="ReturnCreateAddressInHeaderResult" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="changeAddressInBody">
+    <complexType>
+     <sequence>
+      <element name="inout_param_body" type="impl:Address"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="changeAddressInBodyResponse">
+    <complexType>
+     <sequence>
+      <element name="ChangeAddressInBodyResult" type="xsd:int"/>
+      <element name="inout_param_body" type="impl:Address"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="inout_param_header" type="impl:Address"/>
+   <element name="changeAddressInHeader">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="inout_param_header1" type="impl:Address"/>
+   <element name="changeAddressInHeaderResponse">
+    <complexType>
+     <sequence>
+      <element name="ChangeAddressInHeaderResult" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="throwAddressException">
+    <complexType>
+     <sequence>
+      <element name="in_param" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="throwAddressExceptionResponse">
+    <complexType>
+     <sequence>
+      <element name="ThrowAddressExceptionResult" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <complexType name="AddressException">
+    <sequence/>
+   </complexType>
+   <element name="AddressExceptionFault" type="impl:AddressException"/>
+  </schema>
+ </wsdl:types>
 
-   <wsdl:message name="returnAddressFromBodyResponse">
+   <wsdl:message name="returnAddressFromBodyResponse">
 
-      <wsdl:part element="impl:returnAddressFromBodyResponse" name="parameters"/>
+      <wsdl:part element="impl:returnAddressFromBodyResponse" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="returnAddressFromBodyRequest">
+   <wsdl:message name="returnAddressFromBodyRequest">
 
-      <wsdl:part element="impl:returnAddressFromBody" name="parameters"/>
+      <wsdl:part element="impl:returnAddressFromBody" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="returnAddressFromHeaderRequest">
+   <wsdl:message name="returnAddressFromHeaderRequest">
 
-      <wsdl:part element="impl:in_param_header" name="in_param_header"/>
+      <wsdl:part element="impl:in_param_header" name="in_param_header"/>
 
-      <wsdl:part element="impl:returnAddressFromHeader" name="parameters"/>
+      <wsdl:part element="impl:returnAddressFromHeader" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="createAddressInHeaderRequest">
+   <wsdl:message name="createAddressInHeaderRequest">
 
-      <wsdl:part element="impl:createAddressInHeader" name="parameters"/>
+      <wsdl:part element="impl:createAddressInHeader" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="changeAddressInBodyRequest">
+   <wsdl:message name="changeAddressInBodyRequest">
 
-      <wsdl:part element="impl:changeAddressInBody" name="parameters"/>
+      <wsdl:part element="impl:changeAddressInBody" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="returnAddressFromHeaderResponse">
+   <wsdl:message name="returnAddressFromHeaderResponse">
 
-      <wsdl:part element="impl:returnAddressFromHeaderResponse" name="parameters"/>
+      <wsdl:part element="impl:returnAddressFromHeaderResponse" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="changeAddressInBodyResponse">
+   <wsdl:message name="changeAddressInBodyResponse">
 
-      <wsdl:part element="impl:changeAddressInBodyResponse" name="parameters"/>
+      <wsdl:part element="impl:changeAddressInBodyResponse" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="throwAddressExceptionResponse">
+   <wsdl:message name="throwAddressExceptionResponse">
 
-      <wsdl:part element="impl:throwAddressExceptionResponse" name="parameters"/>
+      <wsdl:part element="impl:throwAddressExceptionResponse" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="AddressException">
+   <wsdl:message name="AddressException">
 
-      <wsdl:part element="impl:fault" name="fault"/>
+      <wsdl:part element="impl:AddressExceptionFault" name="AddressExceptionFault"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="createAddressInBodyRequest">
+   <wsdl:message name="createAddressInBodyRequest">
 
-      <wsdl:part element="impl:createAddressInBody" name="parameters"/>
+      <wsdl:part element="impl:createAddressInBody" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="changeAddressInHeaderRequest">
+   <wsdl:message name="changeAddressInHeaderRequest">
 
-      <wsdl:part element="impl:inout_param_header" name="inout_param_header"/>
+      <wsdl:part element="impl:inout_param_header" name="inout_param_header"/>
 
-      <wsdl:part element="impl:changeAddressInHeader" name="parameters"/>
+      <wsdl:part element="impl:changeAddressInHeader" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="throwAddressExceptionRequest">
+   <wsdl:message name="throwAddressExceptionRequest">
 
-      <wsdl:part element="impl:throwAddressException" name="parameters"/>
+      <wsdl:part element="impl:throwAddressException" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="createAddressInHeaderResponse">
+   <wsdl:message name="createAddressInHeaderResponse">
 
-      <wsdl:part element="impl:out_param_header" name="out_param_header"/>
+      <wsdl:part element="impl:out_param_header" name="out_param_header"/>
 
-      <wsdl:part element="impl:createAddressInHeaderResponse" name="parameters"/>
+      <wsdl:part element="impl:createAddressInHeaderResponse" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="createAddressInBodyResponse">
+   <wsdl:message name="createAddressInBodyResponse">
 
-      <wsdl:part element="impl:createAddressInBodyResponse" name="parameters"/>
+      <wsdl:part element="impl:createAddressInBodyResponse" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:message name="changeAddressInHeaderResponse">
+   <wsdl:message name="changeAddressInHeaderResponse">
 
-      <wsdl:part element="impl:inout_param_header1" name="inout_param_header"/>
+      <wsdl:part element="impl:inout_param_header1" name="inout_param_header"/>
 
-      <wsdl:part element="impl:changeAddressInHeaderResponse" name="parameters"/>
+      <wsdl:part element="impl:changeAddressInHeaderResponse" name="parameters"/>
 
-   </wsdl:message>
+   </wsdl:message>
 
-   <wsdl:portType name="DocumentLiteralWrappedSample">
+   <wsdl:portType name="DocumentLiteralWrappedSample">
 
-      <wsdl:operation name="returnAddressFromBody">
+      <wsdl:operation name="returnAddressFromBody">
 
-         <wsdl:input message="impl:returnAddressFromBodyRequest" name="returnAddressFromBodyRequest"/>
+         <wsdl:input message="impl:returnAddressFromBodyRequest" name="returnAddressFromBodyRequest"/>
 
-         <wsdl:output message="impl:returnAddressFromBodyResponse" name="returnAddressFromBodyResponse"/>
+         <wsdl:output message="impl:returnAddressFromBodyResponse" name="returnAddressFromBodyResponse"/>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="returnAddressFromHeader">
+      <wsdl:operation name="returnAddressFromHeader">
 
-         <wsdl:input message="impl:returnAddressFromHeaderRequest" name="returnAddressFromHeaderRequest"/>
+         <wsdl:input message="impl:returnAddressFromHeaderRequest" name="returnAddressFromHeaderRequest"/>
 
-         <wsdl:output message="impl:returnAddressFromHeaderResponse" name="returnAddressFromHeaderResponse"/>
+         <wsdl:output message="impl:returnAddressFromHeaderResponse" name="returnAddressFromHeaderResponse"/>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="createAddressInBody">
+      <wsdl:operation name="createAddressInBody">
 
-         <wsdl:input message="impl:createAddressInBodyRequest" name="createAddressInBodyRequest"/>
+         <wsdl:input message="impl:createAddressInBodyRequest" name="createAddressInBodyRequest"/>
 
-         <wsdl:output message="impl:createAddressInBodyResponse" name="createAddressInBodyResponse"/>
+         <wsdl:output message="impl:createAddressInBodyResponse" name="createAddressInBodyResponse"/>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="createAddressInHeader">
+      <wsdl:operation name="createAddressInHeader">
 
-         <wsdl:input message="impl:createAddressInHeaderRequest" name="createAddressInHeaderRequest"/>
+         <wsdl:input message="impl:createAddressInHeaderRequest" name="createAddressInHeaderRequest"/>
 
-         <wsdl:output message="impl:createAddressInHeaderResponse" name="createAddressInHeaderResponse"/>
+         <wsdl:output message="impl:createAddressInHeaderResponse" name="createAddressInHeaderResponse"/>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="changeAddressInBody">
+      <wsdl:operation name="changeAddressInBody">
 
-         <wsdl:input message="impl:changeAddressInBodyRequest" name="changeAddressInBodyRequest"/>
+         <wsdl:input message="impl:changeAddressInBodyRequest" name="changeAddressInBodyRequest"/>
 
-         <wsdl:output message="impl:changeAddressInBodyResponse" name="changeAddressInBodyResponse"/>
+         <wsdl:output message="impl:changeAddressInBodyResponse" name="changeAddressInBodyResponse"/>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="changeAddressInHeader">
+      <wsdl:operation name="changeAddressInHeader">
 
-         <wsdl:input message="impl:changeAddressInHeaderRequest" name="changeAddressInHeaderRequest"/>
+         <wsdl:input message="impl:changeAddressInHeaderRequest" name="changeAddressInHeaderRequest"/>
 
-         <wsdl:output message="impl:changeAddressInHeaderResponse" name="changeAddressInHeaderResponse"/>
+         <wsdl:output message="impl:changeAddressInHeaderResponse" name="changeAddressInHeaderResponse"/>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="throwAddressException">
+      <wsdl:operation name="throwAddressException">
 
-         <wsdl:input message="impl:throwAddressExceptionRequest" name="throwAddressExceptionRequest"/>
+         <wsdl:input message="impl:throwAddressExceptionRequest" name="throwAddressExceptionRequest"/>
 
-         <wsdl:output message="impl:throwAddressExceptionResponse" name="throwAddressExceptionResponse"/>
+         <wsdl:output message="impl:throwAddressExceptionResponse" name="throwAddressExceptionResponse"/>
 
-         <wsdl:fault message="impl:AddressException" name="AddressException"/>
+         <wsdl:fault message="impl:AddressException" name="AddressException"/>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-   </wsdl:portType>
+   </wsdl:portType>
 
-   <wsdl:binding name="DocumentLiteralWrappedSampleSoapBinding" type="impl:DocumentLiteralWrappedSample">
+   <wsdl:binding name="DocumentLiteralWrappedSampleSoapBinding" type="impl:DocumentLiteralWrappedSample">
 
-      <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
 
-      <wsdl:operation name="returnAddressFromBody">
+      <wsdl:operation name="returnAddressFromBody">
 
-         <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="returnAddressFromBodyRequest">
+         <wsdl:input name="returnAddressFromBodyRequest">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:input>
+         </wsdl:input>
 
-         <wsdl:output name="returnAddressFromBodyResponse">
+         <wsdl:output name="returnAddressFromBodyResponse">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:output>
+         </wsdl:output>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="returnAddressFromHeader">
+      <wsdl:operation name="returnAddressFromHeader">
 
-         <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="returnAddressFromHeaderRequest">
+         <wsdl:input name="returnAddressFromHeaderRequest">
 
-            <wsdlsoap:body parts="parameters" use="literal"/>
+            <wsdlsoap:body parts="parameters" use="literal"/>
 
-            <wsdlsoap:header message="impl:returnAddressFromHeaderRequest" namespace="http://complex.web" part="in_param_header" use="literal">
+            <wsdlsoap:header message="impl:returnAddressFromHeaderRequest" namespace="http://complex.web" part="in_param_header" use="literal">
 
-            </wsdlsoap:header>
+            </wsdlsoap:header>
 
-         </wsdl:input>
+         </wsdl:input>
 
-         <wsdl:output name="returnAddressFromHeaderResponse">
+         <wsdl:output name="returnAddressFromHeaderResponse">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:output>
+         </wsdl:output>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="createAddressInBody">
+      <wsdl:operation name="createAddressInBody">
 
-         <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="createAddressInBodyRequest">
+         <wsdl:input name="createAddressInBodyRequest">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:input>
+         </wsdl:input>
 
-         <wsdl:output name="createAddressInBodyResponse">
+         <wsdl:output name="createAddressInBodyResponse">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:output>
+         </wsdl:output>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="createAddressInHeader">
+      <wsdl:operation name="createAddressInHeader">
 
-         <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="createAddressInHeaderRequest">
+         <wsdl:input name="createAddressInHeaderRequest">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:input>
+         </wsdl:input>
 
-         <wsdl:output name="createAddressInHeaderResponse">
+         <wsdl:output name="createAddressInHeaderResponse">
 
-            <wsdlsoap:body parts="parameters" use="literal"/>
+            <wsdlsoap:body parts="parameters" use="literal"/>
 
-            <wsdlsoap:header message="impl:createAddressInHeaderResponse" namespace="http://complex.web" part="out_param_header" use="literal">
+            <wsdlsoap:header message="impl:createAddressInHeaderResponse" namespace="http://complex.web" part="out_param_header" use="literal">
 
-            </wsdlsoap:header>
+            </wsdlsoap:header>
 
-         </wsdl:output>
+         </wsdl:output>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="changeAddressInBody">
+      <wsdl:operation name="changeAddressInBody">
 
-         <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="changeAddressInBodyRequest">
+         <wsdl:input name="changeAddressInBodyRequest">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:input>
+         </wsdl:input>
 
-         <wsdl:output name="changeAddressInBodyResponse">
+         <wsdl:output name="changeAddressInBodyResponse">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:output>
+         </wsdl:output>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="changeAddressInHeader">
+      <wsdl:operation name="changeAddressInHeader">
 
-         <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="changeAddressInHeaderRequest">
+         <wsdl:input name="changeAddressInHeaderRequest">
 
-            <wsdlsoap:body parts="parameters" use="literal"/>
+            <wsdlsoap:body parts="parameters" use="literal"/>
 
-            <wsdlsoap:header message="impl:changeAddressInHeaderRequest" namespace="http://complex.web" part="inout_param_header" use="literal">
+            <wsdlsoap:header message="impl:changeAddressInHeaderRequest" namespace="http://complex.web" part="inout_param_header" use="literal">
 
-            </wsdlsoap:header>
+            </wsdlsoap:header>
 
-         </wsdl:input>
+         </wsdl:input>
 
-         <wsdl:output name="changeAddressInHeaderResponse">
+         <wsdl:output name="changeAddressInHeaderResponse">
 
-            <wsdlsoap:body parts="parameters" use="literal"/>
+            <wsdlsoap:body parts="parameters" use="literal"/>
 
-            <wsdlsoap:header message="impl:changeAddressInHeaderResponse" namespace="http://complex.web" part="inout_param_header" use="literal">
+            <wsdlsoap:header message="impl:changeAddressInHeaderResponse" namespace="http://complex.web" part="inout_param_header" use="literal">
 
-            </wsdlsoap:header>
+            </wsdlsoap:header>
 
-         </wsdl:output>
+         </wsdl:output>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-      <wsdl:operation name="throwAddressException">
+      <wsdl:operation name="throwAddressException">
 
-         <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="throwAddressExceptionRequest">
+         <wsdl:input name="throwAddressExceptionRequest">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:input>
+         </wsdl:input>
 
-         <wsdl:output name="throwAddressExceptionResponse">
+         <wsdl:output name="throwAddressExceptionResponse">
 
-            <wsdlsoap:body use="literal"/>
+            <wsdlsoap:body use="literal"/>
 
-         </wsdl:output>
+         </wsdl:output>
 
-         <wsdl:fault name="AddressException">
+         <wsdl:fault name="AddressException">
 
-            <wsdlsoap:fault name="AddressException" use="literal"/>
+            <wsdlsoap:fault name="AddressException" use="literal"/>
 
-         </wsdl:fault>
+         </wsdl:fault>
 
-      </wsdl:operation>
+      </wsdl:operation>
 
-   </wsdl:binding>
+   </wsdl:binding>
 
-   <wsdl:service name="DocumentLiteralWrappedSampleService">
+   <wsdl:service name="DocumentLiteralWrappedSampleService">
 
-      <wsdl:port binding="impl:DocumentLiteralWrappedSampleSoapBinding" name="DocumentLiteralWrappedSample">
+      <wsdl:port binding="impl:DocumentLiteralWrappedSampleSoapBinding" name="DocumentLiteralWrappedSample">
 
-         <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/web/complex/DocumentLiteralWrappedSample.jws"/>
+         <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/web/complex/DocumentLiteralWrappedSample.jws"/>
 
-      </wsdl:port>
+      </wsdl:port>
 
-   </wsdl:service>
+   </wsdl:service>
 
-</wsdl:definitions>
+</wsdl:definitions>

Added: incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderDocLitEndpoint.wsdl
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderDocLitEndpoint.wsdl?rev=225365&view=auto
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderDocLitEndpoint.wsdl (added)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderDocLitEndpoint.wsdl Tue Jul 26 11:02:03 2005
@@ -0,0 +1,492 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://header" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://header" xmlns:intf="http://header" 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://header" xmlns="http://www.w3.org/2001/XMLSchema">
+   <complexType name="HeaderAddress">
+    <sequence>
+     <element name="value" nillable="true" type="impl:HeaderAddress"/>
+    </sequence>
+   </complexType>
+   <element name="address" type="impl:HeaderAddress"/>
+   <element name="echoObject">
+    <complexType>
+     <sequence>
+      <element name="haddr" type="impl:HeaderAddress"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="address1" type="impl:HeaderAddress"/>
+   <element name="echoObjectResponse">
+    <complexType>
+     <sequence>
+      <element name="return" type="impl:HeaderAddress"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="inputHeader" type="xsd:string"/>
+   <element name="echoReturnStringHeader">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="echoReturnStringHeaderResponse">
+    <complexType>
+     <sequence>
+      <element name="return" type="xsd:string"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="inputHeader1" type="xsd:string"/>
+   <element name="modifyStringHeader">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="inputHeader2" type="xsd:string"/>
+   <element name="modifyStringHeaderResponse">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="inputHeader3" type="xsd:string"/>
+   <element name="echoStringHeaderAndResult">
+    <complexType>
+     <sequence>
+      <element name="inputString" type="xsd:string"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="inputHeader4" type="xsd:string"/>
+   <element name="echoStringHeaderAndResultResponse">
+    <complexType>
+     <sequence>
+      <element name="return" type="xsd:string"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="header1" type="xsd:string"/>
+   <element name="header2" type="xsd:string"/>
+   <element name="swapHeaderStrings">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="header3" type="xsd:string"/>
+   <element name="header4" type="xsd:string"/>
+   <element name="swapHeaderStringsResponse">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="setHeaderStrings">
+    <complexType>
+     <sequence>
+      <element name="setValue" type="xsd:string"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="header5" type="xsd:string"/>
+   <element name="header6" type="xsd:string"/>
+   <element name="setHeaderStringsResponse">
+    <complexType>
+     <sequence/>
+    </complexType>
+   </element>
+   <element name="inputHeader5" type="xsd:int"/>
+   <element name="echointHeader">
+    <complexType>
+     <sequence>
+      <element name="inputint" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+   <element name="inputHeader6" type="xsd:int"/>
+   <element name="echointHeaderResponse">
+    <complexType>
+     <sequence>
+      <element name="return" type="xsd:int"/>
+     </sequence>
+    </complexType>
+   </element>
+  </schema>
+ </wsdl:types>
+
+   <wsdl:message name="swapHeaderStringsRequest">
+
+      <wsdl:part element="impl:header1" name="header1"/>
+
+      <wsdl:part element="impl:header2" name="header2"/>
+
+      <wsdl:part element="impl:swapHeaderStrings" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoObjectRequest">
+
+      <wsdl:part element="impl:address" name="address"/>
+
+      <wsdl:part element="impl:echoObject" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="modifyStringHeaderRequest">
+
+      <wsdl:part element="impl:inputHeader1" name="inputHeader"/>
+
+      <wsdl:part element="impl:modifyStringHeader" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="setHeaderStringsRequest">
+
+      <wsdl:part element="impl:setHeaderStrings" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="swapHeaderStringsResponse">
+
+      <wsdl:part element="impl:header3" name="header1"/>
+
+      <wsdl:part element="impl:header4" name="header2"/>
+
+      <wsdl:part element="impl:swapHeaderStringsResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoReturnStringHeaderRequest">
+
+      <wsdl:part element="impl:inputHeader" name="inputHeader"/>
+
+      <wsdl:part element="impl:echoReturnStringHeader" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="setHeaderStringsResponse">
+
+      <wsdl:part element="impl:header5" name="header1"/>
+
+      <wsdl:part element="impl:header6" name="header2"/>
+
+      <wsdl:part element="impl:setHeaderStringsResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echointHeaderRequest">
+
+      <wsdl:part element="impl:inputHeader5" name="inputHeader"/>
+
+      <wsdl:part element="impl:echointHeader" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echointHeaderResponse">
+
+      <wsdl:part element="impl:inputHeader6" name="inputHeader"/>
+
+      <wsdl:part element="impl:echointHeaderResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoStringHeaderAndResultResponse">
+
+      <wsdl:part element="impl:inputHeader4" name="inputHeader"/>
+
+      <wsdl:part element="impl:echoStringHeaderAndResultResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoReturnStringHeaderResponse">
+
+      <wsdl:part element="impl:echoReturnStringHeaderResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoObjectResponse">
+
+      <wsdl:part element="impl:address1" name="address"/>
+
+      <wsdl:part element="impl:echoObjectResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="modifyStringHeaderResponse">
+
+      <wsdl:part element="impl:inputHeader2" name="inputHeader"/>
+
+      <wsdl:part element="impl:modifyStringHeaderResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoStringHeaderAndResultRequest">
+
+      <wsdl:part element="impl:inputHeader3" name="inputHeader"/>
+
+      <wsdl:part element="impl:echoStringHeaderAndResult" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:portType name="HeaderDocLitEndpoint">
+
+      <wsdl:operation name="echoObject">
+
+         <wsdl:input message="impl:echoObjectRequest" name="echoObjectRequest"/>
+
+         <wsdl:output message="impl:echoObjectResponse" name="echoObjectResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echoReturnStringHeader">
+
+         <wsdl:input message="impl:echoReturnStringHeaderRequest" name="echoReturnStringHeaderRequest"/>
+
+         <wsdl:output message="impl:echoReturnStringHeaderResponse" name="echoReturnStringHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="modifyStringHeader">
+
+         <wsdl:input message="impl:modifyStringHeaderRequest" name="modifyStringHeaderRequest"/>
+
+         <wsdl:output message="impl:modifyStringHeaderResponse" name="modifyStringHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echoStringHeaderAndResult">
+
+         <wsdl:input message="impl:echoStringHeaderAndResultRequest" name="echoStringHeaderAndResultRequest"/>
+
+         <wsdl:output message="impl:echoStringHeaderAndResultResponse" name="echoStringHeaderAndResultResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="swapHeaderStrings">
+
+         <wsdl:input message="impl:swapHeaderStringsRequest" name="swapHeaderStringsRequest"/>
+
+         <wsdl:output message="impl:swapHeaderStringsResponse" name="swapHeaderStringsResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="setHeaderStrings">
+
+         <wsdl:input message="impl:setHeaderStringsRequest" name="setHeaderStringsRequest"/>
+
+         <wsdl:output message="impl:setHeaderStringsResponse" name="setHeaderStringsResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echointHeader">
+
+         <wsdl:input message="impl:echointHeaderRequest" name="echointHeaderRequest"/>
+
+         <wsdl:output message="impl:echointHeaderResponse" name="echointHeaderResponse"/>
+
+      </wsdl:operation>
+
+   </wsdl:portType>
+
+   <wsdl:binding name="HeaderDocLitEndpointSoapBinding" type="impl:HeaderDocLitEndpoint">
+
+      <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+      <wsdl:operation name="echoObject">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="echoObjectRequest">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoObjectRequest" namespace="http://header" part="address" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="echoObjectResponse">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoObjectResponse" namespace="http://header" part="address" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echoReturnStringHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="echoReturnStringHeaderRequest">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoReturnStringHeaderRequest" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="echoReturnStringHeaderResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="modifyStringHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="modifyStringHeaderRequest">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:modifyStringHeaderRequest" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="modifyStringHeaderResponse">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:modifyStringHeaderResponse" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echoStringHeaderAndResult">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="echoStringHeaderAndResultRequest">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoStringHeaderAndResultRequest" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="echoStringHeaderAndResultResponse">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoStringHeaderAndResultResponse" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="swapHeaderStrings">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="swapHeaderStringsRequest">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:swapHeaderStringsRequest" namespace="http://header" part="header1" use="literal">
+
+            </wsdlsoap:header>
+
+            <wsdlsoap:header message="impl:swapHeaderStringsRequest" namespace="http://header" part="header2" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="swapHeaderStringsResponse">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:swapHeaderStringsResponse" namespace="http://header" part="header1" use="literal">
+
+            </wsdlsoap:header>
+
+            <wsdlsoap:header message="impl:swapHeaderStringsResponse" namespace="http://header" part="header2" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="setHeaderStrings">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="setHeaderStringsRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="setHeaderStringsResponse">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:setHeaderStringsResponse" namespace="http://header" part="header1" use="literal">
+
+            </wsdlsoap:header>
+
+            <wsdlsoap:header message="impl:setHeaderStringsResponse" namespace="http://header" part="header2" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echointHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="echointHeaderRequest">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:echointHeaderRequest" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="echointHeaderResponse">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:echointHeaderResponse" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+   </wsdl:binding>
+
+   <wsdl:service name="HeaderDocLitEndpointService">
+
+      <wsdl:port binding="impl:HeaderDocLitEndpointSoapBinding" name="HeaderDocLitEndpoint">
+
+         <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/header/HeaderDocLitEndpoint.jws"/>
+
+      </wsdl:port>
+
+   </wsdl:service>
+
+</wsdl:definitions>

Added: incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderRpcLitEndpoint.wsdl
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderRpcLitEndpoint.wsdl?rev=225365&view=auto
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderRpcLitEndpoint.wsdl (added)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/schemas/HeaderRpcLitEndpoint.wsdl Tue Jul 26 11:02:03 2005
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://header" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://header" xmlns:intf="http://header" 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://header" xmlns="http://www.w3.org/2001/XMLSchema">
+   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+   <complexType name="HeaderAddress">
+    <sequence>
+     <element name="city" nillable="true" type="xsd:string"/>
+     <element name="state" nillable="true" type="xsd:string"/>
+     <element name="street" nillable="true" type="xsd:string"/>
+     <element name="zip" type="xsd:int"/>
+    </sequence>
+   </complexType>
+  </schema>
+ </wsdl:types>
+
+   <wsdl:message name="swapHeaderStringsRequest">
+
+      <wsdl:part name="header1" type="xsd:string"/>
+
+      <wsdl:part name="header2" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoObjectRequest">
+
+      <wsdl:part name="address" type="impl:HeaderAddress"/>
+
+      <wsdl:part name="addr" type="impl:HeaderAddress"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="modifyStringHeaderRequest">
+
+      <wsdl:part name="inputHeader" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="setHeaderStringsRequest">
+
+      <wsdl:part name="setValue" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="swapHeaderStringsResponse">
+
+      <wsdl:part name="header1" type="xsd:string"/>
+
+      <wsdl:part name="header2" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoReturnStringHeaderRequest">
+
+      <wsdl:part name="inputHeader" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="setHeaderStringsResponse">
+
+      <wsdl:part name="header1" type="xsd:string"/>
+
+      <wsdl:part name="header2" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echointHeaderRequest">
+
+      <wsdl:part name="inputHeader" type="xsd:int"/>
+
+      <wsdl:part name="inputint" type="xsd:int"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echointHeaderResponse">
+
+      <wsdl:part name="inputHeader" type="xsd:int"/>
+
+      <wsdl:part name="return" type="xsd:int"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoStringHeaderAndResultResponse">
+
+      <wsdl:part name="inputHeader" type="xsd:string"/>
+
+      <wsdl:part name="return" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoReturnStringHeaderResponse">
+
+      <wsdl:part name="return" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoObjectResponse">
+
+      <wsdl:part name="address" type="impl:HeaderAddress"/>
+
+      <wsdl:part name="return" type="impl:HeaderAddress"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="modifyStringHeaderResponse">
+
+      <wsdl:part name="inputHeader" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="echoStringHeaderAndResultRequest">
+
+      <wsdl:part name="inputHeader" type="xsd:string"/>
+
+      <wsdl:part name="inputString" type="xsd:string"/>
+
+   </wsdl:message>
+
+   <wsdl:portType name="HeaderRpcLitEndpoint">
+
+      <wsdl:operation name="echoObject" parameterOrder="address addr">
+
+         <wsdl:input message="impl:echoObjectRequest" name="echoObjectRequest"/>
+
+         <wsdl:output message="impl:echoObjectResponse" name="echoObjectResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echoReturnStringHeader" parameterOrder="inputHeader">
+
+         <wsdl:input message="impl:echoReturnStringHeaderRequest" name="echoReturnStringHeaderRequest"/>
+
+         <wsdl:output message="impl:echoReturnStringHeaderResponse" name="echoReturnStringHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="modifyStringHeader" parameterOrder="inputHeader">
+
+         <wsdl:input message="impl:modifyStringHeaderRequest" name="modifyStringHeaderRequest"/>
+
+         <wsdl:output message="impl:modifyStringHeaderResponse" name="modifyStringHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echoStringHeaderAndResult" parameterOrder="inputHeader inputString">
+
+         <wsdl:input message="impl:echoStringHeaderAndResultRequest" name="echoStringHeaderAndResultRequest"/>
+
+         <wsdl:output message="impl:echoStringHeaderAndResultResponse" name="echoStringHeaderAndResultResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="swapHeaderStrings" parameterOrder="header1 header2">
+
+         <wsdl:input message="impl:swapHeaderStringsRequest" name="swapHeaderStringsRequest"/>
+
+         <wsdl:output message="impl:swapHeaderStringsResponse" name="swapHeaderStringsResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="setHeaderStrings" parameterOrder="header1 header2 setValue">
+
+         <wsdl:input message="impl:setHeaderStringsRequest" name="setHeaderStringsRequest"/>
+
+         <wsdl:output message="impl:setHeaderStringsResponse" name="setHeaderStringsResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echointHeader" parameterOrder="inputHeader inputint">
+
+         <wsdl:input message="impl:echointHeaderRequest" name="echointHeaderRequest"/>
+
+         <wsdl:output message="impl:echointHeaderResponse" name="echointHeaderResponse"/>
+
+      </wsdl:operation>
+
+   </wsdl:portType>
+
+   <wsdl:binding name="HeaderRpcLitEndpointSoapBinding" type="impl:HeaderRpcLitEndpoint">
+
+      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+      <wsdl:operation name="echoObject">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="echoObjectRequest">
+
+            <wsdlsoap:body namespace="http://header" parts="addr" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoObjectRequest" namespace="http://header" part="address" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="echoObjectResponse">
+
+            <wsdlsoap:body namespace="http://header" parts="return" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoObjectResponse" namespace="http://header" part="address" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echoReturnStringHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="echoReturnStringHeaderRequest">
+
+            <wsdlsoap:body namespace="http://header" parts="" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoReturnStringHeaderRequest" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="echoReturnStringHeaderResponse">
+
+            <wsdlsoap:body namespace="http://header" use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="modifyStringHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="modifyStringHeaderRequest">
+
+            <wsdlsoap:body namespace="http://header" parts="" use="literal"/>
+
+            <wsdlsoap:header message="impl:modifyStringHeaderRequest" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="modifyStringHeaderResponse">
+
+            <wsdlsoap:body namespace="http://header" parts="null" use="literal"/>
+
+            <wsdlsoap:header message="impl:modifyStringHeaderResponse" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echoStringHeaderAndResult">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="echoStringHeaderAndResultRequest">
+
+            <wsdlsoap:body namespace="http://header" parts="inputString" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoStringHeaderAndResultRequest" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="echoStringHeaderAndResultResponse">
+
+            <wsdlsoap:body namespace="http://header" parts="return" use="literal"/>
+
+            <wsdlsoap:header message="impl:echoStringHeaderAndResultResponse" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="swapHeaderStrings">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="swapHeaderStringsRequest">
+
+            <wsdlsoap:body namespace="http://header" parts="" use="literal"/>
+
+            <wsdlsoap:header message="impl:swapHeaderStringsRequest" namespace="http://header" part="header1" use="literal">
+
+            </wsdlsoap:header>
+
+            <wsdlsoap:header message="impl:swapHeaderStringsRequest" namespace="http://header" part="header2" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="swapHeaderStringsResponse">
+
+            <wsdlsoap:body namespace="http://header" parts="null" use="literal"/>
+
+            <wsdlsoap:header message="impl:swapHeaderStringsResponse" namespace="http://header" part="header1" use="literal">
+
+            </wsdlsoap:header>
+
+            <wsdlsoap:header message="impl:swapHeaderStringsResponse" namespace="http://header" part="header2" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="setHeaderStrings">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="setHeaderStringsRequest">
+
+            <wsdlsoap:body namespace="http://header" use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="setHeaderStringsResponse">
+
+            <wsdlsoap:body namespace="http://header" parts="null" use="literal"/>
+
+            <wsdlsoap:header message="impl:setHeaderStringsResponse" namespace="http://header" part="header1" use="literal">
+
+            </wsdlsoap:header>
+
+            <wsdlsoap:header message="impl:setHeaderStringsResponse" namespace="http://header" part="header2" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="echointHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="echointHeaderRequest">
+
+            <wsdlsoap:body namespace="http://header" parts="inputint" use="literal"/>
+
+            <wsdlsoap:header message="impl:echointHeaderRequest" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="echointHeaderResponse">
+
+            <wsdlsoap:body namespace="http://header" parts="return" use="literal"/>
+
+            <wsdlsoap:header message="impl:echointHeaderResponse" namespace="http://header" part="inputHeader" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+   </wsdl:binding>
+
+   <wsdl:service name="HeaderRpcLitEndpointService">
+
+      <wsdl:port binding="impl:HeaderRpcLitEndpointSoapBinding" name="HeaderRpcLitEndpoint">
+
+         <wsdlsoap:address location="http://localhost:8080/ServiceControlDRT/header/HeaderRpcLitEndpoint.jws"/>
+
+      </wsdl:port>
+
+   </wsdl:service>
+
+</wsdl:definitions>

Modified: incubator/beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl?rev=225365&r1=225364&r2=225365&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl (original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/schemas/RpcLiteralSample.wsdl Tue Jul 26 11:02:03 2005
@@ -35,7 +35,7 @@
 
    <wsdl:message name="AddressException">
 
-      <wsdl:part name="fault" type="impl:AddressException"/>
+      <wsdl:part name="AddressExceptionFault" type="impl:AddressException"/>
 
    </wsdl:message>