You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2011/10/28 22:27:18 UTC
svn commit: r1190549 -
/myfaces/core/branches/2.0.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd
Author: mbenson
Date: Fri Oct 28 20:27:17 2011
New Revision: 1190549
URL: http://svn.apache.org/viewvc?rev=1190549&view=rev
Log:
[MYFACES-3380] merge c1190535 from trunk
Modified:
myfaces/core/branches/2.0.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd (contents, props changed)
Modified: myfaces/core/branches/2.0.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd?rev=1190549&r1=1190548&r2=1190549&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd Fri Oct 28 20:27:17 2011
@@ -627,7 +627,7 @@
type="javaee:fully-qualified-classType"/>
<xsd:element name="system-event-class"
type="javaee:fully-qualified-classType"/>
- <xsd:element name="source-class"
+ <xsd:element name="source-class" minOccurs="0"
type="javaee:fully-qualified-classType"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
Propchange: myfaces/core/branches/2.0.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 28 20:27:17 2011
@@ -0,0 +1,3 @@
+/myfaces/core/branches/1.2.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd:792657-823343,825575-833926,881094-925224,938283-940134
+/myfaces/core/trunk/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd:1190535
+/myfaces/core/trunk_1.2.x/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd:691297-695050,698037-743106,752296-779418,779422-792656