You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2005/02/16 06:13:02 UTC
svn commit: r153993 - in
webservices/axis/trunk/java/dev/scratch/prototype2/src/schema: common.xsd
java-elt.xsd module.xsd server.xsd service.xsd
Author: ajith
Date: Tue Feb 15 21:12:59 2005
New Revision: 153993
URL: http://svn.apache.org/viewcvs?view=rev&rev=153993
Log:
Repaired the schema files using XMLSpy. Now the schemas are valid. But they may lack certain elements that we have already discussed but not supported yet
Added:
webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/java-elt.xsd
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/common.xsd
webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/module.xsd
webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/server.xsd
webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/service.xsd
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/common.xsd
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/common.xsd?view=diff&r1=153992&r2=153993
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/common.xsd (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/common.xsd Tue Feb 15 21:12:59 2005
@@ -1,49 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://xml.apache.org/axis/wsdd/" xmlns:wsdd="http://xml.apache.org/axis/wsdd/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
- <complexType name="parameter">
- <attribute name="name" type="xsd:NCName" use="required"/>
- <attribute name="locked" type="xsd:boolean" use="optional" default="false"/>
- <attribute name="value" type="xsd:string" use="optional"/>
- </complexType>
-
- <complexType name="handler">
- <choice>
- <attribute name="ref" type="xsd:NCName" use="required"/>
- <all>
- <attribute name="name" type="xsd:NCName" use="required"/>
- <attribute name="class" type="xsd:string" use="required"/>
- <element ref="wsdd:parameter" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="wsdd:order" minOccurs="0" maxOccurs="unbounded"/>
- </all>
- </choice>
- </complexType>
-
- <complexType name="order">
- <choice>
- <all>
- <attribute name="before" type="xsd:anyURI" use="optional"/>
- <attribute name="after" type="xsd:anyURI" use="optional"/>
- </all>
- <all>
- <attribute name="phase" type="xsd:anyURI" use="required"/>
- <attribute name="phaseFirst" type="xsd:anyURI" use="optional"/>
- <attribute name="phaseLast" type="xsd:anyURI" use="optional"/>
- </all
- </choice>
- </complexType>
-
- <complexType name="inflow">
- <element ref="wsdd:handler" minOccurs="0" maxOccurs="unbounded"/>
- </complexType>
- <complexType name="outflow">
- <element ref="wsdd:handler" minOccurs="0" maxOccurs="unbounded"/>
- </complexType>
- <complexType name="faultflow">
- <element ref="wsdd:handler" minOccurs="0" maxOccurs="unbounded"/>
- </complexType>
- <complexType name="typemapping">
- <!-- todo specify this -->
- </complexType>
-
-
+<schema xmlns:wsdd="http://xml.apache.org/axis/wsdd/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://xml.apache.org/axis/wsdd/" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
+ <element name="parameter">
+ <complexType>
+ <attribute name="name" type="xsd:NCName" use="required"/>
+ <attribute name="locked" type="xsd:boolean" use="optional" default="false"/>
+ <attribute name="value" type="xsd:string" use="optional"/>
+ </complexType>
+ </element>
+ <element name="handler">
+ <complexType>
+ <sequence>
+ <element ref="wsdd:parameter" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="name" type="xsd:NCName" use="required"/>
+ <attribute name="class" type="xsd:string" use="required"/>
+ </complexType>
+ </element>
+ <element name="inflow">
+ <complexType>
+ <sequence>
+ <element ref="wsdd:handler" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="outflow">
+ <complexType>
+ <sequence>
+ <element ref="wsdd:handler" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="faultflow">
+ <complexType>
+ <sequence>
+ <element ref="wsdd:handler" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
</schema>
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/java-elt.xsd
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/java-elt.xsd?view=auto&rev=153993
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/java-elt.xsd (added)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/java-elt.xsd Tue Feb 15 21:12:59 2005
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:java="http://ws.apache.org/axis2/deployment/java" targetNamespace="http://ws.apache.org/axis2/deployment/java" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="implementation">
+ <xs:annotation>
+ <xs:documentation>Java implementation element</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="class" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/module.xsd
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/module.xsd?view=diff&r1=153992&r2=153993
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/module.xsd (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/module.xsd Tue Feb 15 21:12:59 2005
@@ -1,23 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://xml.apache.org/axis/wsdd/"
- xmlns:wsdd="http://xml.apache.org/axis/wsdd/"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:java="http://ws.apache.org/axis2/deployment/java"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
- <include schemaLocation = "common.xsd" />
- <complexType name="module">
- <choice>
- <attribute name="ref" type="xsd:NCName" use="required"/>
- <all>
- <element ref="wsdd:operation" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="wsdd:inflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:outflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:faultflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:typemapping" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="wsdd:parameter" minOccurs="0" maxOccurs="unbounded"/>
- </all>
- </complexType>
- </schema>
-
-
+<schema targetNamespace="http://xml.apache.org/axis/wsdd/" xmlns:wsdd="http://xml.apache.org/axis/wsdd/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:java="http://ws.apache.org/axis2/deployment/java" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
+ <include schemaLocation = "common.xsd" />
+ <element name="module">
+ <complexType>
+ <sequence>
+ <element ref="wsdd:inflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:outflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:faultflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:parameter" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="ref" type="xsd:NCName" use="required"/>
+ </complexType>
+ </element>
+</schema>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/server.xsd
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/server.xsd?view=diff&r1=153992&r2=153993
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/server.xsd (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/server.xsd Tue Feb 15 21:12:59 2005
@@ -1,29 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://xml.apache.org/axis/wsdd/"
- xmlns:wsdd="http://xml.apache.org/axis/wsdd/"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:java="http://ws.apache.org/axis2/deployment/java"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
- <include schemaLocation = "common.xsd" />
- <include schemaLocation = "module.xsd" />
- <complexType name="service">
- <element ref="wsdd:inflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:outflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:faultflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:typemapping" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="wsdd:parameter" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="wsdd:phaseOrder" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:module" minOccurs="0" maxOccurs="unbounded"/>
- </complexType>
-
- <complexType name="phaseOrder">
- <element name="phase" ref="phase" minOccurs="0" maxOccurs="unbounded"/>
- </complexType>
- <complexType name="phase">
- <attribute name="name" type="xsd:anyURI" use="required"/>
- </complexType>
-
- </schema>
-
-
+<schema targetNamespace="http://xml.apache.org/axis/wsdd/" xmlns:wsdd="http://xml.apache.org/axis/wsdd/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:java="http://ws.apache.org/axis2/deployment/java" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
+ <include schemaLocation="module.xsd"/>
+ <element name="service">
+ <complexType>
+ <sequence>
+ <element ref="wsdd:inflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:outflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:faultflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:parameter" minOccurs="0" maxOccurs="unbounded"/>
+ <element ref="wsdd:phaseOrder" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:module" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="phaseOrder">
+ <complexType>
+ <sequence>
+ <element ref="wsdd:phase" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="phase">
+ <complexType>
+ <attribute name="name" type="xsd:anyURI" use="required"/>
+ </complexType>
+ </element>
+</schema>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/service.xsd
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/service.xsd?view=diff&r1=153992&r2=153993
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/service.xsd (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/schema/service.xsd Tue Feb 15 21:12:59 2005
@@ -1,41 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://xml.apache.org/axis/wsdd/"
- xmlns:wsdd="http://xml.apache.org/axis/wsdd/"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:java="http://ws.apache.org/axis2/deployment/java"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
- <include schemaLocation = "common.xsd" />
- <include schemaLocation = "module.xsd" />
- <complexType name="service">
- <attribute name="provider" type="xsd:string" use="required"/>
- <attribute name="style" type="xsd:string" use="optional" default="false"/>
- <element ref="java:implementation" minOccurs="1" maxOccurs="1"/>
- <element ref="wsdd:operation" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="wsdd:inflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:outflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:faultflow" minOccurs="0" maxOccurs="1"/>
- <element ref="wsdd:typemapping" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="wsdd:parameter" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="wsdd:module" minOccurs="0" maxOccurs="unbounded"/>
- <!-- <attribute name="contextPath" type="xsd:string" use="optional"/> -->
- </complexType>
+<schema targetNamespace="http://xml.apache.org/axis/wsdd/" xmlns:wsdd="http://xml.apache.org/axis/wsdd/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:java="http://ws.apache.org/axis2/deployment/java" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
- <complexType name="java:implementation">
- <choice>
- <attribute name="class" type="xsd:string" use="required"/>
- </choice>
- </complexType>
+ <include schemaLocation="module.xsd"/>
+ <import namespace="http://ws.apache.org/axis2/deployment/java" schemaLocation="java-elt.xsd"/>
+
+ <element name="service">
+ <complexType>
+ <sequence>
+ <element ref="java:implementation" minOccurs="1" maxOccurs="1"/>
+ <element ref="wsdd:operation" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="wsdd:inflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:outflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:faultflow" minOccurs="0" maxOccurs="1"/>
+ <element ref="wsdd:parameter" minOccurs="0" maxOccurs="unbounded"/>
+ <element ref="wsdd:module" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="provider" type="xsd:string" use="required"/>
+ <attribute name="style" type="xsd:string" use="optional" default="false"/>
+ </complexType>
+ </element>
+ <element name="operation">
+ <complexType>
+ <attribute name="name" type="xsd:NCName" use="required"/>
+ <attribute name="qname" type="xsd:QName" use="optional"/>
+ <attribute name="style" type="xsd:anyURI" use="optional"/>
+ <attribute name="use" type="xsd:anyURI" use="optional"/>
+ </complexType>
+ </element>
+</schema>
- <complexType name="operation">
- <choice>
- <attribute name="name" type="xsd:NCName" use="required"/>
- <attribute name="qname" type="xsd:qname" use="optional"/>
- <attribute name="style" type="xsd:anyURI" use="optional"/>
- <attribute name="use" type="xsd:anyURI" use="optional"/>
- </all
- </choice>
- </complexType>
- </schema>
-
-