You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2010/01/05 18:25:24 UTC
svn commit: r896136 - in /myfaces/trinidad/branches/1.2.12.1-branch: ./
trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/
trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/comp...
Author: arobinson74
Date: Tue Jan 5 17:25:24 2010
New Revision: 896136
URL: http://svn.apache.org/viewvc?rev=896136&view=rev
Log:
TRINIDAD-1665 - applying patch
Modified:
myfaces/trinidad/branches/1.2.12.1-branch/ (props changed)
myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd
myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd
myfaces/trinidad/branches/1.2.12.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/branches/1.2.12.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/branches/1.2.12.1-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 5 17:25:24 2010
@@ -3,3 +3,4 @@
/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402:745675
/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
+/myfaces/trinidad/trunk:894885
Modified: myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd?rev=896136&r1=896135&r2=896136&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd (original)
+++ myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/menuNode.xsd Tue Jan 5 17:25:24 2010
@@ -40,7 +40,7 @@
<xsd:element ref="trmenu:groupNode"/>
<xsd:element ref="trmenu:sharedNode"/>
</xsd:choice>
- <xsd:attribute name="id" type="xsd:id" use="required"/>
+ <xsd:attribute name="id" type="xsd:ID" use="required"/>
<xsd:attribute name="label" type="trmenu:stringOrElExpression"/>
<xsd:attribute name="icon" type="xsd:anyURI"/>
<xsd:attribute name="readOnly" default="false"
Modified: myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd?rev=896136&r1=896135&r2=896136&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd (original)
+++ myfaces/trinidad/branches/1.2.12.1-branch/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/menu/xml/schemas/sharedNode.xsd Tue Jan 5 17:25:24 2010
@@ -33,7 +33,7 @@
<xsd:complexType name="sharedNodeType">
<xsd:complexContent>
<xsd:extension base="trmenu:baseType">
- <xsd:attribute name="id" type="xsd:id" />
+ <xsd:attribute name="id" type="xsd:ID" />
<xsd:attribute name="ref" type="xsd:string" use="required"/>
</xsd:extension>
</xsd:complexContent>
Propchange: myfaces/trinidad/branches/1.2.12.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 5 17:25:24 2010
@@ -2,3 +2,4 @@
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:794062,794792,798299
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:894885
Propchange: myfaces/trinidad/branches/1.2.12.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 5 17:25:24 2010
@@ -2,3 +2,4 @@
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:794062,794792,798299
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:894885