svn commit: r673200 - in /cocoon/whiteboard/corona/trunk: corona-sample/src/main/resources/COB-INF/ corona-servlet/src/main/resources/ corona-sitemap/src/main/resources/

[re...@apache.org]

Author: reinhard
Date: Tue Jul  1 13:38:25 2008
New Revision: 673200

URL: http://svn.apache.org/viewvc?rev=673200&view=rev
Log:
enhance XML schema files after implementing match/when/otherwise

Added:
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/corona-servlet-1.0.xsd
      - copied unchanged from r650898, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/corona-servlet-1.0.xsd
Removed:
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/corona-servlet-1.0.xsd
Modified:
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/corona-sitemap-1.0.xsd

Modified: cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/sitemap.xmap?rev=673200&r1=673199&r2=673200&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/sitemap.xmap Tue Jul  1 13:38:25 2008
@@ -275,7 +275,7 @@
       </map:match>
       <!-- Redirecting to a servlet service doesn't work -->
       <map:match pattern="redirect/sax-pipeline/simple-xml">
-        <map:redirect-to uri="servlet:/sax-pipeline/simple-xml"/>
+        <servlet:redirect-to uri="servlet:/sax-pipeline/simple-xml"/>
       </map:match>
     </map:pipeline>
 

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/corona-sitemap-1.0.xsd
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/corona-sitemap-1.0.xsd?rev=673200&r1=673199&r2=673200&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/corona-sitemap-1.0.xsd (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/corona-sitemap-1.0.xsd Tue Jul  1 13:38:25 2008
@@ -76,10 +76,19 @@
     <xsd:complexType>
       <xsd:sequence>
         <xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element ref="when" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element ref="otherwise" minOccurs="0" maxOccurs="1" />
         <xsd:group ref="pipeline-content" />
       </xsd:sequence>
+      <xsd:attribute name="value" type="xsd:string" use="optional" />      
       <xsd:attribute name="type" type="xsd:string" use="optional" />
       <xsd:attribute name="pattern" type="xsd:string" use="optional" />
+      <xsd:attribute name="regexp" type="xsd:string" use="optional" />
+      <xsd:attribute name="wildcard" type="xsd:string" use="optional" />
+      <xsd:attribute name="equals" type="xsd:string" use="optional" />
+      <xsd:attribute name="contains" type="xsd:string" use="optional" />
+      <xsd:attribute name="starts-with" type="xsd:string" use="optional" />
+      <xsd:attribute name="ends-with" type="xsd:string" use="optional" />
     </xsd:complexType>
   </xsd:element>
 
@@ -141,7 +150,14 @@
       <xsd:sequence>
         <xsd:group ref="pipeline-content" />
       </xsd:sequence>
-      <xsd:attribute name="test" type="xsd:string" use="required" />
+      <xsd:attribute name="value" type="xsd:string" use="optional" />
+      <xsd:attribute name="pattern" type="xsd:string" use="optional" />
+      <xsd:attribute name="regexp" type="xsd:string" use="optional" />
+      <xsd:attribute name="wildcard" type="xsd:string" use="optional" />
+      <xsd:attribute name="equals" type="xsd:string" use="optional" />
+      <xsd:attribute name="contains" type="xsd:string" use="optional" />
+      <xsd:attribute name="starts-with" type="xsd:string" use="optional" />
+      <xsd:attribute name="ends-with" type="xsd:string" use="optional" />
     </xsd:complexType>
   </xsd:element>