You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2010/05/19 05:05:17 UTC

svn commit: r946004 - in /synapse/trunk/java/repository/schema: endpoint.xsd misc/common.xsd misc/wsdl11.xsd misc/wsdl20.xsd proxy.xsd wsdl/

Author: ruwan
Date: Wed May 19 03:05:17 2010
New Revision: 946004

URL: http://svn.apache.org/viewvc?rev=946004&view=rev
Log:
completing the wsdl endpoint

Added:
    synapse/trunk/java/repository/schema/misc/wsdl11.xsd
      - copied unchanged from r944751, synapse/trunk/java/repository/schema/wsdl/wsdl11.xsd
    synapse/trunk/java/repository/schema/misc/wsdl20.xsd
      - copied unchanged from r944751, synapse/trunk/java/repository/schema/wsdl/wsdl20.xsd
Removed:
    synapse/trunk/java/repository/schema/wsdl/
Modified:
    synapse/trunk/java/repository/schema/endpoint.xsd
    synapse/trunk/java/repository/schema/misc/common.xsd
    synapse/trunk/java/repository/schema/proxy.xsd

Modified: synapse/trunk/java/repository/schema/endpoint.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/endpoint.xsd?rev=946004&r1=946003&r2=946004&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/endpoint.xsd (original)
+++ synapse/trunk/java/repository/schema/endpoint.xsd Wed May 19 03:05:17 2010
@@ -76,7 +76,17 @@
                 </xs:complexType>
             </xs:element>
             <xs:element name="wsdl">
-                <!-- TODO : WSDL endpoint -->
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="DefaultEndpoint">
+                            <xs:group ref="inlineWsdl" minOccurs="0" maxOccurs="1"/>
+                            <!-- TODO : fix the schema complication by changing the config -->
+                            <xs:attribute name="uri" type="xs:anyURI" use="optional"/>
+                            <xs:attribute name="service" type="xs:string" use="required"/>
+                            <xs:attribute name="port" type="xs:string" use="required"/>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
             </xs:element>
         </xs:choice>
     </xs:group>

Modified: synapse/trunk/java/repository/schema/misc/common.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/misc/common.xsd?rev=946004&r1=946003&r2=946004&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/misc/common.xsd (original)
+++ synapse/trunk/java/repository/schema/misc/common.xsd Wed May 19 03:05:17 2010
@@ -20,7 +20,11 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
            targetNamespace="http://synapse.apache.org/ns/2010/04/configuration"
-           xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+           xmlns="http://synapse.apache.org/ns/2010/04/configuration"
+           xmlns:wsdl11="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl20="http://www.w3.org/ns/wsdl">
+
+    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="wsdl11.xsd"/>
+    <xs:import namespace="http://www.w3.org/ns/wsdl" schemaLocation="wsdl20.xsd"/>
 
     <xs:element name="resource">
         <xs:annotation>
@@ -49,6 +53,13 @@
             </xs:complexContent>
         </xs:complexType>
     </xs:element>
+
+    <xs:group name="inlineWsdl">
+        <xs:choice>
+            <xs:element ref="wsdl11:definitions" minOccurs="0" maxOccurs="1"/>
+            <xs:element ref="wsdl20:description" minOccurs="0" maxOccurs="1"/>
+        </xs:choice>
+    </xs:group>
     
     <xs:attributeGroup name="monitoringAspect">
         <xs:annotation>

Modified: synapse/trunk/java/repository/schema/proxy.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/proxy.xsd?rev=946004&r1=946003&r2=946004&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/proxy.xsd (original)
+++ synapse/trunk/java/repository/schema/proxy.xsd Wed May 19 03:05:17 2010
@@ -20,13 +20,10 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
            targetNamespace="http://synapse.apache.org/ns/2010/04/configuration"
-           xmlns="http://synapse.apache.org/ns/2010/04/configuration"
-           xmlns:wsdl11="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl20="http://www.w3.org/ns/wsdl">
+           xmlns="http://synapse.apache.org/ns/2010/04/configuration">
 
     <xs:include schemaLocation="misc/target.xsd"/>
     <xs:include schemaLocation="misc/common.xsd"/>
-    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="wsdl/wsdl11.xsd"/>
-    <xs:import namespace="http://www.w3.org/ns/wsdl" schemaLocation="wsdl/wsdl20.xsd"/>
 
     <xs:element name="proxy" type="Proxy">
         <xs:annotation>
@@ -69,11 +66,4 @@
         <xs:attribute name="pinnedServers" use="optional"/>
     </xs:complexType>
 
-    <xs:group name="inlineWsdl">
-        <xs:choice>
-            <xs:element ref="wsdl11:definitions" minOccurs="0" maxOccurs="1"/>
-            <xs:element ref="wsdl20:description" minOccurs="0" maxOccurs="1"/>
-        </xs:choice>
-    </xs:group>
-
 </xs:schema>
\ No newline at end of file