You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/06/14 21:36:41 UTC

svn commit: r190652 [5/7] - in /incubator/beehive/trunk/wsm: drt/negative/WEB-INF/ drt/negative/WEB-INF/src/ drt/negative/WEB-INF/src/web/negative/ drt/tests/org/apache/beehive/wsm/jsr181/model/ drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/ drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/ drt/tests/org/apache/beehive/wsm/jsr181/wsdl/ drt/webapp/WEB-INF/ drt/webapp/WEB-INF/src/ drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/ drt/webapp/WEB-INF/src/web/ schemas/ src/api/javax/jws/ src/api/javax/jws/soap/ src/runtime/META-INF/services/ src/runtime/org/apache/beehive/wsm/axis/ src/runtime/org/apache/beehive/wsm/axis/ant/ src/runtime/org/apache/beehive/wsm/axis/databinding/ src/runtime/org/apache/beehive/wsm/axis/handlers/ src/runtime/org/apache/beehive/wsm/axis/registration/ src/runtime/org/apache/beehive/wsm/axis/tools/ src/runtime/org/apache/beehive/wsm/axis/util/ src/runtime/org/apache/beehive/wsm/databinding/ src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/ src/runtime/org/apache/beehive/wsm/model/ src/runtime/org/apache/beehive/wsm/model/java/ src/runtime/org/apache/beehive/wsm/model/jsr181/ src/runtime/org/apache/beehive/wsm/processor/apt/ src/runtime/org/apache/beehive/wsm/registration/ src/runtime/org/apache/beehive/wsm/util/ src/runtime/org/apache/beehive/wsm/wsdl/

Modified: incubator/beehive/trunk/wsm/schemas/wsdl.xsd
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/schemas/wsdl.xsd?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/schemas/wsdl.xsd (original)
+++ incubator/beehive/trunk/wsm/schemas/wsdl.xsd Tue Jun 14 12:36:38 2005
@@ -1,311 +1,311 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001-2003 International Business Machines Corporation, Microsoft Corporation. All rights reserved.
-
-The presentation, distribution or other dissemination of the
-information contained herein by Microsoft is not a license,
-either expressly or impliedly, to any intellectual property owned or
-controlled by Microsoft.
-
-This document and the information contained herein is provided on an
-"AS IS" basis and to the maximum extent permitted by applicable law,
-Microsoft provides the document AS IS AND WITH ALL FAULTS, and hereby
-disclaims all other warranties and conditions, either express, implied
-or statutory, including, but not limited to, any (if any) implied
-warranties, duties or conditions of merchantability, of fitness for a
-particular purpose, of accuracy or completeness of responses, of
-results, of workmanlike effort, of lack of viruses, and of lack of
-negligence, all with regard to the document. ALSO, THERE IS NO
-WARRANTY OR CONDITION OF TITLE, QUIET ENJOYMENT, QUIET POSSESSION,
-CORRESPONDENCE TO DESCRIPTION OR NON-INFRINGEMENT WITH REGARD TO THE
-DOCUMENT.
-
-IN NO EVENT WILL MICROSOFT BE LIABLE TO ANY OTHER PARTY FOR THE COST
-OF PROCURING SUBSTITUTE GOODS OR SERVICES, LOST PROFITS, LOSS OF USE,
-LOSS OF DATA, OR ANY INCIDENTAL, CONSEQUENTIAL, DIRECT, INDIRECT, OR
-SPECIAL DAMAGES WHETHER UNDER CONTRACT, TORT, WARRANTY, OR OTHERWISE,
-ARISING IN ANY WAY OUT OF THIS OR ANY OTHER AGREEMENT RELATING TO THIS
-DOCUMENT, WHETHER OR NOT SUCH PARTY HAD ADVANCE NOTICE OF THE
-POSSIBILITY OF SUCH DAMAGES.  
-
---> 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
-           elementFormDefault="qualified" >
-   
-  <xs:complexType mixed="true" name="tDocumentation" >
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="tDocumented" >
-    <xs:annotation>
-      <xs:documentation>
-      This type is extended by  component types to allow them to be documented
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-	 
-  <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow attributes from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:anyAttribute namespace="##other" processContents="lax" />    
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tExtensibleDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow elements from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="definitions" type="wsdl:tDefinitions" >
-    <xs:key name="message" >
-      <xs:selector xpath="wsdl:message" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="portType" >
-      <xs:selector xpath="wsdl:portType" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="binding" >
-      <xs:selector xpath="wsdl:binding" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="service" >
-      <xs:selector xpath="wsdl:service" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="import" >
-      <xs:selector xpath="wsdl:import" />
-      <xs:field xpath="@namespace" />
-    </xs:key>
-  </xs:element>
-
-  <xs:group name="anyTopLevelOptionalElement" >
-    <xs:annotation>
-      <xs:documentation>
-      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice>
-      <xs:element name="import" type="wsdl:tImport" />
-      <xs:element name="types" type="wsdl:tTypes" />                     
-      <xs:element name="message"  type="wsdl:tMessage" >
-        <xs:unique name="part" >
-          <xs:selector xpath="wsdl:part" />
-          <xs:field xpath="@name" />
-        </xs:unique>
-      </xs:element>
-      <xs:element name="portType" type="wsdl:tPortType" />
-      <xs:element name="binding"  type="wsdl:tBinding" />
-      <xs:element name="service"  type="wsdl:tService" >
-        <xs:unique name="port" >
-          <xs:selector xpath="wsdl:port" />
-          <xs:field xpath="@name" />
-        </xs:unique>
-	  </xs:element>
-    </xs:choice>
-  </xs:group>
-
-  <xs:complexType name="tDefinitions" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:group ref="wsdl:anyTopLevelOptionalElement"  minOccurs="0"   maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional" />
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-   
-  <xs:complexType name="tImport" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
-        <xs:attribute name="location" type="xs:anyURI" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-   
-  <xs:complexType name="tTypes" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" />
-    </xs:complexContent>   
-  </xs:complexType>
-     
-  <xs:complexType name="tMessage" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPart" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="element" type="xs:QName" use="optional" />
-        <xs:attribute name="type" type="xs:QName" use="optional" />    
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPortType" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-   
-  <xs:complexType name="tOperation" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-	    <xs:sequence>
-          <xs:choice>
-            <xs:group ref="wsdl:request-response-or-one-way-operation" />
-            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-    
-  <xs:group name="request-response-or-one-way-operation" >
-    <xs:sequence>
-      <xs:element name="input" type="wsdl:tParam" />
-	  <xs:sequence minOccurs='0' >
-	    <xs:element name="output" type="wsdl:tParam" />
-		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-      </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-
-  <xs:group name="solicit-response-or-notification-operation" >
-    <xs:sequence>
-      <xs:element name="output" type="wsdl:tParam" />
-	  <xs:sequence minOccurs='0' >
-	    <xs:element name="input" type="wsdl:tParam" />
-		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-	  </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-        
-  <xs:complexType name="tParam" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName"  use="required" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tBinding" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="type" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-    
-  <xs:complexType name="tBindingOperationMessage" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="tBindingOperationFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tBindingOperation" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tService" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tPort" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="binding" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:attribute name="arrayType" type="xs:string" />
-  <xs:attribute name="required" type="xs:boolean" />
-  <xs:complexType name="tExtensibilityElement" abstract="true" >
-    <xs:attribute ref="wsdl:required" use="optional" />
-  </xs:complexType>
-
+<?xml version="1.0" encoding="UTF-8" ?> 
+<!-- 
+ 
+Copyright 2001-2003 International Business Machines Corporation, Microsoft Corporation. All rights reserved.
+
+The presentation, distribution or other dissemination of the
+information contained herein by Microsoft is not a license,
+either expressly or impliedly, to any intellectual property owned or
+controlled by Microsoft.
+
+This document and the information contained herein is provided on an
+"AS IS" basis and to the maximum extent permitted by applicable law,
+Microsoft provides the document AS IS AND WITH ALL FAULTS, and hereby
+disclaims all other warranties and conditions, either express, implied
+or statutory, including, but not limited to, any (if any) implied
+warranties, duties or conditions of merchantability, of fitness for a
+particular purpose, of accuracy or completeness of responses, of
+results, of workmanlike effort, of lack of viruses, and of lack of
+negligence, all with regard to the document. ALSO, THERE IS NO
+WARRANTY OR CONDITION OF TITLE, QUIET ENJOYMENT, QUIET POSSESSION,
+CORRESPONDENCE TO DESCRIPTION OR NON-INFRINGEMENT WITH REGARD TO THE
+DOCUMENT.
+
+IN NO EVENT WILL MICROSOFT BE LIABLE TO ANY OTHER PARTY FOR THE COST
+OF PROCURING SUBSTITUTE GOODS OR SERVICES, LOST PROFITS, LOSS OF USE,
+LOSS OF DATA, OR ANY INCIDENTAL, CONSEQUENTIAL, DIRECT, INDIRECT, OR
+SPECIAL DAMAGES WHETHER UNDER CONTRACT, TORT, WARRANTY, OR OTHERWISE,
+ARISING IN ANY WAY OUT OF THIS OR ANY OTHER AGREEMENT RELATING TO THIS
+DOCUMENT, WHETHER OR NOT SUCH PARTY HAD ADVANCE NOTICE OF THE
+POSSIBILITY OF SUCH DAMAGES.  
+
+--> 
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
+           elementFormDefault="qualified" >
+   
+  <xs:complexType mixed="true" name="tDocumentation" >
+    <xs:sequence>
+      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="tDocumented" >
+    <xs:annotation>
+      <xs:documentation>
+      This type is extended by  component types to allow them to be documented
+      </xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+	 
+  <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tDocumented" >
+        <xs:annotation>
+          <xs:documentation>
+          This type is extended by component types to allow attributes from other namespaces to be added.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:anyAttribute namespace="##other" processContents="lax" />    
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tExtensibleDocumented" abstract="true" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tDocumented" >
+        <xs:annotation>
+          <xs:documentation>
+          This type is extended by component types to allow elements from other namespaces to be added.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="definitions" type="wsdl:tDefinitions" >
+    <xs:key name="message" >
+      <xs:selector xpath="wsdl:message" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="portType" >
+      <xs:selector xpath="wsdl:portType" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="binding" >
+      <xs:selector xpath="wsdl:binding" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="service" >
+      <xs:selector xpath="wsdl:service" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="import" >
+      <xs:selector xpath="wsdl:import" />
+      <xs:field xpath="@namespace" />
+    </xs:key>
+  </xs:element>
+
+  <xs:group name="anyTopLevelOptionalElement" >
+    <xs:annotation>
+      <xs:documentation>
+      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice>
+      <xs:element name="import" type="wsdl:tImport" />
+      <xs:element name="types" type="wsdl:tTypes" />                     
+      <xs:element name="message"  type="wsdl:tMessage" >
+        <xs:unique name="part" >
+          <xs:selector xpath="wsdl:part" />
+          <xs:field xpath="@name" />
+        </xs:unique>
+      </xs:element>
+      <xs:element name="portType" type="wsdl:tPortType" />
+      <xs:element name="binding"  type="wsdl:tBinding" />
+      <xs:element name="service"  type="wsdl:tService" >
+        <xs:unique name="port" >
+          <xs:selector xpath="wsdl:port" />
+          <xs:field xpath="@name" />
+        </xs:unique>
+	  </xs:element>
+    </xs:choice>
+  </xs:group>
+
+  <xs:complexType name="tDefinitions" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:group ref="wsdl:anyTopLevelOptionalElement"  minOccurs="0"   maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional" />
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+   
+  <xs:complexType name="tImport" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
+        <xs:attribute name="location" type="xs:anyURI" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+   
+  <xs:complexType name="tTypes" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" />
+    </xs:complexContent>   
+  </xs:complexType>
+     
+  <xs:complexType name="tMessage" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+
+  <xs:complexType name="tPart" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="element" type="xs:QName" use="optional" />
+        <xs:attribute name="type" type="xs:QName" use="optional" />    
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+
+  <xs:complexType name="tPortType" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:sequence>
+          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+   
+  <xs:complexType name="tOperation" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+	    <xs:sequence>
+          <xs:choice>
+            <xs:group ref="wsdl:request-response-or-one-way-operation" />
+            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
+          </xs:choice>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+    
+  <xs:group name="request-response-or-one-way-operation" >
+    <xs:sequence>
+      <xs:element name="input" type="wsdl:tParam" />
+	  <xs:sequence minOccurs='0' >
+	    <xs:element name="output" type="wsdl:tParam" />
+		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:group name="solicit-response-or-notification-operation" >
+    <xs:sequence>
+      <xs:element name="output" type="wsdl:tParam" />
+	  <xs:sequence minOccurs='0' >
+	    <xs:element name="input" type="wsdl:tParam" />
+		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+	  </xs:sequence>
+    </xs:sequence>
+  </xs:group>
+        
+  <xs:complexType name="tParam" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+        <xs:attribute name="message" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tFault" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName"  use="required" />
+        <xs:attribute name="message" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tBinding" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="type" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+    
+  <xs:complexType name="tBindingOperationMessage" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="tBindingOperationFault" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tBindingOperation" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
+          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
+          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tService" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tPort" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="binding" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:attribute name="arrayType" type="xs:string" />
+  <xs:attribute name="required" type="xs:boolean" />
+  <xs:complexType name="tExtensibilityElement" abstract="true" >
+    <xs:attribute ref="wsdl:required" use="optional" />
+  </xs:complexType>
+
 </xs:schema>

Propchange: incubator/beehive/trunk/wsm/schemas/wsdl.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java Tue Jun 14 12:36:38 2005
@@ -1,30 +1,30 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.TYPE)
-public @interface HandlerChain {
-
-    String file();
-
-    String name();
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = ElementType.TYPE)
+public @interface HandlerChain {
+
+    String file();
+
+    String name();
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java Tue Jun 14 12:36:38 2005
@@ -1,26 +1,26 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.METHOD)
-public @interface Oneway {
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = ElementType.METHOD)
+public @interface Oneway {
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java Tue Jun 14 12:36:38 2005
@@ -1,30 +1,30 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.METHOD)
-public @interface WebMethod {
-
-    String action() default "";
-
-    String operationName() default "";
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = ElementType.METHOD)
+public @interface WebMethod {
+
+    String action() default "";
+
+    String operationName() default "";
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java Tue Jun 14 12:36:38 2005
@@ -1,38 +1,38 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.PARAMETER)
-public @interface WebParam {
-
-    boolean header() default false;
-
-    Mode mode() default Mode.IN;
-
-    String name() default "";
-
-    String targetNamespace() default "";
-
-    public enum Mode {
-        IN, OUT, INOUT
-    }
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = ElementType.PARAMETER)
+public @interface WebParam {
+
+    boolean header() default false;
+
+    Mode mode() default Mode.IN;
+
+    String name() default "";
+
+    String targetNamespace() default "";
+
+    public enum Mode {
+        IN, OUT, INOUT
+    }
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java Tue Jun 14 12:36:38 2005
@@ -1,30 +1,30 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.METHOD)
-public @interface WebResult {
-
-    String name() default "return";
-
-    String targetNamespace() default "";
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = ElementType.METHOD)
+public @interface WebResult {
+
+    String name() default "return";
+
+    String targetNamespace() default "";
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java Tue Jun 14 12:36:38 2005
@@ -1,36 +1,36 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.TYPE)
-public @interface WebService {
-
-    String endpointInterface() default "";
-
-    String name() default "";
-
-    String serviceName() default "";
-
-    String targetNamespace() default "";
-
-    String wsdlLocation() default "";
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = ElementType.TYPE)
+public @interface WebService {
+
+    String endpointInterface() default "";
+
+    String name() default "";
+
+    String serviceName() default "";
+
+    String targetNamespace() default "";
+
+    String wsdlLocation() default "";
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java Tue Jun 14 12:36:38 2005
@@ -1,22 +1,22 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws.soap;
-
-public @interface InitParam {
-    String name();
-
-    String value();
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws.soap;
+
+public @interface InitParam {
+    String name();
+
+    String value();
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java Tue Jun 14 12:36:38 2005
@@ -1,43 +1,43 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws.soap;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.TYPE)
-public @interface SOAPBinding {
-    ParameterStyle parameterStyle() default ParameterStyle.WRAPPED;
-
-    Style style() default Style.DOCUMENT;
-
-    Use use() default Use.LITERAL;
-
-    public enum ParameterStyle {
-        BARE, WRAPPED
-    }
-
-    public enum Style {
-        DOCUMENT, RPC
-    }
-
-    public enum Use {
-        LITERAL, ENCODED
-    }
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws.soap;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = ElementType.TYPE)
+public @interface SOAPBinding {
+    ParameterStyle parameterStyle() default ParameterStyle.WRAPPED;
+
+    Style style() default Style.DOCUMENT;
+
+    Use use() default Use.LITERAL;
+
+    public enum ParameterStyle {
+        BARE, WRAPPED
+    }
+
+    public enum Style {
+        DOCUMENT, RPC
+    }
+
+    public enum Use {
+        LITERAL, ENCODED
+    }
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java Tue Jun 14 12:36:38 2005
@@ -1,28 +1,28 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws.soap;
-
-public @interface SOAPMessageHandler {
-    String className();
-
-    String[] headers() default {};
-
-    InitParam[] initParams() default {};
-
-    String name() default "";
-
-    String[] roles() default {};
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws.soap;
+
+public @interface SOAPMessageHandler {
+    String className();
+
+    String[] headers() default {};
+
+    InitParam[] initParams() default {};
+
+    String name() default "";
+
+    String[] roles() default {};
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java Tue Jun 14 12:36:38 2005
@@ -1,27 +1,27 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.jws.soap;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.TYPE)
-public @interface SOAPMessageHandlers {
-    SOAPMessageHandler[] value();
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.jws.soap;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = ElementType.TYPE)
+public @interface SOAPMessageHandlers {
+    SOAPMessageHandler[] value();
 }

Propchange: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory (original)
+++ incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory Tue Jun 14 12:36:38 2005
@@ -1,5 +1,5 @@
-#
-# This configures APT so the WsmAnnotationProcessorFactory can be used to process WSM annotations
-#
-org.apache.beehive.wsm.processor.apt.WsmAnnotationProcessorFactory
-
+#
+# This configures APT so the WsmAnnotationProcessorFactory can be used to process WSM annotations
+#
+org.apache.beehive.wsm.processor.apt.WsmAnnotationProcessorFactory
+

Propchange: incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java Tue Jun 14 12:36:38 2005
@@ -1,77 +1,77 @@
-/*
- * AxisTypeGenerator.java
- * 
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * 
- * Original author: Jonathan Colwell
- */
-package org.apache.beehive.wsm.axis.ant;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-
-import org.apache.axis.wsdl.gen.Generator;
-import org.apache.axis.wsdl.gen.NoopGenerator;
-import org.apache.axis.wsdl.symbolTable.SymbolTable;
-import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.JavaGeneratorFactory;
-
-/**
- * ****************************************************************************
- *
- * @author Jonathan Colwell
- */
-public class AxisTypeGenerator
-    extends JavaGeneratorFactory {
-
-    public AxisTypeGenerator() {
-        super();
-        Emitter e = new Emitter();
-        setEmitter(e);
-        emitter.setFactory(this);
-    }
-
-    public void generateTypes(String wsdl, String outputDir)
-        throws Exception {
-
-        emitter.setOutputDir(outputDir);
-        emitter.run(wsdl);
-    }
-
-    public Generator getGenerator(Message message, SymbolTable symbolTable) {
-        return new NoopGenerator();
-    }
-
-    public Generator getGenerator(PortType portType, SymbolTable symbolTable) {
-        return new NoopGenerator();
-    }
-
-    public Generator getGenerator(Binding binding, SymbolTable symbolTable) {
-        return new NoopGenerator();
-    }
-
-    public Generator getGenerator(Service service, SymbolTable symbolTable) {
-        return new NoopGenerator();
-    }
-
-    public Generator getGenerator(Definition definition, SymbolTable symbolTable) {
-        return new NoopGenerator();
-    }
-}
+/*
+ * AxisTypeGenerator.java
+ * 
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * 
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.axis.ant;
+
+import javax.wsdl.Binding;
+import javax.wsdl.Definition;
+import javax.wsdl.Message;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+
+import org.apache.axis.wsdl.gen.Generator;
+import org.apache.axis.wsdl.gen.NoopGenerator;
+import org.apache.axis.wsdl.symbolTable.SymbolTable;
+import org.apache.axis.wsdl.toJava.Emitter;
+import org.apache.axis.wsdl.toJava.JavaGeneratorFactory;
+
+/**
+ * ****************************************************************************
+ *
+ * @author Jonathan Colwell
+ */
+public class AxisTypeGenerator
+    extends JavaGeneratorFactory {
+
+    public AxisTypeGenerator() {
+        super();
+        Emitter e = new Emitter();
+        setEmitter(e);
+        emitter.setFactory(this);
+    }
+
+    public void generateTypes(String wsdl, String outputDir)
+        throws Exception {
+
+        emitter.setOutputDir(outputDir);
+        emitter.run(wsdl);
+    }
+
+    public Generator getGenerator(Message message, SymbolTable symbolTable) {
+        return new NoopGenerator();
+    }
+
+    public Generator getGenerator(PortType portType, SymbolTable symbolTable) {
+        return new NoopGenerator();
+    }
+
+    public Generator getGenerator(Binding binding, SymbolTable symbolTable) {
+        return new NoopGenerator();
+    }
+
+    public Generator getGenerator(Service service, SymbolTable symbolTable) {
+        return new NoopGenerator();
+    }
+
+    public Generator getGenerator(Definition definition, SymbolTable symbolTable) {
+        return new NoopGenerator();
+    }
+}

Propchange: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java Tue Jun 14 12:36:38 2005
@@ -1,100 +1,100 @@
-/*
- * AxisTypeGeneratorTask.java
- * 
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * 
- * Original author: Jonathan Colwell
- */
-package org.apache.beehive.wsm.axis.ant;
-
-import java.io.File;
-import java.io.FileFilter;
-
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
-
-/**
- * ****************************************************************************
- *
- * @author Jonathan Colwell
- */
-public class AxisTypeGeneratorTask
-    extends Task {
-
-    private static final FileFilter WSDL_FILE_FILTER = new WSDLFilter();
-
-    private File mWSDL, mOutDir;
-    private boolean generateJWS = false;
-
-    /**
-     * @return Returns the generateJWS.
-     */
-    public boolean isGenerateJWS() {
-        return generateJWS;
-    }
-
-    /**
-     * @param generateJWS The generateJWS to set.
-     */
-    public void setGenerateJWS(boolean generateJWS) {
-        this.generateJWS = generateJWS;
-    }
-
-    public void setWSDLDir(File wsdl) {
-        mWSDL = wsdl;
-    }
-
-    public void setOutputDir(File outputDir) {
-        mOutDir = outputDir;
-    }
-
-    public void execute()
-        throws BuildException {
-        try {
-            if(mOutDir != null && mWSDL != null && mWSDL.isDirectory()) {
-                AxisTypeGenerator atg = new AxisTypeGenerator();
-                for(File f : mWSDL.listFiles(WSDL_FILE_FILTER)) {
-                    atg.generateTypes(f.getPath(), mOutDir.getPath());
-                }
-            }
-            else {
-                throw new BuildException("Both a valid wsdl directory and an output directory must be provided.");
-            }
-        }
-        catch(Throwable e) {
-            e.printStackTrace();
-            if(e instanceof BuildException) {
-                throw (BuildException)e;
-            }
-            else {
-                throw new BuildException(e.toString(), e);
-            }
-        }
-    }
-
-    private static class WSDLFilter
-        implements java.io.FileFilter {
-
-        public boolean accept(java.io.File f) {
-            return (f.isFile() && (f.getName().endsWith("wsdl") || f.getName().endsWith("WSDL")));
-        }
-    }
-}
+/*
+ * AxisTypeGeneratorTask.java
+ * 
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * 
+ * Original author: Jonathan Colwell
+ */
+package org.apache.beehive.wsm.axis.ant;
+
+import java.io.File;
+import java.io.FileFilter;
+
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
+
+/**
+ * ****************************************************************************
+ *
+ * @author Jonathan Colwell
+ */
+public class AxisTypeGeneratorTask
+    extends Task {
+
+    private static final FileFilter WSDL_FILE_FILTER = new WSDLFilter();
+
+    private File mWSDL, mOutDir;
+    private boolean generateJWS = false;
+
+    /**
+     * @return Returns the generateJWS.
+     */
+    public boolean isGenerateJWS() {
+        return generateJWS;
+    }
+
+    /**
+     * @param generateJWS The generateJWS to set.
+     */
+    public void setGenerateJWS(boolean generateJWS) {
+        this.generateJWS = generateJWS;
+    }
+
+    public void setWSDLDir(File wsdl) {
+        mWSDL = wsdl;
+    }
+
+    public void setOutputDir(File outputDir) {
+        mOutDir = outputDir;
+    }
+
+    public void execute()
+        throws BuildException {
+        try {
+            if(mOutDir != null && mWSDL != null && mWSDL.isDirectory()) {
+                AxisTypeGenerator atg = new AxisTypeGenerator();
+                for(File f : mWSDL.listFiles(WSDL_FILE_FILTER)) {
+                    atg.generateTypes(f.getPath(), mOutDir.getPath());
+                }
+            }
+            else {
+                throw new BuildException("Both a valid wsdl directory and an output directory must be provided.");
+            }
+        }
+        catch(Throwable e) {
+            e.printStackTrace();
+            if(e instanceof BuildException) {
+                throw (BuildException)e;
+            }
+            else {
+                throw new BuildException(e.toString(), e);
+            }
+        }
+    }
+
+    private static class WSDLFilter
+        implements java.io.FileFilter {
+
+        public boolean accept(java.io.File f) {
+            return (f.isFile() && (f.getName().endsWith("wsdl") || f.getName().endsWith("WSDL")));
+        }
+    }
+}

Propchange: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java Tue Jun 14 12:36:38 2005
@@ -1,85 +1,85 @@
-/*
- * AxisTypeGeneratorTask.java
- * 
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * 
- */
-package org.apache.beehive.wsm.axis.ant;
-
-import java.io.File;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.taskdefs.Java;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
-
-public class WSDL2AJavaTask
-    extends Java {
-
-    private File mWSDL;
-    private File mOutDir;
-
-    public WSDL2AJavaTask() {
-        super();
-    }
-
-    public void setWSDLFile(File wsdl) {
-        mWSDL = wsdl;
-    }
-
-    public void setOutputDir(File outputDir) {
-        mOutDir = outputDir;
-    }
-
-    /**
-     * Classpath to use, by reference.
-     *
-     * @param r a reference to an existing classpath
-     */
-    public void setClasspathRef(Reference r) {
-        super.setClasspathRef(r);
-    }
-
-    /**
-     * Set the classpath to be used when running the Java class
-     *
-     * @param s an Ant Path object containing the classpath.
-     */
-    public void setClasspath(Path s) {
-        super.setClasspath(s);
-    }
-
-    public void execute()
-        throws BuildException {
-        try {
-            setClassname("org.apache.beehive.wsm.axis.tools.Wsdl2AJava");
-            setArgs(mWSDL.getCanonicalPath());
-            setArgs(mOutDir.getCanonicalPath());
-            super.execute();
-
-        }
-        catch(Throwable e) {
-            e.printStackTrace();
-            if(e instanceof BuildException) {
-                throw (BuildException)e;
-            }
-            else {
-                throw new BuildException(e.toString(), e);
-            }
-        }
-    }
-}
+/*
+ * AxisTypeGeneratorTask.java
+ * 
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * 
+ */
+package org.apache.beehive.wsm.axis.ant;
+
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
+
+public class WSDL2AJavaTask
+    extends Java {
+
+    private File mWSDL;
+    private File mOutDir;
+
+    public WSDL2AJavaTask() {
+        super();
+    }
+
+    public void setWSDLFile(File wsdl) {
+        mWSDL = wsdl;
+    }
+
+    public void setOutputDir(File outputDir) {
+        mOutDir = outputDir;
+    }
+
+    /**
+     * Classpath to use, by reference.
+     *
+     * @param r a reference to an existing classpath
+     */
+    public void setClasspathRef(Reference r) {
+        super.setClasspathRef(r);
+    }
+
+    /**
+     * Set the classpath to be used when running the Java class
+     *
+     * @param s an Ant Path object containing the classpath.
+     */
+    public void setClasspath(Path s) {
+        super.setClasspath(s);
+    }
+
+    public void execute()
+        throws BuildException {
+        try {
+            setClassname("org.apache.beehive.wsm.axis.tools.Wsdl2AJava");
+            setArgs(mWSDL.getCanonicalPath());
+            setArgs(mOutDir.getCanonicalPath());
+            super.execute();
+
+        }
+        catch(Throwable e) {
+            e.printStackTrace();
+            if(e instanceof BuildException) {
+                throw (BuildException)e;
+            }
+            else {
+                throw new BuildException(e.toString(), e);
+            }
+        }
+    }
+}

Propchange: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java Tue Jun 14 12:36:38 2005
@@ -1,122 +1,122 @@
-/*
- * 
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * 
- */
-package org.apache.beehive.wsm.axis.databinding;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis.description.TypeDesc;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.axis.wsdl.fromJava.Namespaces;
-import org.apache.axis.wsdl.fromJava.Types;
-import org.apache.axis.wsdl.toJava.Utils;
-import org.apache.beehive.wsm.axis.registration.AxisTypeMappingMetaData;
-import org.apache.beehive.wsm.databinding.BindingLookupService;
-
-public class AxisTypeLookup
-    implements BindingLookupService {
-
-    private static final char[] pkgSeparators = {'.', ':'};
-
-    public AxisTypeLookup() {
-        super();
-    }
-
-    /*
-     * @see TypeLookUpServices#getClassQName(java.lang.Class)
-     */
-    public QName class2qname(Class cls) {
-        if(cls.isArray())
-            cls = cls.getComponentType();
-
-        TypeDesc td = TypeDesc.getTypeDescForClass(cls);
-
-        if(null != td) {
-            return td.getXmlType();
-        }
-        else {
-            String namespace = Namespaces.makeNamespace(cls.getName());
-            if(namespace == null || namespace.endsWith("DefaultNamespace")) {
-                namespace = "http://no.namespace.specified";
-            }
-            return class2qname(cls, namespace);
-        }
-    }
-
-    /**
-     * @param cls
-     * @param namespace
-     * @return
-     */
-    public QName class2qname(Class cls, String namespace) {
-        if(AxisTypeMappingMetaData.isBuiltInType(cls))
-            return AxisTypeMappingMetaData.getBuiltInTypeQname(cls);
-        return new QName(namespace, Types.getLocalNameFromFullName(cls.getName()));
-    }
-
-    public Class qname2class(QName qType) {
-
-        if(qType == null) {
-            return null;
-        }
-
-        String packageName = getPackageNameFromQName(qType);
-        String className;
-        if(packageName != null && packageName.length() > 0) {
-            className = packageName + "." + Utils.xmlNameToJavaClass(qType.getLocalPart());
-        }
-        else {
-            className = Utils.xmlNameToJavaClass(qType.getLocalPart());
-        }
-
-        Class javaType = null;
-        try {
-            javaType = ClassUtils.forName(className);
-        }
-        catch(ClassNotFoundException e) {
-            System.out.println("Failed to find the class: " + className
-                + " No Axis generated classes was found for qname: "
-                + qType);
-        }
-
-        if(null != javaType)
-            System.out.println("Found an Axis generated type for qname: "
-                + qType + " class: " + javaType.getCanonicalName());
-
-        return javaType;
-    }
-
-    private String getPackageNameFromQName(QName qType) {
-
-        // TODO: Later keep a cache of previous conversions, and return the
-        // result from cache if there is any.
-        String packageName = Utils.makePackageName(qType.getNamespaceURI());
-        packageName = normalizePackageName(packageName, '.');
-        return packageName;
-    }
-
-    private static String normalizePackageName(String pkg, char separator) {
-
-        for(int i = 0; i < pkgSeparators.length; i++) {
-            pkg = pkg.replace(pkgSeparators[i], separator);
-        }
-
-        return pkg;
-    }
-}
+/*
+ * 
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * 
+ */
+package org.apache.beehive.wsm.axis.databinding;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis.description.TypeDesc;
+import org.apache.axis.utils.ClassUtils;
+import org.apache.axis.wsdl.fromJava.Namespaces;
+import org.apache.axis.wsdl.fromJava.Types;
+import org.apache.axis.wsdl.toJava.Utils;
+import org.apache.beehive.wsm.axis.registration.AxisTypeMappingMetaData;
+import org.apache.beehive.wsm.databinding.BindingLookupService;
+
+public class AxisTypeLookup
+    implements BindingLookupService {
+
+    private static final char[] pkgSeparators = {'.', ':'};
+
+    public AxisTypeLookup() {
+        super();
+    }
+
+    /*
+     * @see TypeLookUpServices#getClassQName(java.lang.Class)
+     */
+    public QName class2qname(Class cls) {
+        if(cls.isArray())
+            cls = cls.getComponentType();
+
+        TypeDesc td = TypeDesc.getTypeDescForClass(cls);
+
+        if(null != td) {
+            return td.getXmlType();
+        }
+        else {
+            String namespace = Namespaces.makeNamespace(cls.getName());
+            if(namespace == null || namespace.endsWith("DefaultNamespace")) {
+                namespace = "http://no.namespace.specified";
+            }
+            return class2qname(cls, namespace);
+        }
+    }
+
+    /**
+     * @param cls
+     * @param namespace
+     * @return
+     */
+    public QName class2qname(Class cls, String namespace) {
+        if(AxisTypeMappingMetaData.isBuiltInType(cls))
+            return AxisTypeMappingMetaData.getBuiltInTypeQname(cls);
+        return new QName(namespace, Types.getLocalNameFromFullName(cls.getName()));
+    }
+
+    public Class qname2class(QName qType) {
+
+        if(qType == null) {
+            return null;
+        }
+
+        String packageName = getPackageNameFromQName(qType);
+        String className;
+        if(packageName != null && packageName.length() > 0) {
+            className = packageName + "." + Utils.xmlNameToJavaClass(qType.getLocalPart());
+        }
+        else {
+            className = Utils.xmlNameToJavaClass(qType.getLocalPart());
+        }
+
+        Class javaType = null;
+        try {
+            javaType = ClassUtils.forName(className);
+        }
+        catch(ClassNotFoundException e) {
+            System.out.println("Failed to find the class: " + className
+                + " No Axis generated classes was found for qname: "
+                + qType);
+        }
+
+        if(null != javaType)
+            System.out.println("Found an Axis generated type for qname: "
+                + qType + " class: " + javaType.getCanonicalName());
+
+        return javaType;
+    }
+
+    private String getPackageNameFromQName(QName qType) {
+
+        // TODO: Later keep a cache of previous conversions, and return the
+        // result from cache if there is any.
+        String packageName = Utils.makePackageName(qType.getNamespaceURI());
+        packageName = normalizePackageName(packageName, '.');
+        return packageName;
+    }
+
+    private static String normalizePackageName(String pkg, char separator) {
+
+        for(int i = 0; i < pkgSeparators.length; i++) {
+            pkg = pkg.replace(pkgSeparators[i], separator);
+        }
+
+        return pkg;
+    }
+}

Propchange: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java?rev=190652&r1=190651&r2=190652&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java Tue Jun 14 12:36:38 2005
@@ -1,77 +1,77 @@
-/*
- * 
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * 
- */
-package org.apache.beehive.wsm.axis.databinding;
-
-import java.util.ArrayList;
-import javax.xml.namespace.QName;
-
-import org.apache.beehive.wsm.databinding.BindingLookupService;
-import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanTypeLookup;
-
-public class SystemTypeLookupService
-    implements BindingLookupService {
-
-    private ArrayList<BindingLookupService> LOOKUP_SERVICE_LIST = new ArrayList<BindingLookupService>();
-
-    public SystemTypeLookupService() {
-        LOOKUP_SERVICE_LIST.add(new XmlBeanTypeLookup());
-        LOOKUP_SERVICE_LIST.add(new AxisTypeLookup());
-    }
-
-    /*
-     * @see TypeLookUpServices#getClassQName(java.lang.Class)
-     */
-    public QName class2qname(Class cls) {
-        QName qname = null;
-
-        for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
-            if(null != (qname = lookUpService.class2qname(cls)))
-                break;
-        }
-        return qname;
-    }
-
-    /*
-     * @see TypeLookUpServices#getClassQName(java.lang.Class)
-     */
-    public QName class2qname(Class cls, String namespace) {
-        QName qname = null;
-
-        for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
-            if(null != (qname = lookUpService.class2qname(cls, namespace)))
-                break;
-        }
-        return qname;
-    }
-
-    /*
-     * @see TypeLookUpServices#Qname2Class(javax.xml.namespace.QName)
-     */
-    public Class qname2class(QName qname) {
-        Class cls = null;
-        for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
-            if(null != (cls = lookUpService.qname2class(qname)))
-                break;
-        }
-        if(null == cls)
-            cls = Object.class;
-        return cls;
-    }
-}
+/*
+ * 
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * 
+ */
+package org.apache.beehive.wsm.axis.databinding;
+
+import java.util.ArrayList;
+import javax.xml.namespace.QName;
+
+import org.apache.beehive.wsm.databinding.BindingLookupService;
+import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanTypeLookup;
+
+public class SystemTypeLookupService
+    implements BindingLookupService {
+
+    private ArrayList<BindingLookupService> LOOKUP_SERVICE_LIST = new ArrayList<BindingLookupService>();
+
+    public SystemTypeLookupService() {
+        LOOKUP_SERVICE_LIST.add(new XmlBeanTypeLookup());
+        LOOKUP_SERVICE_LIST.add(new AxisTypeLookup());
+    }
+
+    /*
+     * @see TypeLookUpServices#getClassQName(java.lang.Class)
+     */
+    public QName class2qname(Class cls) {
+        QName qname = null;
+
+        for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
+            if(null != (qname = lookUpService.class2qname(cls)))
+                break;
+        }
+        return qname;
+    }
+
+    /*
+     * @see TypeLookUpServices#getClassQName(java.lang.Class)
+     */
+    public QName class2qname(Class cls, String namespace) {
+        QName qname = null;
+
+        for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
+            if(null != (qname = lookUpService.class2qname(cls, namespace)))
+                break;
+        }
+        return qname;
+    }
+
+    /*
+     * @see TypeLookUpServices#Qname2Class(javax.xml.namespace.QName)
+     */
+    public Class qname2class(QName qname) {
+        Class cls = null;
+        for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
+            if(null != (cls = lookUpService.qname2class(qname)))
+                break;
+        }
+        if(null == cls)
+            cls = Object.class;
+        return cls;
+    }
+}

Propchange: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java
------------------------------------------------------------------------------
    svn:eol-style = native