You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/04/01 08:38:11 UTC

svn commit: r1087597 - /geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd

Author: xuhaihong
Date: Fri Apr  1 06:38:11 2011
New Revision: 1087597

URL: http://svn.apache.org/viewvc?rev=1087597&view=rev
Log:
Move the wsdl-file as one of the choice, thinking since that the whole wsdl file is replaced, it makes no sense to have the function for updating part of its contents.

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=1087597&r1=1087596&r2=1087597&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 Fri Apr  1 06:38:11 2011
@@ -1059,20 +1059,20 @@
                         descriptor.
                     </xsd:documentation>
                 </xsd:annotation>
-            </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:element>            
             <xsd:choice>
+                <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:element name="service-completion"
                     type="gernaming:service-completionType">
                     <xsd:annotation>