geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r290169 - in /geronimo/trunk/modules: axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java naming-builder/src/schema/geronimo-naming.xsd
Date Mon, 19 Sep 2005 14:22:59 GMT
Author: djencks
Date: Mon Sep 19 07:22:53 2005
New Revision: 290169

URL: http://svn.apache.org/viewcvs?rev=290169&view=rev
Log:
GERONIMO-918  use delegation rather than extension for port-completion element

Modified:
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
    geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java?rev=290169&r1=290168&r2=290169&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
(original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
Mon Sep 19 07:22:53 2005
@@ -258,12 +258,13 @@
             serviceQName = new QName(namespace, serviceLocalName);
             javax.wsdl.Service service = definition.createService();
             service.setQName(serviceQName);
-            GerPortCompletionType[] ports = serviceCompletion.getPortArray();
-            for (int i = 0; i < ports.length; i++) {
-                GerPortCompletionType port = ports[i];
+            GerPortCompletionType[] portCompletions = serviceCompletion.getPortCompletionArray();
+            for (int i = 0; i < portCompletions.length; i++) {
+                GerPortCompletionType portCompletion = portCompletions[i];
+                GerPortType port = portCompletion.getPort();
                 URL location = getLocation(port);
                 String portName = port.getPortName().trim();
-                String bindingName = port.getBindingName().trim();
+                String bindingName = portCompletion.getBindingName().trim();
                 QName bindingQName = new QName(namespace, bindingName);
                 Binding binding = definition.getBinding(bindingQName);
                 if (binding == null) {

Modified: geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd?rev=290169&r1=290168&r2=290169&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd (original)
+++ geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd Mon Sep 19 07:22:53
2005
@@ -223,18 +223,15 @@
     <xsd:complexType name="service-completionType">
         <xsd:sequence>
             <xsd:element name="service-name" type="xsd:string"/>
-            <xsd:element name="port" type="gernaming:port-completionType" maxOccurs="unbounded"/>
+            <xsd:element name="port-completion" type="gernaming:port-completionType" maxOccurs="unbounded"/>
         </xsd:sequence>
     </xsd:complexType>
 
     <xsd:complexType name="port-completionType">
-        <xsd:complexContent>
-            <xsd:extension base="gernaming:portType">
-                <xsd:sequence>
-                    <xsd:element name="binding-name" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
+        <xsd:sequence>
+            <xsd:element name="port" type="gernaming:portType"/>
+            <xsd:element name="binding-name" type="xsd:string"/>
+        </xsd:sequence>
     </xsd:complexType>
 
     <xsd:group name="corbaNameGroup">



Mime
View raw message