You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/08/20 22:08:45 UTC
svn commit: r687440 - in
/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas:
base.xsd groupNode.xsd itemNode.xsd menu.xsd menuNode.xsd sharedNode.xsd
Author: matzew
Date: Wed Aug 20 13:08:44 2008
New Revision: 687440
URL: http://svn.apache.org/viewvc?rev=687440&view=rev
Log:
TRINIDAD-1186 - xml schema files (xsd) are added for the XMLMenuModel
small correction...
Modified:
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/base.xsd
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/groupNode.xsd
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/itemNode.xsd
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menu.xsd
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/base.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/base.xsd?rev=687440&r1=687439&r2=687440&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/base.xsd (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/base.xsd Wed Aug 20 13:08:44 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:afmenu="http://myfaces.apache.org/trinidad/menu"
+ xmlns:trmenu="http://myfaces.apache.org/trinidad/menu"
targetNamespace="http://myfaces.apache.org/trinidad/menu"
elementFormDefault="qualified">
@@ -18,26 +18,26 @@
</xsd:simpleType>
<xsd:simpleType name="stringOrElExpression">
- <xsd:union memberTypes="xsd:string afmenu:elExpression"/>
+ <xsd:union memberTypes="xsd:string trmenu:elExpression"/>
</xsd:simpleType>
<xsd:simpleType name="charOrElExpression">
- <xsd:union memberTypes="afmenu:char afmenu:elExpression"/>
+ <xsd:union memberTypes="trmenu:char trmenu:elExpression"/>
</xsd:simpleType>
<xsd:simpleType name="booleanOrElExpression">
- <xsd:union memberTypes="xsd:boolean afmenu:elExpression"/>
+ <xsd:union memberTypes="xsd:boolean trmenu:elExpression"/>
</xsd:simpleType>
<xsd:simpleType name="intOrElExpression">
- <xsd:union memberTypes="xsd:int afmenu:elExpression"/>
+ <xsd:union memberTypes="xsd:int trmenu:elExpression"/>
</xsd:simpleType>
<!-- end custom types -->
- <xsd:element name="base" type="afmenu:baseType">
+ <xsd:element name="base" type="trmenu:baseType">
<xsd:annotation>
<xsd:documentation>
- Base node for all afmenu elements
+ Base node for all trmenu elements
</xsd:documentation>
</xsd:annotation>
</xsd:element>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/groupNode.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/groupNode.xsd?rev=687440&r1=687439&r2=687440&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/groupNode.xsd (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/groupNode.xsd Wed Aug 20 13:08:44 2008
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="windows-1252" ?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:afmenu="http://myfaces.apache.org/trinidad/menu"
+ xmlns:trmenu="http://myfaces.apache.org/trinidad/menu"
targetNamespace="http://myfaces.apache.org/trinidad/menu"
elementFormDefault="qualified">
<xsd:include schemaLocation="menuNode.xsd"/>
- <xsd:element name="groupNode" type="afmenu:groupNodeType"
- substitutionGroup="afmenu:menuNode">
+ <xsd:element name="groupNode" type="trmenu:groupNodeType"
+ substitutionGroup="trmenu:menuNode">
<xsd:annotation>
<xsd:documentation>
A menu node that refers to another node, typically a child node,
@@ -18,7 +18,7 @@
</xsd:element>
<xsd:complexType name="groupNodeType">
<xsd:complexContent>
- <xsd:extension base="afmenu:menuNodeType">
+ <xsd:extension base="trmenu:menuNodeType">
<xsd:attribute name="idref" use="required" type="xsd:string"/>
</xsd:extension>
</xsd:complexContent>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/itemNode.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/itemNode.xsd?rev=687440&r1=687439&r2=687440&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/itemNode.xsd (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/itemNode.xsd Wed Aug 20 13:08:44 2008
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:afmenu="http://myfaces.apache.org/trinidad/menu"
+ xmlns:trmenu="http://myfaces.apache.org/trinidad/menu"
targetNamespace="http://myfaces.apache.org/trinidad/menu"
elementFormDefault="qualified">
<xsd:include schemaLocation="menuNode.xsd"/>
- <xsd:element name="itemNode" type="afmenu:itemNodeType"
- substitutionGroup="afmenu:menuNode">
+ <xsd:element name="itemNode" type="trmenu:itemNodeType"
+ substitutionGroup="trmenu:menuNode">
<xsd:annotation>
<xsd:documentation>
A menu node that specifies an action or a destination when the menu item
@@ -15,22 +15,22 @@
</xsd:element>
<xsd:complexType name="itemNodeType">
<xsd:complexContent>
- <xsd:extension base="afmenu:menuNodeType">
- <xsd:attribute name="action" type="afmenu:stringOrElExpression"/>
+ <xsd:extension base="trmenu:menuNodeType">
+ <xsd:attribute name="action" type="trmenu:stringOrElExpression"/>
<xsd:attribute name="destination" type="xsd:string"/>
- <xsd:attribute name="actionListener" type="afmenu:elExpression"/>
- <xsd:attribute name="launchListener" type="afmenu:elExpression"/>
- <xsd:attribute name="returnListener" type="afmenu:elExpression"/>
+ <xsd:attribute name="actionListener" type="trmenu:elExpression"/>
+ <xsd:attribute name="launchListener" type="trmenu:elExpression"/>
+ <xsd:attribute name="returnListener" type="trmenu:elExpression"/>
<xsd:attribute name="immediate" default="false"
- type="afmenu:booleanOrElExpression"/>
+ type="trmenu:booleanOrElExpression"/>
<xsd:attribute name="useWindow" default="false"
- type="afmenu:booleanOrElExpression"/>
- <xsd:attribute name="windowHeight" type="afmenu:intOrElExpression"/>
- <xsd:attribute name="windowWidth" type="afmenu:intOrElExpression"/>
+ type="trmenu:booleanOrElExpression"/>
+ <xsd:attribute name="windowHeight" type="trmenu:intOrElExpression"/>
+ <xsd:attribute name="windowWidth" type="trmenu:intOrElExpression"/>
<xsd:attribute name="focusViewId" type="xsd:anyURI" use="required"/>
<xsd:attribute name="defaultFocusPath" default="false"
- type="afmenu:booleanOrElExpression"/>
- <xsd:attribute name="targetFrame" type="afmenu:stringOrElExpression"/>
+ type="trmenu:booleanOrElExpression"/>
+ <xsd:attribute name="targetFrame" type="trmenu:stringOrElExpression"/>
<xsd:anyAttribute/>
</xsd:extension>
</xsd:complexContent>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menu.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menu.xsd?rev=687440&r1=687439&r2=687440&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menu.xsd (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menu.xsd Wed Aug 20 13:08:44 2008
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:afmenu="http://myfaces.apache.org/trinidad/menu"
+ xmlns:trmenu="http://myfaces.apache.org/trinidad/menu"
targetNamespace="http://myfaces.apache.org/trinidad/menu"
elementFormDefault="qualified">
<xsd:include schemaLocation="itemNode.xsd"/>
<xsd:include schemaLocation="groupNode.xsd"/>
<xsd:include schemaLocation="sharedNode.xsd"/>
- <xsd:element name="menu" type="afmenu:menuType">
+ <xsd:element name="menu" type="trmenu:menuType">
<xsd:annotation>
<xsd:documentation>
Top level tag for a menu model.
@@ -15,9 +15,9 @@
</xsd:element>
<xsd:complexType name="menuType">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element ref="afmenu:itemNode"/>
- <xsd:element ref="afmenu:groupNode"/>
- <xsd:element ref="afmenu:sharedNode"/>
+ <xsd:element ref="trmenu:itemNode"/>
+ <xsd:element ref="trmenu:groupNode"/>
+ <xsd:element ref="trmenu:sharedNode"/>
</xsd:choice>
<xsd:attribute name="xmlns" type="xsd:anyURI"
default="http://myfaces.apache.org/trinidad/menu"/>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd?rev=687440&r1=687439&r2=687440&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd Wed Aug 20 13:08:44 2008
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:afmenu="http://myfaces.apache.org/trinidad/menu"
+ xmlns:trmenu="http://myfaces.apache.org/trinidad/menu"
xmlns:xml="http://www.w3.org/XML/1998/namespace"
targetNamespace="http://myfaces.apache.org/trinidad/menu"
elementFormDefault="qualified">
<xsd:include schemaLocation="base.xsd"/>
- <xsd:element name="menuNode" type="afmenu:menuNodeType">
+ <xsd:element name="menuNode" type="trmenu:menuNodeType">
<xsd:annotation>
<xsd:documentation>
A menu node. It will be either an itemNode or a groupNode.
@@ -15,25 +15,25 @@
</xsd:element>
<xsd:complexType name="menuNodeType">
<xsd:complexContent>
- <xsd:extension base="afmenu:baseType">
+ <xsd:extension base="trmenu:baseType">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element ref="afmenu:itemNode"/>
- <xsd:element ref="afmenu:groupNode"/>
- <xsd:element ref="afmenu:sharedNode"/>
+ <xsd:element ref="trmenu:itemNode"/>
+ <xsd:element ref="trmenu:groupNode"/>
+ <xsd:element ref="trmenu:sharedNode"/>
</xsd:choice>
<xsd:attribute name="id" type="xsd:id" use="required"/>
- <xsd:attribute name="label" type="afmenu:stringOrElExpression"/>
+ <xsd:attribute name="label" type="trmenu:stringOrElExpression"/>
<xsd:attribute name="icon" type="xsd:anyURI"/>
<xsd:attribute name="readOnly" default="false"
- type="afmenu:booleanOrElExpression"/>
+ type="trmenu:booleanOrElExpression"/>
<xsd:attribute name="rendered" default="true"
- type="afmenu:booleanOrElExpression"/>
+ type="trmenu:booleanOrElExpression"/>
<xsd:attribute name="disabled" default="false"
- type="afmenu:booleanOrElExpression"/>
- <xsd:attribute name="accessKey" type="afmenu:charOrElExpression"/>
+ type="trmenu:booleanOrElExpression"/>
+ <xsd:attribute name="accessKey" type="trmenu:charOrElExpression"/>
<xsd:attribute name="labelAndAccessKey"
- type="afmenu:stringOrElExpression"/>
- <xsd:attribute name="visible" type="afmenu:booleanOrElExpression"
+ type="trmenu:stringOrElExpression"/>
+ <xsd:attribute name="visible" type="trmenu:booleanOrElExpression"
default="true"/>
</xsd:extension>
</xsd:complexContent>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd?rev=687440&r1=687439&r2=687440&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd Wed Aug 20 13:08:44 2008
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:afmenu="http://myfaces.apache.org/trinidad/menu"
+ xmlns:trmenu="http://myfaces.apache.org/trinidad/menu"
targetNamespace="http://myfaces.apache.org/trinidad/menu"
elementFormDefault="qualified">
<xsd:include schemaLocation="base.xsd"/>
- <xsd:element name="sharedNode" type="afmenu:sharedNodeType">
+ <xsd:element name="sharedNode" type="trmenu:sharedNodeType">
<xsd:annotation>
<xsd:documentation>
A menu node that points to another menu model
@@ -13,7 +13,8 @@
</xsd:element>
<xsd:complexType name="sharedNodeType">
<xsd:complexContent>
- <xsd:extension base="afmenu:baseType">
+ <xsd:extension base="trmenu:baseType">
+ <xsd:attribute name="id" type="xsd:id" />
<xsd:attribute name="ref" type="xsd:string" use="required"/>
</xsd:extension>
</xsd:complexContent>