beehive-commits@incubator.apache.org
[Top] [All Lists]

svn commit: r190023 [1/2] - in /incubator/beehive/trunk/system-controls/

Subject: svn commit: r190023 [1/2] - in /incubator/beehive/trunk/system-controls/test/src/webservice: ./ jcxgen-tests/ jcxgen-tests/tests/ jcxgen-tests/tests/org/ jcxgen-tests/tests/org/apache/ jcxgen-tests/tests/org/apache/beehive/ jcxgen-tests/tests/org/apache/beehive/controls/ jcxgen-tests/tests/org/apache/beehive/controls/system/ jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/ jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/ jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/ jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/ jcxgen-tests/wsdls/ schemas/ servers/local/ servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/ servers/webapp/WEB-INF/src/org/apache/beehive/sample/ servers/webapp/WEB-INF/src/web/ servers/webapp/WEB-INF/webservices/ servers/webapp/WEB-INF/webservices/web/ servers/webapp/WEB-INF/webservices/web/complex/ tests/org/apache/ tests/org/apache/beehive/ tests/org/apache/beehive/controls/ tests/org/apache/beehive/controls/system/ tests/org/apache/beehive/controls/system/webservice/ tests/org/apache/beehive/controls/system/webservice/framework/ tests/org/apache/beehive/controls/system/webservice/units/ tests/org/apache/beehive/controls/system/webservice/units/dlwservice/ tests/org/apache/beehive/controls/system/webservice/units/holders/ tests/org/apache/beehive/controls/system/webservice/units/utils/ tests/org/apache/beehive/controls/system/webservice/units/webservice/ tests/org/apache/beehive/controls/system/webservice/units/webservice/framework/ tests/org/controlhaus/controlunit/ tests/org/controlhaus/utils/ tests/org/controlhaus/webservice/ tests/org/controlhaus/webservice/framework/ tests/org/controlhaus/webservice/testmodel/client/ webservice-controls/ webservice-controls/org/ webservice-controls/org/apache/ webservice-controls/org/apache/beehive/ webservice-controls/org/apache/beehive/controls/ webservice-controls/org/apache/beehive/controls/system/ webservice-controls/org/apache/beehive/controls/system/webservice/ webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/ webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/client/
From:
Date: Fri, 10 Jun 2005 21:42:19 -0000
Author: ekoneil
Date: Fri Jun 10 14:42:17 2005
New Revision: 190023

URL: http://svn.apache.org/viewcvs?rev=190023&view=rev
Log:
Significant overhaul of the service control DRTs including the addition of some 
new tests.

This is a patch from JIRA 798 from Chad Schoettger.

BB: self
DRT: service control pass


Added:
    incubator/beehive/trunk/system-controls/test/src/webservice/README.txt
    incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/
      - copied from r189802, 
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/utils/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitBareWsdlTest.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitWrapWsdlTest.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromRpcLitWsdlTest.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralBareSample.wsdl
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralWrappedSample.wsdl
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/RpcLiteralSample.wsdl
    
incubator/beehive/trunk/system-controls/test/src/webservice/schemas/DocumentLiteralWrappedSample.wsdl
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/Address.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/AddressException.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/AddressHolder.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/MessageHandler.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/Phone.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/StateType.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/web/
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex/
    
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/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/framework/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/holders/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/utils/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/utils/ControlTestCase.java
      - copied, changed from r189802, 
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/controlunit/ControlTestCase.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/tests/org/apache/beehive/controls/system/webservice/units/webservice/SimpleWebServiceTest.java
      - copied, changed from r189802, 
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/webservice/SimpleWebSericeTest.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/webservice/framework/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/webservice/framework/LocalAxisServiceFacotry.java
      - copied unchanged from r189802, 
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/webservice/framework/LocalAxisServiceFacotry.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/system/
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/system/webservice/
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/client/
      - copied from r189802, 
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/webservice/testmodel/client/
Removed:
    incubator/beehive/trunk/system-controls/test/src/webservice/servers/local/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/controlunit/ControlTestCase.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/utils/
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/webservice/SimpleWebSericeTest.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/webservice/framework/LocalAxisServiceFacotry.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/tests/org/controlhaus/webservice/testmodel/client/
Modified:
    incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/HolderUtilsTest.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClass.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClassArrayHolder.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/schemas/ServiceWS.wsdl
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/sample/Address.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/sample/AddressBook.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/sample/Phone.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/sample/StateType.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/servers/webapp/WEB-INF/src/web/Service.jws
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/client/ClientAddress.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/client/ClientPhone.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/client/ClinetStateType.java
    
incubator/beehive/trunk/system-controls/test/src/webservice/webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/client/SimpleWSClient.jcx

Added: incubator/beehive/trunk/system-controls/test/src/webservice/README.txt
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/README.txt?rev=190023&view=auto
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/README.txt 
(added)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/README.txt Fri 
Jun 10 14:42:17 2005
@@ -0,0 +1,37 @@
+Webservice System Control DRTs
+-------------------------------
+
+Adding New Tests
+-----------------
+
+Depending on what you are testing:
+
+
+  * add new jcx generation tests to the jcxgen-tests area, these tests are run 
standalone without tomcat
+
+  * For new web services control runtime tests:
+    - Junit tests go in the 'tests' subdirectory, maintain the existing 
package structure
+      'org.apache.beehive.controls.system.webservice.units' (even though its 
alot of package names) and
+      add you JUnit test to a new subpackage of 'units' or add to an existing 
subpackage of 'units' if
+      that seems more appropriate.  NOTE: All JUnit test class names must end 
with 'Test' (ex. MyJunitTest.class)
+      in order to be run by the ant scripts.
+
+    - Add new WebService controls (if not generating from a wsdl) to the 
'webservice-controls' subdirectory - this is
+      where web service controls go that have been created from hand (are not 
wsdl generated).
+
+    -  Add new wsdl's to the 'schemas' subdirectory.  Wsdl files placed here 
will be used to automatically generate
+       web service controls at build time.
+
+    -  Add new test web services to the 'servers' subdirectory.
+
+
+
+
+
+
+
+
+
+
+
+

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=190023&r1=190022&r2=190023&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/build.xml 
(original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/build.xml Fri 
Jun 10 14:42:17 2005
@@ -1,77 +1,71 @@
 <?xml version="1.0" ?>
+
 <!--
-   Copyright 2005 The Apache Software Foundation 
- 
+   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
-  
+   
+       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:$
- -->
+-->
 <project name="Beehive/ServiceControlDRT" default="drt" basedir=".">
 
-    <!-- todo:
-         - switch to build-schemas
-         - switch to build-controls
-         - switch to build-webservices
-         - setup the Tomcat deploy to be failsafe
-         - wire into distribution testing
-         - deploy the webapp to an external directory
-      -->
-
     <property environment="os"/>
     <import file="../../../systemcontrols-imports.xml"/>
 
-    <!-- general dirs -->
-    <property name="beehive-webservice-control.jar" 
location="${beehive.home}/system-controls/build/jars/beehive-webservice-control.jar"/>
-    <property name="log.dir" location="logs"/>
-    <property name="schemas.dir" location="schemas"/>
-    <property name="source.dir" location="tests"/>
-  
-    <!-- client directories -->
-    <property name="client.build" location="client-build"/>
+    <!-- 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.xmlbeangen" location="${client.build}/xmlbeangen"/>
     <property name="client.classes" location="${client.build}/classes"/>
-    <property name="client.xmlbeangen" location="${client.build}/xmlbeans"/>
+    <property name="wsdls.dir" location="schemas"/>
+
+    <property name="client.jcxgensrc" location="${client.build}/jcxsrc"/>
+    <property name="client.jcxgen.packageName" value="test"/>
 
-    <property name="testmodel.client.jcxgen.dir" 
location="${client.build}/jcxsrc"/>
-    <property name="testmodel.client.jcxgen.packageName" value="test"/>
+    <!-- webapp properties -->
+    <property name="webapp.template.dir" location="servers/webapp"/>
 
-    <!-- server directories -->
-    <property name="servers.dir" location="servers/local"/>
-    <property name="webapp.dir" location="servers/webapp"/>
-    <property name="server.attachments" 
location="${webapp.dir}/WEB-INF/attachments"/>
-    <property name="server.beansrc" location="${webapp.dir}/WEB-INF/beansrc"/>
-    <property name="server.classes" location="${webapp.dir}/WEB-INF/classes"/>
-    <property name="server.lib" location="${webapp.dir}/WEB-INF/lib"/>
-    <property name="server.src" location="${webapp.dir}/WEB-INF/src"/>
+    <property name="webapp.build.dir" location="${build.root.dir}/webapp"/>
+    <property name="webapp.lib" location="${webapp.build.dir}/WEB-INF/lib"/>
+    <property name="webapp.src" location="${webapp.build.dir}/WEB-INF/src"/>
+    <property name="webapp.ws.src" 
location="${webapp.build.dir}/WEB-INF/webservices"/>
+    <property name="webapp.beansrc" 
location="${webapp.build.dir}/WEB-INF/beansrc"/>
+    <property name="webapp.classes" 
location="${webapp.build.dir}/WEB-INF/classes"/>
 
-    <!-- misc properties -->
+    <!-- runtime -->
+    <property name="log.dir" location="${build.root.dir}/logs"/>
     <property name="context.path" value="ServiceControlDRT"/>
     <property name="waitfor.url" value="http://localhost:8080/index.jsp"/>
     <property name="webapp.waitfor.url" 
value="http://localhost:8080/${context.path}"/>
     <property name="waitfor.timeout" value="100"/>
-  
-    <!-- paths -->
+
+    <property name="beehive-webservice-control.jar"
+              
location="${beehive.home}/system-controls/build/jars/beehive-webservice-control.jar"/>
+
     <path id="beehive.classpath">
         <path refid="webservices.dependency.path"/>
         <path refid="controls.dependency.path"/>
-        <path refid="servlet.dependency.path"/>
         <path refid="junit.dependency.path"/>
     </path>
-         
+
     <path id="client.classpath">
         <pathelement path="${client.classes}"/>
-        <pathelement path="${beehive-webservice-control.jar}"/> 
-        <path refid="beehive.classpath"  />
+        <pathelement path="${beehive-webservice-control.jar}"/>
+        <path refid="beehive.classpath"/>
         <path refid="xbean.dependency.path"/>
         <path refid="log4j.dependency.path"/>
         <path refid="velocity.dependency.path"/>
@@ -79,41 +73,223 @@
         <path refid="commons-discovery.dependency.path"/>
     </path>
 
-    <!-- tasks; todo: these should be removed! -->
-    <taskdef
-      name="apt"
-      classname="org.apache.beehive.controls.runtime.generator.AptTask" 
-      classpathref="apt.task.classpath"
-      onerror="report"/>
-      
-    <!-- ========================================= -->
-    <!-- drt                                       -->
-    <!-- ========================================= -->
-
-    <target name="build" 
depends="dirs,gen_jcx,build.gen-sc,build.sc,build.server"/>
-       
-       
+    <!-- =================================================================== 
-->
+    <!-- drt - run the webservice control DRTs                               
-->
+    <!-- =================================================================== 
-->
+    <target name="drt" depends="clean, build-client, build-webapp" 
description="Run the web service control drts.">
+
+        <ant dir="jcxgen-tests" target="drt" inheritAll="false"/>
+
+        <echo message="--------------------------------------------------"/>
+        <echo message="|     Web service control DRTs starting          |"/>
+        <echo message="--------------------------------------------------"/>
+
+        <parallel>
+
+            <antcall target="start-tomcat"/>
+
+            <sequential>
+
+                <echo message="Wait for server to start at URL: 
${waitfor.url}"/>
+                <waitfor maxwait="${waitfor.timeout}"
+                         maxwaitunit="second"
+                         timeoutproperty="server.timeout">
+                    <http url="${waitfor.url}"/>
+                </waitfor>
+                <fail if="server.timeout" message="Server failed to start up 
properly at URL: ${waitfor.url}"/>
+
+                <antcall target="deploy-webapps"/>
+
+                <echo message="** junit logfiles written to ${log.dir} **"/>
+                <junit failureproperty="drtfailed"
+                       printsummary="on"
+                       tempdir="${client.build}"
+                       fork="yes">
+                    <classpath>
+                        <path refid="client.classpath"/>
+                        <pathelement location="${client.classes}"/>
+                    </classpath>
+                    <formatter type="plain"/>
+                    <batchtest filtertrace="off" todir="${log.dir}">
+                        <fileset dir="${junit-source.dir}">
+                            <include name="**/*Test.java"/>
+                        </fileset>
+                    </batchtest>
+                </junit>
+
+                <antcall target="undeploy-webapps"/>
+
+                <stop-server/>
+
+            </sequential>
+        </parallel>
+
+        <echo message="--------------------------------------------------"/>
+        <echo message="|     Web service control DRTs completed         |"/>
+        <echo message="--------------------------------------------------"/>
+
+        <fail if="drtfailed" message="One or more tests in the ServiceControl 
DRT failed."/>
+    </target>
+
+
+    <!-- =================================================================== 
-->
+    <!-- build - build the junit tests and webservice controls               
-->
+    <!-- =================================================================== 
-->
+    <target name="build-client" depends="dirs, generate_jcxs" 
description="Build the tests and controls for the drts.">
+
+        <echo message="--------------------------------------------------"/>
+        <echo message="|     Web service control client build starting   |"/>
+        <echo message="--------------------------------------------------"/>
+
+        <property name="cp" refid="client.classpath"/>
+        <echo>cp: ${cp}</echo>
+
+        <!-- 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>
+        </copy>
+
+        <!-- build the client junit tests, use apt since they may access 
controls -->
+        <build-controls srcdir="${junit-source.dir}"
+                        destdir="${client.classes}"
+                        tempdir="${client.beansrc}"
+                        classpathref="client.classpath"/>
+
+        <echo message="--------------------------------------------------"/>
+        <echo message="|     Web service control client build ending    |"/>
+        <echo message="--------------------------------------------------"/>
+
+    </target>
+
+
+    <!-- =================================================================== 
-->
+    <!-- build - build the webapp and wsm services for the drts              
-->
+    <!-- =================================================================== 
-->
+    <target name="build-webapp" depends="dirs" description="Build the webapp 
for the drts.">
+
+        <echo message="----------------------------------------------------"/>
+        <echo message="|     Web service control drt webapp build starting |"/>
+        <echo message="----------------------------------------------------"/>
+
+        <!-- copy the webapp template dir -->
+        <copy todir="${webapp.build.dir}">
+            <fileset dir="${webapp.template.dir}">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+
+        <!-- deploy beehive files to the webapp -->
+        <mkdir dir="${webapp.lib}"/>
+        <deploy-wsm webappDir="${webapp.build.dir}"/>
+
+        <!-- build the webapp classes -->
+        <mkdir dir="${webapp.classes}"/>
+        <mkdir dir="${webapp.beansrc}"/>
+        <build-controls srcdir="${webapp.src}"
+                           destdir="${webapp.classes}"
+                           tempdir="${webapp.beansrc}"
+                           classpathref="client.classpath"/>
+
+        <build-webservices srcdir="${webapp.ws.src}"
+                           destdir="${webapp.classes}"
+                           tempdir="${webapp.beansrc}"
+                           classpathref="client.classpath"/>
+
+        <echo message="----------------------------------------------------"/>
+        <echo message="|     Web service control drt webapp build ending  |"/>
+        <echo message="----------------------------------------------------"/>
+
+    </target>
+
+    <!-- =================================================================== 
-->
+    <!-- generate_jcxs - Generate webservice controls from wsdls             
-->
+    <!-- =================================================================== 
-->
+    <target name="generate_jcxs" depends="gen_xmlbeans">
+
+        <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 ${wsdls.dir}
+                       -pkg ${client.jcxgen.packageName} "/>
+        </java>
+
+        <copy todir="${client.jcxgensrc}/${client.jcxgen.packageName}">
+            <fileset dir="${wsdls.dir}">
+                <include name="**/*.wsdl"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="gen_xmlbeans" depends="checkxbean" unless="noxbeanrebuild">
+        <build-schemas srcdir="${wsdls.dir}" destdir="${client.classes}"/>
+    </target>
+
+    <target name="checkxbean">
+        <uptodate property="noxbeanrebuild" targetfile="${xbeangen.dir}">
+            <srcfiles dir="${wsdls.dir}" includes="*.wsdl,*.xsd"/>
+        </uptodate>
+    </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.jcxgensrc}"/>
+        <mkdir dir="${webapp.build.dir}"/>
+        <mkdir dir="${log.dir}"/>
+    </target>
+
+
     <!-- ================================================================ -->
     <!--                                                                  -->
-    <!-- Targets for deploying the webapp on a server                     -->
+    <!-- Targets for running the web service control drts on tomcat       -->
     <!--                                                                  -->
     <!-- ================================================================ -->
-    <target name="deploy" description="Deploy webapp">
-        <echo message="** deploying ${webapp.dir} to ${context.path} **"/>
-       <deploy-webapp webappDir="${webapp.dir}" contextPath="${context.path}"/>
-    </target>
-
-    <target name="undeploy" description="Undeploy webapp">
-        <undeploy-webapp contextPath="${context.path}"/>
+    <target name="start-tomcat">
+        <start-server shmem="false" javaOptions=""/>
     </target>
 
-    <target name="redeploy" description="Redeploy webapp">
-        <redeploy-webapp contextPath="${context.path}"/>
+    <target name="deploy-webapps">
+        <antcall target="ensure.deployed"/>
     </target>
 
-
     <target name="ensure.deployed" description="Deploy webapp for the test 
recorder">
-        <echo>Ensuring that the webapp ${context.path} is deployed on a 
running server at the url ${webapp.waitfor.url}</echo>
+        <echo>Ensuring that the webapp ${context.path} is deployed on a 
running server at the url
+            ${webapp.waitfor.url}</echo>
 
         <waitfor maxwait="5" maxwaitunit="second" 
timeoutproperty="unavailable">
             <http url="${webapp.waitfor.url}"/>
@@ -147,234 +323,22 @@
             <http url="${webapp.waitfor.url}"/>
         </waitfor>
     </target>
-               
-    <!-- start server -->
-    <target name="start-tomcat" >
-        <start-server shmem="false" javaOptions=""/>
-    </target>
-       
-    <!-- deploy webapp -->
-    <target name="deploy-webapps" >
-       <antcall target="ensure.deployed" />
-    </target>
 
-    <!-- undeploy webapp -->
-    <target name="undeploy-webapps" >
+    <target name="undeploy-webapps">
         <undeploy-webapp contextPath="${context.path}"/>
     </target>
 
-    <target name="drt" depends="build">
-       <parallel>
-  
-       <!-- start server -->
-       <antcall target="start-tomcat"/>
-      
-       <!-- deploy webapp, run tests, clean up -->
-       <sequential>
-        
-           <!-- wait for server to start -->
-           <echo message="Wait for server to start at URL: ${waitfor.url}"/>
-           <waitfor maxwait="${waitfor.timeout}"
-                    maxwaitunit="second"
-                    timeoutproperty="server.timeout">
-               <http url="${waitfor.url}"/>
-           </waitfor>
-           <fail if="server.timeout" message="Server failed to start up 
properly at URL: ${waitfor.url}"/>
-
-           <!-- deploy webapp -->
-           <antcall target="deploy-webapps"/>
-
-           <!-- run test cases -->
-        <echo message="** junit logfiles written to ${log.dir} **"/>
-         <junit failureproperty="drtfailed"
-                printsummary="on"
-                tempdir="${client.build}"
-                fork="yes">
-             <classpath>
-                 <path refid="client.classpath"/>
-                 <pathelement location="${client.classes}"/>
-             </classpath>
-             <formatter type="plain"/>
-             <batchtest filtertrace="off" todir="${log.dir}"> 
-                 <fileset dir="${source.dir}">
-                     <include name="**/*Test.java"/>
-                 </fileset>
-             </batchtest>
-         </junit>
- 
-               <!-- undeploy webapp -->
-           <antcall target="undeploy-webapps"/>
-        
-        <!-- undeploy web service runtime -->
-        <!-- ant target="undeploy.beehive.webservice.runtime" dir="${ant.dir}" 
antfile="${app.build.file}" / -->
-
-           <!-- stop server -->
-           <stop-server />
-                       
-       </sequential>
-       </parallel>
-                <fail if="drtfailed" message="One or more tests in the 
ServiceControl DRT failed."/>
-    </target>
-
-
-  
-    <!-- ========================================= -->
-    <!--generate and compile the test control client interfaces from WSDLs -->
-    <!-- ========================================= -->
-    <target name="gen_jcx" depends="gen_xmlbeans">
-        <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 ${testmodel.client.jcxgen.dir} 
-                       -wsdl ${schemas.dir} 
-                       -pkg ${testmodel.client.jcxgen.packageName} "/>
-                       <!-- -wsdl_path_annotation  
${testmodel.client.jcxgen.packageName}"/>  not needed for the junit find the 
wsdl relativce to the jcx file. -->
-        </java>
-               
-       <copy 
todir="${testmodel.client.jcxgen.dir}/${testmodel.client.jcxgen.packageName}">
-           <fileset dir="${schemas.dir}" >
-               <include name="**/*.wsdl"/>       
-           </fileset>
-       </copy>         
-    </target>
-       
-    <target name="gen_xmlbeans" depends="checkxbean" unless="noxbeanrebuild">
-        <!-- XMLBean build -->
-        <!-- todo: switch to the build-schemas macro -->
-        <taskdef name="xmlbeanbuild" 
classname="org.apache.xmlbeans.impl.tool.XMLBean">
-           <classpath>
-               <path refid="client.classpath"/>
-            </classpath>
-        </taskdef>
-
-        <xmlbeanbuild schema="${schemas.dir}" 
-                      srcgendir="${client.xmlbeangen}"
-                      classgendir="${client.classes}"
-                      failonerror="true">
-            <classpath>
-                <path refid="client.classpath"/>
-            </classpath>
-        </xmlbeanbuild>
-    </target>
-    
-    <target name="checkxbean">
-        <uptodate property="noxbeanrebuild" targetfile="${xbeangen.dir}">
-            <srcfiles dir="${schemas.dir}" includes="*.wsdl,*.xsd"/> 
-        </uptodate>
-    </target>
-
-    <!-- ========================================= -->
-    <!-- build.gen-sc - build generated service control binaries -->
-    <!-- ========================================= -->
-    
-    <target name="build.gen-sc" depends="dirs">
-        <build-controls srcdir="${testmodel.client.jcxgen.dir}"
-                        destdir="${client.classes}"
-                        tempdir="${client.beansrc}"
-                        classpathref="client.classpath"/>
-
-        <copy todir="${client.classes}">
-            <fileset dir="${source.dir}" >
-                <include name="**/*.wsdl"/>       
-                <include name="**/*.properties"/>       
-            </fileset>
-        </copy>
+    <target name="deploy" description="Deploy webapp">
+        <echo message="** deploying ${webapp.build.dir} to ${context.path} 
**"/>
+        <deploy-webapp webappDir="${webapp.build.dir}" 
contextPath="${context.path}"/>
     </target>
-    
-    <!-- ========================================= -->
-    <!-- build.sc - build service control binaries -->
-    <!-- ========================================= -->
-    
-    <target name="build.sc" depends="dirs"> 
-<!--
-        <build-controls srcdir="${source.dir}"
-                        destdir="${client.classes}"
-                        tempdir="${client.beansrc}"
-                        classpathref="client.classpath"/>
--->
-        <apt srcdir="${source.dir}"
-             destdir="${client.classes}"
-             gendir="${client.beansrc}"
-             classpathref="client.classpath"
-             compileByExtension="true" 
-             srcExtensions="*.jcx,*.java"
-             debug="on"/>
 
-        <copy todir="${client.classes}">
-            <fileset dir="${source.dir}" >
-                <include name="**/*.wsdl"/>       
-                <include name="**/*.properties"/>       
-            </fileset>
-        </copy>
-    </target>
-    
-    <!-- ========================================= -->
-    <!-- build.server -                            -->
-    <!-- ========================================= -->
-    <target name="build.server" depends="dirs, deploy.beehive" >
-        <build-controls srcdir="${server.src}"
-                        destdir="${server.classes}"
-                        tempdir="${server.beansrc}"
-                        classpathref="client.classpath"/>
+    <target name="undeploy" description="Undeploy webapp">
+        <undeploy-webapp contextPath="${context.path}"/>
     </target>
-  
-    <!-- ========================================= -->
-    <!-- deploy.beehive - copy all dependencies    -->
-    <!-- ========================================= -->
-    <target name="deploy.beehive" depends="dirs">
-        <mkdir dir="${server.lib}"/>
 
-        <deploy-netui webappDir="${webapp.dir}"/>
-        <deploy-wsm webappDir="${webapp.dir}"/>
-    </target>
-  
-    <!-- ========================================= -->
-    <!-- clean - delete binaries and all artifacts -->
-    <!-- ========================================= -->
-    <target name="clean">
-        <delete dir="${log.dir}"/>
-        <delete dir="${client.beansrc}"/>
-        <delete dir="${client.build}"/>
-        <delete dir="${server.attachments}"/>
-        <delete dir="${server.lib}"/>
-        <delete dir="${server.beansrc}"/>
-        <delete dir="${server.classes}"/>
-        <delete file="velocity.log"/>
-        <delete dir="${testmodel.client.jcxgen.dir}"/>
-   </target>
-  
-    <!-- ========================================= -->
-    <!-- dirs - create all required directories    -->
-    <!-- ========================================= -->
-    <target name="dirs">
-        <mkdir dir="${client.classes}"/>
-        <mkdir dir="${client.beansrc}"/>
-        <mkdir dir="${server.classes}"/>
-        <mkdir dir="${testmodel.client.jcxgen.dir}"/>
-        <mkdir dir="${log.dir}"/>
+    <target name="redeploy" description="Redeploy webapp">
+        <redeploy-webapp contextPath="${context.path}"/>
     </target>
-
-  <!-- ========================================= -->
-  <!-- generate-xmlbean-datatypes -              -->
-  <!-- ========================================= -->
-  
-  <target name="generate-xmlbean-datatypes">
-    <taskdef name="xmlbeanbuild"
-             classname="org.apache.xmlbeans.impl.tool.XMLBean">
-      <classpath>
-        <path refid="client.classpath"/> 
-      </classpath>
-    </taskdef>
-    <xmlbeanbuild
-        schema="${schemas.dir}"
-        srcgendir="${client.xmlbeangen}"
-        classgendir="${client.classes}"
-        failonerror="true">
-      <classpath>
-        <path refid="client.classpath"/> 
-      </classpath>
-    </xmlbeanbuild>
-  </target>
 
 </project>

Added: 
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=190023&view=auto
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml
 (added)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml
 Fri Jun 10 14:42:17 2005
@@ -0,0 +1,143 @@
+<?xml version="1.0" ?>
+<project name="Beehive/ServiceControl DRT For JCX Generation" default="drt" 
basedir=".">
+
+    <property environment="os"/>
+    <import file="../../../../systemcontrols-imports.xml"/>
+
+    <property name="junit-source.dir" location="tests"/>
+    <property name="wsdls.dir" location="wsdls"/>
+
+    <property name="jcxgen.build.dir" location="../build/jcxgen"/>
+    <property name="jcxgen.beansrc" location="${jcxgen.build.dir}/beansrc"/>
+    <property name="jcxgen.classes" location="${jcxgen.build.dir}/classes"/>
+    <property name="jcxgen.gensrc" location="${jcxgen.build.dir}/jcxsrc"/>
+    <property name="jcxgen.package.name" value="jcxgentest"/>
+    <property name="log.dir" location="../logs/jcxgen"/>
+
+    <property name="beehive-webservice-control.jar"
+              
location="${beehive.home}/system-controls/build/jars/beehive-webservice-control.jar"/>
+
+    <path id="beehive.classpath">
+        <path refid="webservices.dependency.path"/>
+        <path refid="controls.dependency.path"/>
+        <path refid="junit.dependency.path"/>
+    </path>
+
+    <path id="jcxgen.classpath">
+        <pathelement path="${jcxgen.classes}"/>
+        <pathelement path="${beehive-webservice-control.jar}"/>
+        <path refid="beehive.classpath"/>
+        <path refid="xbean.dependency.path"/>
+        <path refid="log4j.dependency.path"/>
+        <path refid="velocity.dependency.path"/>
+        <path refid="commons-logging.dependency.path"/>
+        <path refid="commons-discovery.dependency.path"/>
+    </path>
+
+    <!-- =================================================================== 
-->
+    <!-- drt - run the webservice control DRTs                               
-->
+    <!-- =================================================================== 
-->
+    <target name="drt" depends="clean, build" description="Run the web service 
control drts.">
+        <echo message="-----------------------------------------------------"/>
+        <echo message="|     Web service control generation DRTs starting  |"/>
+        <echo message="-----------------------------------------------------"/>
+
+        <echo message="** junit logfiles written to ${log.dir} **"/>
+        <junit failureproperty="drtfailed"
+               printsummary="on"
+               tempdir="${jcxgen.build.dir}"
+               fork="yes">
+            <classpath>
+                <path refid="jcxgen.classpath"/>
+                <pathelement location="${jcxgen.classes}"/>
+            </classpath>
+            <formatter type="plain"/>
+            <batchtest filtertrace="off" todir="${log.dir}">
+                <fileset dir="${junit-source.dir}">
+                    <include name="**/*Test.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+
+        <echo message="-----------------------------------------------------"/>
+        <echo message="|     Web service control generation DRTs completed |"/>
+        <echo message="-----------------------------------------------------"/>
+
+        <fail if="drtfailed" message="One or more tests in the ServiceControl 
DRT failed."/>
+    </target>
+
+
+    <!-- =================================================================== 
-->
+    <!-- build - build the junit tests and webservice controls               
-->
+    <!-- =================================================================== 
-->
+    <target name="build" depends="dirs, generate_jcxs" description="Build the 
tests and controls for the drts.">
+
+        <build-controls srcdir="${jcxgen.gensrc}"
+                        destdir="${jcxgen.classes}"
+                        tempdir="${jcxgen.beansrc}"
+                        classpathref="jcxgen.classpath"/>
+
+        <copy todir="${jcxgen.classes}">
+            <fileset dir="${jcxgen.gensrc}">
+                <include name="**/*.wsdl"/>
+            </fileset>
+        </copy>
+
+
+        <!-- build the client junit tests, use apt since they may access 
controls -->
+        <build-controls srcdir="${junit-source.dir}"
+                        destdir="${jcxgen.classes}"
+                        tempdir="${jcxgen.beansrc}"
+                        classpathref="jcxgen.classpath"/>
+    </target>
+
+
+    <!-- =================================================================== 
-->
+    <!-- generate_jcxs - Generate webservice controls from wsdls             
-->
+    <!-- =================================================================== 
-->
+    <target name="generate_jcxs" depends="gen_xmlbeans">
+
+        <java 
classname="org.apache.beehive.controls.system.webservice.generator.ExtensionMaker"
+              dir="${basedir}" fork="true" failOnError="true">
+            <classpath>
+                <path refid="jcxgen.classpath"/>
+            </classpath>
+            <arg line="-gen_root ${jcxgen.gensrc}
+                       -wsdl ${wsdls.dir}
+                       -pkg ${jcxgen.package.name} "/>
+        </java>
+
+        <copy todir="${jcxgen.gensrc}/${jcxgen.package.name}">
+            <fileset dir="${wsdls.dir}">
+                <include name="**/*.wsdl"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="gen_xmlbeans" depends="checkxbean" unless="noxbeanrebuild">
+        <build-schemas srcdir="${wsdls.dir}" destdir="${jcxgen.classes}"/>
+    </target>
+
+    <target name="checkxbean">
+        <uptodate property="noxbeanrebuild" targetfile="${xbeangen.dir}">
+            <srcfiles dir="${wsdls.dir}" includes="*.wsdl,*.xsd"/>
+        </uptodate>
+    </target>
+
+
+    <!-- =================================================================== 
-->
+    <!-- clean                                                               
-->
+    <!-- =================================================================== 
-->
+    <target name="clean">
+        <delete dir="${jcxgen.build.dir}"/>
+        <delete dir="${log.dir}"/>
+    </target>
+
+    <!-- =================================================================== 
-->
+    <!-- create directories for the build                                    
-->
+    <!-- =================================================================== 
-->
+    <target name="dirs">
+        <mkdir dir="${log.dir}"/>
+    </target>
+
+</project>

Modified: 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/HolderUtilsTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/HolderUtilsTest.java?rev=190023&r1=189802&r2=190023&view=diff
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/HolderUtilsTest.java
 (original)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/HolderUtilsTest.java
 Fri Jun 10 14:42:17 2005
@@ -17,11 +17,7 @@
  * 
  * Original author: Daryoush Mehrtash
  */
-package org.controlhaus.utils;
-
-
-
-
+package org.apache.beehive.controls.system.webservice.units.holders;
 
 import java.util.ArrayList;
 

Modified: 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClass.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClass.java?rev=190023&r1=189802&r2=190023&view=diff
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClass.java
 (original)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClass.java
 Fri Jun 10 14:42:17 2005
@@ -1,4 +1,4 @@
-package org.controlhaus.utils;
+package org.apache.beehive.controls.system.webservice.units.holders;
 
 public class MyClass {
        public String name;

Modified: 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClassArrayHolder.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClassArrayHolder.java?rev=190023&r1=189802&r2=190023&view=diff
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClassArrayHolder.java
 (original)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/MyClassArrayHolder.java
 Fri Jun 10 14:42:17 2005
@@ -1,4 +1,4 @@
-package org.controlhaus.utils;
+package org.apache.beehive.controls.system.webservice.units.holders;
 
 import javax.xml.rpc.holders.Holder;
 

Added: 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitBareWsdlTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitBareWsdlTest.java?rev=190023&view=auto
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitBareWsdlTest.java
 (added)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitBareWsdlTest.java
 Fri Jun 10 14:42:17 2005
@@ -0,0 +1,87 @@
+/*
+ * 
+ * Copyright 2004 BEA Systems, Inc.
+ * 
+ * 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.
+ * 
+ * 
+ * Original author: Daryoush Mehrtash
+ */
+package org.apache.beehive.controls.system.webservice.units.jcxgen;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.system.webservice.ServiceControl;
+import org.apache.beehive.wsm.databinding.GenericHolder;
+
+import javax.xml.rpc.holders.IntHolder;
+import java.lang.reflect.Method;
+
+public class JcxGenFromDocLitBareWsdlTest extends TestCase {
+    private final Class genJcx = 
jcxgentest.DocumentLiteralBareSampleService.class;
+
+
+    public void testLocationAnnotation() throws Exception {
+        ServiceControl.Location loc =
+                (ServiceControl.Location) 
genJcx.getAnnotation(ServiceControl.Location.class);
+
+        assertEquals(1, loc.urls().length);
+        
assertEquals("http://localhost:8080/wsm-samplesWS/web/complex/DocumentLiteralBareSample.jws";,
 loc.urls()[0]);
+    }
+
+    public void testWSDLAnnotation() throws Exception {
+        ServiceControl.WSDL wsdl =
+                (ServiceControl.WSDL) 
genJcx.getAnnotation(ServiceControl.WSDL.class);
+
+        assertEquals("DocumentLiteralBareSample.wsdl", wsdl.path());
+        assertEquals("DocumentLiteralBareSampleService", wsdl.service());
+    }
+
+    public void testMethodSignatures() throws Exception {
+        testMethodSignature("changeAddressInBody", "int", GenericHolder.class);
+        testMethodSignature("changeAddressInHeader", "int", 
GenericHolder.class);
+        testMethodSignature("createAddressInBody", "void", 
GenericHolder.class, IntHolder.class);
+        testMethodSignature("createAddressInHeader", "void", 
GenericHolder.class, IntHolder.class);
+        testMethodSignature("returnAddressFromBody", 
"doclitbar.web.complex.Address", doclitbar.web.complex.Address.class);
+        testMethodSignature("returnAddressFromHeader", 
"doclitbar.web.complex.Address", doclitbar.web.complex.Address.class);
+        testMethodSignature("throwAddressException", "int", int.class);
+
+    }
+
+    private void testMethodSignature(String methodName, String 
returnClassName, Class... params) throws Exception {
+        Method m = null;
+        try {
+            m = genJcx.getMethod(methodName, params);
+        } catch (NoSuchMethodException e) {
+            fail("Could not find method '" + methodName + "(" + params + ")");
+        }
+        assertEquals(returnClassName, m.getReturnType().getName());
+    }
+
+
+    public JcxGenFromDocLitBareWsdlTest(String name) throws Exception {
+        super(name);
+    }
+
+    public static Test suite() {
+        return new TestSuite(JcxGenFromDocLitBareWsdlTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+}
+
+
+

Added: 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitWrapWsdlTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitWrapWsdlTest.java?rev=190023&view=auto
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitWrapWsdlTest.java
 (added)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromDocLitWrapWsdlTest.java
 Fri Jun 10 14:42:17 2005
@@ -0,0 +1,87 @@
+/*
+ * 
+ * Copyright 2004 BEA Systems, Inc.
+ * 
+ * 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.
+ * 
+ * 
+ * Original author: Daryoush Mehrtash
+ */
+package org.apache.beehive.controls.system.webservice.units.jcxgen;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.system.webservice.ServiceControl;
+import org.apache.beehive.wsm.databinding.GenericHolder;
+
+import javax.xml.rpc.holders.IntHolder;
+import java.lang.reflect.Method;
+
+public class JcxGenFromDocLitWrapWsdlTest extends TestCase {
+    private final Class genJcx = 
jcxgentest.DocumentLiteralWrappedSampleService.class;
+
+
+    public void testLocationAnnotation() throws Exception {
+        ServiceControl.Location loc =
+                (ServiceControl.Location) 
genJcx.getAnnotation(ServiceControl.Location.class);
+
+        assertEquals(1, loc.urls().length);
+        
assertEquals("http://localhost:8080/wsm-samplesWS/web/complex/DocumentLiteralWrappedSample.jws";,
 loc.urls()[0]);
+    }
+
+    public void testWSDLAnnotation() throws Exception {
+        ServiceControl.WSDL wsdl =
+                (ServiceControl.WSDL) 
genJcx.getAnnotation(ServiceControl.WSDL.class);
+
+        assertEquals("DocumentLiteralWrappedSample.wsdl", wsdl.path());
+        assertEquals("DocumentLiteralWrappedSampleService", wsdl.service());
+    }
+
+    public void testMethodSignatures() throws Exception {
+        testMethodSignature("changeAddressInBody", "int", GenericHolder.class);
+        testMethodSignature("changeAddressInHeader", "int", 
GenericHolder.class);
+        testMethodSignature("createAddressInBody", "void", 
GenericHolder.class, IntHolder.class);
+        testMethodSignature("createAddressInHeader", "void", 
GenericHolder.class, IntHolder.class);
+        testMethodSignature("returnAddressFromBody", 
"doclitwrap.web.complex.Address", doclitwrap.web.complex.Address.class);
+        testMethodSignature("returnAddressFromHeader", 
"doclitwrap.web.complex.Address", doclitwrap.web.complex.Address.class);
+        testMethodSignature("throwAddressException", "int", int.class);
+
+    }
+
+    private void testMethodSignature(String methodName, String 
returnClassName, Class... params) throws Exception {
+        Method m = null;
+        try {
+            m = genJcx.getMethod(methodName, params);
+        } catch (NoSuchMethodException e) {
+            fail("Could not find method '" + methodName + "(" + params + ")");
+        }
+        assertEquals(returnClassName, m.getReturnType().getName());
+    }
+
+
+    public JcxGenFromDocLitWrapWsdlTest(String name) throws Exception {
+        super(name);
+    }
+
+    public static Test suite() {
+        return new TestSuite(JcxGenFromDocLitWrapWsdlTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+}
+
+
+

Added: 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromRpcLitWsdlTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromRpcLitWsdlTest.java?rev=190023&view=auto
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromRpcLitWsdlTest.java
 (added)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/JcxGenFromRpcLitWsdlTest.java
 Fri Jun 10 14:42:17 2005
@@ -0,0 +1,86 @@
+/*
+ * 
+ * Copyright 2004 BEA Systems, Inc.
+ * 
+ * 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.
+ * 
+ * 
+ * Original author: Daryoush Mehrtash
+ */
+package org.apache.beehive.controls.system.webservice.units.jcxgen;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.system.webservice.ServiceControl;
+import org.apache.beehive.wsm.databinding.GenericHolder;
+
+import javax.xml.rpc.holders.IntHolder;
+import java.lang.reflect.Method;
+
+public class JcxGenFromRpcLitWsdlTest extends TestCase {
+    private final Class genJcx = jcxgentest.RpcLiteralSampleService.class;
+
+
+    public void testLocationAnnotation() throws Exception {
+        ServiceControl.Location loc =
+                (ServiceControl.Location) 
genJcx.getAnnotation(ServiceControl.Location.class);
+
+        assertEquals(1, loc.urls().length);
+        
assertEquals("http://localhost:8080/wsm-samplesWS/web/complex/RpcLiteralSample.jws";,
 loc.urls()[0]);
+    }
+
+    public void testWSDLAnnotation() throws Exception {
+        ServiceControl.WSDL wsdl =
+                (ServiceControl.WSDL) 
genJcx.getAnnotation(ServiceControl.WSDL.class);
+
+        assertEquals("RpcLiteralSample.wsdl", wsdl.path());
+        assertEquals("RpcLiteralSampleService", wsdl.service());
+    }
+
+    public void testMethodSignatures() throws Exception {
+        testMethodSignature("changeAddressInBody", "int", GenericHolder.class);
+        testMethodSignature("changeAddressInHeader", "int", 
GenericHolder.class);
+        testMethodSignature("createAddressInBody", "void", 
GenericHolder.class, IntHolder.class);
+        testMethodSignature("createAddressInHeader", "void", 
GenericHolder.class, IntHolder.class);
+        testMethodSignature("returnAddressFromBody", 
"org.apache.beehive.web.webservice.rpcExamples.Address", 
org.apache.beehive.web.webservice.rpcExamples.Address.class);
+        testMethodSignature("returnAddressFromHeader", 
"org.apache.beehive.web.webservice.rpcExamples.Address", 
org.apache.beehive.web.webservice.rpcExamples.Address.class);
+        testMethodSignature("throwAddressException", "int", int.class);
+    }
+
+    private void testMethodSignature(String methodName, String 
returnClassName, Class... params) throws Exception {
+        Method m = null;
+        try {
+            m = genJcx.getMethod(methodName, params);
+        } catch (NoSuchMethodException e) {
+            fail("Could not find method '" + methodName + "(" + params + ")");
+        }
+        assertEquals(returnClassName, m.getReturnType().getName());
+    }
+
+
+    public JcxGenFromRpcLitWsdlTest(String name) throws Exception {
+        super(name);
+    }
+
+    public static Test suite() {
+        return new TestSuite(JcxGenFromRpcLitWsdlTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+}
+
+
+

Added: 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralBareSample.wsdl
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralBareSample.wsdl?rev=190023&view=auto
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralBareSample.wsdl
 (added)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralBareSample.wsdl
 Fri Jun 10 14:42:17 2005
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://complex.web.doclitbar"; 
xmlns:apachesoap="http://xml.apache.org/xml-soap"; 
xmlns:impl="http://complex.web.doclitbar"; 
xmlns:intf="http://complex.web.doclitbar"; 
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.doclitbar"; 
xmlns="http://www.w3.org/2001/XMLSchema";>
+   <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="in_param_body" type="impl:Address"/>
+   <element name="ReturnAddressFromBodyResult" type="impl:Address"/>
+   <element name="in_param_header" type="impl:Address"/>
+   <element name="ReturnAddressFromHeaderResult" type="impl:Address"/>
+   <element name="ReturnCreateAddressInBodyResult" type="xsd:int"/>
+   <element name="out_param_body" type="impl:Address"/>
+   <element name="out_param_header" type="impl:Address"/>
+   <element name="ReturnCreateAddressInHeaderResult" type="xsd:int"/>
+   <element name="inout_param_body" type="impl:Address"/>
+   <element name="ChangeAddressInBodyResult" type="xsd:int"/>
+   <element name="inout_param_body1" type="impl:Address"/>
+   <element name="inout_param_header" type="impl:Address"/>
+   <element name="inout_param_header1" type="impl:Address"/>
+   <element name="ChangeAddressInHeaderResult" type="xsd:int"/>
+   <element name="in_param" type="xsd:int"/>
+   <element name="ThrowAddressExceptionResult" type="xsd:int"/>
+   <complexType name="AddressException">
+    <sequence/>
+   </complexType>
+   <element name="fault" type="impl:AddressException"/>
+  </schema>
+ </wsdl:types>
+
+   <wsdl:message name="returnAddressFromBodyResponse">
+
+      <wsdl:part element="impl:ReturnAddressFromBodyResult" 
name="ReturnAddressFromBodyResult"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="returnAddressFromBodyRequest">
+
+      <wsdl:part element="impl:in_param_body" name="in_param_body"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="returnAddressFromHeaderRequest">
+
+      <wsdl:part element="impl:in_param_header" name="in_param_header"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="createAddressInHeaderRequest">
+
+   </wsdl:message>
+
+   <wsdl:message name="changeAddressInBodyRequest">
+
+      <wsdl:part element="impl:inout_param_body" name="inout_param_body"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="returnAddressFromHeaderResponse">
+
+      <wsdl:part element="impl:ReturnAddressFromHeaderResult" 
name="ReturnAddressFromHeaderResult"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="changeAddressInBodyResponse">
+
+      <wsdl:part element="impl:ChangeAddressInBodyResult" 
name="ChangeAddressInBodyResult"/>
+
+      <wsdl:part element="impl:inout_param_body1" name="inout_param_body"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="throwAddressExceptionResponse">
+
+      <wsdl:part element="impl:ThrowAddressExceptionResult" 
name="ThrowAddressExceptionResult"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="AddressException">
+
+      <wsdl:part element="impl:fault" name="fault"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="createAddressInBodyRequest">
+
+   </wsdl:message>
+
+   <wsdl:message name="changeAddressInHeaderRequest">
+
+      <wsdl:part element="impl:inout_param_header" name="inout_param_header"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="throwAddressExceptionRequest">
+
+      <wsdl:part element="impl:in_param" name="in_param"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="createAddressInHeaderResponse">
+
+      <wsdl:part element="impl:out_param_header" name="out_param_header"/>
+
+      <wsdl:part element="impl:ReturnCreateAddressInHeaderResult" 
name="ReturnCreateAddressInHeaderResult"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="createAddressInBodyResponse">
+
+      <wsdl:part element="impl:ReturnCreateAddressInBodyResult" 
name="ReturnCreateAddressInBodyResult"/>
+
+      <wsdl:part element="impl:out_param_body" name="out_param_body"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="changeAddressInHeaderResponse">
+
+      <wsdl:part element="impl:inout_param_header1" name="inout_param_header"/>
+
+      <wsdl:part element="impl:ChangeAddressInHeaderResult" 
name="ChangeAddressInHeaderResult"/>
+
+   </wsdl:message>
+
+   <wsdl:portType name="DocumentLiteralBareSample">
+
+      <wsdl:operation name="returnAddressFromBody" 
parameterOrder="in_param_body">
+
+         <wsdl:input message="impl:returnAddressFromBodyRequest" 
name="returnAddressFromBodyRequest"/>
+
+         <wsdl:output message="impl:returnAddressFromBodyResponse" 
name="returnAddressFromBodyResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="returnAddressFromHeader" 
parameterOrder="in_param_header">
+
+         <wsdl:input message="impl:returnAddressFromHeaderRequest" 
name="returnAddressFromHeaderRequest"/>
+
+         <wsdl:output message="impl:returnAddressFromHeaderResponse" 
name="returnAddressFromHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="createAddressInBody" 
parameterOrder="out_param_body">
+
+         <wsdl:input message="impl:createAddressInBodyRequest" 
name="createAddressInBodyRequest"/>
+
+         <wsdl:output message="impl:createAddressInBodyResponse" 
name="createAddressInBodyResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="createAddressInHeader" 
parameterOrder="out_param_header">
+
+         <wsdl:input message="impl:createAddressInHeaderRequest" 
name="createAddressInHeaderRequest"/>
+
+         <wsdl:output message="impl:createAddressInHeaderResponse" 
name="createAddressInHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="changeAddressInBody" 
parameterOrder="inout_param_body">
+
+         <wsdl:input message="impl:changeAddressInBodyRequest" 
name="changeAddressInBodyRequest"/>
+
+         <wsdl:output message="impl:changeAddressInBodyResponse" 
name="changeAddressInBodyResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="changeAddressInHeader" 
parameterOrder="inout_param_header">
+
+         <wsdl:input message="impl:changeAddressInHeaderRequest" 
name="changeAddressInHeaderRequest"/>
+
+         <wsdl:output message="impl:changeAddressInHeaderResponse" 
name="changeAddressInHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="throwAddressException" parameterOrder="in_param">
+
+         <wsdl:input message="impl:throwAddressExceptionRequest" 
name="throwAddressExceptionRequest"/>
+
+         <wsdl:output message="impl:throwAddressExceptionResponse" 
name="throwAddressExceptionResponse"/>
+
+         <wsdl:fault message="impl:AddressException" name="AddressException"/>
+
+      </wsdl:operation>
+
+   </wsdl:portType>
+
+   <wsdl:binding name="DocumentLiteralBareSampleSoapBinding" 
type="impl:DocumentLiteralBareSample">
+
+      <wsdlsoap:binding style="document" 
transport="http://schemas.xmlsoap.org/soap/http"/>
+
+      <wsdl:operation name="returnAddressFromBody">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="returnAddressFromBodyRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="returnAddressFromBodyResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="returnAddressFromHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="returnAddressFromHeaderRequest">
+
+            <wsdlsoap:body parts="" use="literal"/>
+
+            <wsdlsoap:header message="impl:returnAddressFromHeaderRequest" 
namespace="http://complex.web.doclitbar"; part="in_param_header" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="returnAddressFromHeaderResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="createAddressInBody">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="createAddressInBodyRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="createAddressInBodyResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="createAddressInHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="createAddressInHeaderRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="createAddressInHeaderResponse">
+
+            <wsdlsoap:body parts="ReturnCreateAddressInHeaderResult" 
use="literal"/>
+
+            <wsdlsoap:header message="impl:createAddressInHeaderResponse" 
namespace="http://complex.web.doclitbar"; part="out_param_header" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="changeAddressInBody">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="changeAddressInBodyRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="changeAddressInBodyResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="changeAddressInHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="changeAddressInHeaderRequest">
+
+            <wsdlsoap:body parts="" use="literal"/>
+
+            <wsdlsoap:header message="impl:changeAddressInHeaderRequest" 
namespace="http://complex.web.doclitbar"; part="inout_param_header" 
use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="changeAddressInHeaderResponse">
+
+            <wsdlsoap:body parts="ChangeAddressInHeaderResult" use="literal"/>
+
+            <wsdlsoap:header message="impl:changeAddressInHeaderResponse" 
namespace="http://complex.web.doclitbar"; part="inout_param_header" 
use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="throwAddressException">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="throwAddressExceptionRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="throwAddressExceptionResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+         <wsdl:fault name="AddressException">
+
+            <wsdlsoap:fault name="AddressException" use="literal"/>
+
+         </wsdl:fault>
+
+      </wsdl:operation>
+
+   </wsdl:binding>
+
+   <wsdl:service name="DocumentLiteralBareSampleService">
+
+      <wsdl:port binding="impl:DocumentLiteralBareSampleSoapBinding" 
name="DocumentLiteralBareSample">
+
+         <wsdlsoap:address 
location="http://localhost:8080/wsm-samplesWS/web/complex/DocumentLiteralBareSample.jws"/>
+
+      </wsdl:port>
+
+   </wsdl:service>
+
+</wsdl:definitions>

Added: 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralWrappedSample.wsdl
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralWrappedSample.wsdl?rev=190023&view=auto
==============================================================================
--- 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralWrappedSample.wsdl
 (added)
+++ 
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/wsdls/DocumentLiteralWrappedSample.wsdl
 Fri Jun 10 14:42:17 2005
@@ -0,0 +1,456 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://complex.web.doclitwrap"; 
xmlns:apachesoap="http://xml.apache.org/xml-soap"; 
xmlns:impl="http://complex.web.doclitwrap"; 
xmlns:intf="http://complex.web.doclitwrap"; 
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.doclitwrap"; 
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>
+
+   <wsdl:message name="returnAddressFromBodyResponse">
+
+      <wsdl:part element="impl:returnAddressFromBodyResponse" 
name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="returnAddressFromBodyRequest">
+
+      <wsdl:part element="impl:returnAddressFromBody" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="returnAddressFromHeaderRequest">
+
+      <wsdl:part element="impl:in_param_header" name="in_param_header"/>
+
+      <wsdl:part element="impl:returnAddressFromHeader" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="createAddressInHeaderRequest">
+
+      <wsdl:part element="impl:createAddressInHeader" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="changeAddressInBodyRequest">
+
+      <wsdl:part element="impl:changeAddressInBody" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="returnAddressFromHeaderResponse">
+
+      <wsdl:part element="impl:returnAddressFromHeaderResponse" 
name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="changeAddressInBodyResponse">
+
+      <wsdl:part element="impl:changeAddressInBodyResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="throwAddressExceptionResponse">
+
+      <wsdl:part element="impl:throwAddressExceptionResponse" 
name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="AddressException">
+
+      <wsdl:part element="impl:fault" name="fault"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="createAddressInBodyRequest">
+
+      <wsdl:part element="impl:createAddressInBody" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="changeAddressInHeaderRequest">
+
+      <wsdl:part element="impl:inout_param_header" name="inout_param_header"/>
+
+      <wsdl:part element="impl:changeAddressInHeader" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="throwAddressExceptionRequest">
+
+      <wsdl:part element="impl:throwAddressException" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="createAddressInHeaderResponse">
+
+      <wsdl:part element="impl:out_param_header" name="out_param_header"/>
+
+      <wsdl:part element="impl:createAddressInHeaderResponse" 
name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="createAddressInBodyResponse">
+
+      <wsdl:part element="impl:createAddressInBodyResponse" name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:message name="changeAddressInHeaderResponse">
+
+      <wsdl:part element="impl:inout_param_header1" name="inout_param_header"/>
+
+      <wsdl:part element="impl:changeAddressInHeaderResponse" 
name="parameters"/>
+
+   </wsdl:message>
+
+   <wsdl:portType name="DocumentLiteralWrappedSample">
+
+      <wsdl:operation name="returnAddressFromBody">
+
+         <wsdl:input message="impl:returnAddressFromBodyRequest" 
name="returnAddressFromBodyRequest"/>
+
+         <wsdl:output message="impl:returnAddressFromBodyResponse" 
name="returnAddressFromBodyResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="returnAddressFromHeader">
+
+         <wsdl:input message="impl:returnAddressFromHeaderRequest" 
name="returnAddressFromHeaderRequest"/>
+
+         <wsdl:output message="impl:returnAddressFromHeaderResponse" 
name="returnAddressFromHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="createAddressInBody">
+
+         <wsdl:input message="impl:createAddressInBodyRequest" 
name="createAddressInBodyRequest"/>
+
+         <wsdl:output message="impl:createAddressInBodyResponse" 
name="createAddressInBodyResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="createAddressInHeader">
+
+         <wsdl:input message="impl:createAddressInHeaderRequest" 
name="createAddressInHeaderRequest"/>
+
+         <wsdl:output message="impl:createAddressInHeaderResponse" 
name="createAddressInHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="changeAddressInBody">
+
+         <wsdl:input message="impl:changeAddressInBodyRequest" 
name="changeAddressInBodyRequest"/>
+
+         <wsdl:output message="impl:changeAddressInBodyResponse" 
name="changeAddressInBodyResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="changeAddressInHeader">
+
+         <wsdl:input message="impl:changeAddressInHeaderRequest" 
name="changeAddressInHeaderRequest"/>
+
+         <wsdl:output message="impl:changeAddressInHeaderResponse" 
name="changeAddressInHeaderResponse"/>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="throwAddressException">
+
+         <wsdl:input message="impl:throwAddressExceptionRequest" 
name="throwAddressExceptionRequest"/>
+
+         <wsdl:output message="impl:throwAddressExceptionResponse" 
name="throwAddressExceptionResponse"/>
+
+         <wsdl:fault message="impl:AddressException" name="AddressException"/>
+
+      </wsdl:operation>
+
+   </wsdl:portType>
+
+   <wsdl:binding name="DocumentLiteralWrappedSampleSoapBinding" 
type="impl:DocumentLiteralWrappedSample">
+
+      <wsdlsoap:binding style="document" 
transport="http://schemas.xmlsoap.org/soap/http"/>
+
+      <wsdl:operation name="returnAddressFromBody">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="returnAddressFromBodyRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="returnAddressFromBodyResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="returnAddressFromHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="returnAddressFromHeaderRequest">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:returnAddressFromHeaderRequest" 
namespace="http://complex.web.doclitwrap"; part="in_param_header" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="returnAddressFromHeaderResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="createAddressInBody">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="createAddressInBodyRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="createAddressInBodyResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="createAddressInHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="createAddressInHeaderRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="createAddressInHeaderResponse">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:createAddressInHeaderResponse" 
namespace="http://complex.web.doclitwrap"; part="out_param_header" use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="changeAddressInBody">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="changeAddressInBodyRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="changeAddressInBodyResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="changeAddressInHeader">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="changeAddressInHeaderRequest">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:changeAddressInHeaderRequest" 
namespace="http://complex.web.doclitwrap"; part="inout_param_header" 
use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:input>
+
+         <wsdl:output name="changeAddressInHeaderResponse">
+
+            <wsdlsoap:body parts="parameters" use="literal"/>
+
+            <wsdlsoap:header message="impl:changeAddressInHeaderResponse" 
namespace="http://complex.web.doclitwrap"; part="inout_param_header" 
use="literal">
+
+            </wsdlsoap:header>
+
+         </wsdl:output>
+
+      </wsdl:operation>
+
+      <wsdl:operation name="throwAddressException">
+
+         <wsdlsoap:operation soapAction=""/>
+
+         <wsdl:input name="throwAddressExceptionRequest">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:input>
+
+         <wsdl:output name="throwAddressExceptionResponse">
+
+            <wsdlsoap:body use="literal"/>
+
+         </wsdl:output>
+
+         <wsdl:fault name="AddressException">
+
+            <wsdlsoap:fault name="AddressException" use="literal"/>
+
+         </wsdl:fault>
+
+      </wsdl:operation>
+
+   </wsdl:binding>
+
+   <wsdl:service name="DocumentLiteralWrappedSampleService">
+
+      <wsdl:port binding="impl:DocumentLiteralWrappedSampleSoapBinding" 
name="DocumentLiteralWrappedSample">
+
+         <wsdlsoap:address 
location="http://localhost:8080/wsm-samplesWS/web/complex/DocumentLiteralWrappedSample.jws"/>
+
+      </wsdl:port>
+
+   </wsdl:service>
+
+</wsdl:definitions>


<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: r190023 [1/2] - in /incubator/beehive/trunk/system-controls/test/src/webservice: ./ jcxgen-tests/ jcxgen-tests/tests/ jcxgen-tests/tests/org/ jcxgen-tests/tests/org/apache/ jcxgen-tests/tests/org/apache/beehive/ jcxgen-tests/tests/org/apache/beehive/controls/ jcxgen-tests/tests/org/apache/beehive/controls/system/ jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/ jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/ jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/holders/ jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/ jcxgen-tests/wsdls/ schemas/ servers/local/ servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/ servers/webapp/WEB-INF/src/org/apache/beehive/sample/ servers/webapp/WEB-INF/src/web/ servers/webapp/WEB-INF/webservices/ servers/webapp/WEB-INF/webservices/web/ servers/webapp/WEB-INF/webservices/web/complex/ tests/org/apache/ tests/org/apache/beehive/ tests/org/apache/beehive/controls/ tests/org/apache/beehive/controls/system/ tests/org/apache/beehive/controls/system/webservice/ tests/org/apache/beehive/controls/system/webservice/framework/ tests/org/apache/beehive/controls/system/webservice/units/ tests/org/apache/beehive/controls/system/webservice/units/dlwservice/ tests/org/apache/beehive/controls/system/webservice/units/holders/ tests/org/apache/beehive/controls/system/webservice/units/utils/ tests/org/apache/beehive/controls/system/webservice/units/webservice/ tests/org/apache/beehive/controls/system/webservice/units/webservice/framework/ tests/org/controlhaus/controlunit/ tests/org/controlhaus/utils/ tests/org/controlhaus/webservice/ tests/org/controlhaus/webservice/framework/ tests/org/controlhaus/webservice/testmodel/client/ webservice-controls/ webservice-controls/org/ webservice-controls/org/apache/ webservice-controls/org/apache/beehive/ webservice-controls/org/apache/beehive/controls/ webservice-controls/org/apache/beehive/controls/system/ webservice-controls/org/apache/beehive/controls/system/webservice/ webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/ webservice-controls/org/apache/beehive/controls/system/webservice/testmodel/client/, ekoneil <=