geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1099668 - /geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
Date Thu, 05 May 2011 02:24:55 GMT
Author: xuhaihong
Date: Thu May  5 02:24:55 2011
New Revision: 1099668

URL: http://svn.apache.org/viewvc?rev=1099668&view=rev
Log:
Seems we need to allow to use wsdl-file and port at the same time, as those security configurations
are included in the port element.

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd?rev=1099668&r1=1099667&r2=1099668&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
Thu May  5 02:24:55 2011
@@ -1059,20 +1059,20 @@
                         descriptor.
                     </xsd:documentation>
                 </xsd:annotation>
-            </xsd:element>            
-            <xsd:choice>
-                <xsd:element name="wsdl-file"
+            </xsd:element>
+            <xsd:element name="wsdl-file"
                         type="xsd:anyURI"
                         minOccurs="0"
                         maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            The element wsdl-file is used to provide updated wsdl file URI,

-                            it overrides the configuration from WebServiceClient and 
-                            specification deployment descriptor.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The element wsdl-file is used to provide updated wsdl file URI, 
+                        it overrides the configuration from WebServiceClient and 
+                        specification deployment descriptor.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>            
+            <xsd:choice minOccurs="0">
                 <xsd:element name="service-completion"
                     type="gernaming:service-completionType">
                     <xsd:annotation>



Mime
View raw message