You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2012/10/11 18:15:34 UTC

svn commit: r1397142 - in /myfaces/trinidad/trunk: trinidad-api/src/main/resources/trinidad-config.xsd trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd

Author: sobryan
Date: Thu Oct 11 16:15:33 2012
New Revision: 1397142

URL: http://svn.apache.org/viewvc?rev=1397142&view=rev
Log:
TRINIDAD-2315 - Fix schema errors in trinidad-config.xsd and menuNode.xsd

Thanks for the patch Arjun

Modified:
    myfaces/trinidad/trunk/trinidad-api/src/main/resources/trinidad-config.xsd
    myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/resources/trinidad-config.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/resources/trinidad-config.xsd?rev=1397142&r1=1397141&r2=1397142&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/resources/trinidad-config.xsd (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/resources/trinidad-config.xsd Thu Oct 11 16:15:33 2012
@@ -261,7 +261,7 @@ override the locale that converters use 
 
   <simpleType name="expressionType">
     <restriction base="string" >
-      <pattern value="\#\{.+\}" />
+      <pattern value="#\{.+\}" />
     </restriction>
   </simpleType>
 

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd?rev=1397142&r1=1397141&r2=1397142&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd Thu Oct 11 16:15:33 2012
@@ -23,7 +23,9 @@
             xmlns:xml="http://www.w3.org/XML/1998/namespace"
             targetNamespace="http://myfaces.apache.org/trinidad/menu"
             elementFormDefault="qualified">
-  <xsd:include schemaLocation="base.xsd"/>
+  <xsd:include schemaLocation="itemNode.xsd"/>
+  <xsd:include schemaLocation="groupNode.xsd"/>
+  <xsd:include schemaLocation="sharedNode.xsd"/>
 
   <xsd:element name="menuNode" type="trmenu:menuNodeType">
     <xsd:annotation>