Changeset 2145

Timestamp:

08/23/12 12:10:17 (12 years ago)

Author:

twagoo

Message:

Merged rss schema change

Files:

• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/CMDValidate (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentBrowserGui (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/CHANGES (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/binding (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/binding/components/bindings.xjb (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/binding/rss/rss-2_0.xsd (modified) (5 diffs)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/README (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/docs (modified) (1 prop)
• ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/pom.xml (modified) (1 prop)
• metadata/trunk/toolkit/general-component-schema.xsd (modified) (1 prop)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/binding/rss/rss-2_0.xsd

@@ -66 +66 @@
     </xs:annotation>
     <xs:sequence>
-      <xs:choice maxOccurs="unbounded">
         <xs:element name="title" type="xs:string" minOccurs="0">
           <xs:annotation>
@@ -122 +121 @@
           </xs:annotation>
         </xs:any>
-      </xs:choice>
+      
     </xs:sequence>
     <xs:anyAttribute namespace="##any"/>
@@ -128 +127 @@
   <xs:complexType name="RssChannel">
     <xs:sequence>
-      <xs:choice maxOccurs="unbounded">
         <xs:element name="title" type="xs:string">
           <xs:annotation>
@@ -224 +222 @@
           </xs:annotation>
         </xs:element>
-        <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:documentation>Extensibility element.</xs:documentation>
-          </xs:annotation>
-        </xs:any>
-      </xs:choice>
+      
       <xs:element name="item" type="RssItem" minOccurs="1" maxOccurs="unbounded">
          <!-- 
@@ -237 +230 @@
          -->
       </xs:element>
-      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>Extensibility element.</xs:documentation>
-        </xs:annotation>
-      </xs:any>
     </xs:sequence>
     <xs:anyAttribute namespace="##any"/>