Changeset 1904

Timestamp:

07/22/07 18:31:26 (1 year ago)

Author:

nahi

Message:

• added anyAttribute support. (just ignore anyAttribute because wsdll2ruby.rb now generates xmlattr method. use it for adding any attribute.) closes #390.
  

Files:

• trunk/lib/wsdl/xmlSchema/anyAttribute.rb (added)
• trunk/lib/wsdl/xmlSchema/complexType.rb (modified) (3 diffs)
• trunk/lib/wsdl/xmlSchema/data.rb (modified) (2 diffs)
• trunk/test/wsdl/any/expectedMappingRegistry.rb (added)
• trunk/test/wsdl/any/test_any.rb (modified) (1 diff)

trunk/lib/wsdl/xmlSchema/complexType.rb

@@ -24 +24 @@
-  attr_accessor :mixed
-  attr_accessor :abstract
+  attr_accessor :anyattribute
-
-  def initialize(name = nil)
@@ -35 +36 @@
-    @abstract = false
-    @attributes = XSD::NamedElements.new
+    @anyattribute = nil
-  end
-
@@ -135 +137 @@
-      @attributes << o
-      o
+    when AnyAttributeName
+      @anyattribute = AnyAttribute.new
-    else
-      nil

trunk/lib/wsdl/xmlSchema/data.rb

@@ -21 +21 @@
-require 'wsdl/xmlSchema/simpleContent'
-require 'wsdl/xmlSchema/any'
+require 'wsdl/xmlSchema/anyAttribute'
-require 'wsdl/xmlSchema/element'
-require 'wsdl/xmlSchema/all'
@@ -50 +51 @@
-AnnotationName = XSD::QName.new(XSD::Namespace, 'annotation')
-AnyName = XSD::QName.new(XSD::Namespace, 'any')
+AnyAttributeName = XSD::QName.new(XSD::Namespace, 'anyAttribute')
-AttributeName = XSD::QName.new(XSD::Namespace, 'attribute')
-ChoiceName = XSD::QName.new(XSD::Namespace, 'choice')

trunk/test/wsdl/any/test_any.rb

@@ -133 +133 @@
-    end
-    compare("expectedEcho.rb", "echo.rb")
+    compare("expectedMappingRegistry.rb", "echoMappingRegistry.rb")
-    compare("expectedDriver.rb", "echoDriver.rb")
-    compare("expectedService.rb", "echo_service.rb")