Author: mreutegg
Date: Thu Aug 27 13:56:49 2009
New Revision: 808416
URL: http://svn.apache.org/viewvc?rev=808416&view=rev
Log:
JCR-2283: Incorrect CND for mix:etag
Modified:
jackrabbit/branches/jsr283/ (props changed)
jackrabbit/branches/jsr283/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeTypeInstanceHandler.java
jackrabbit/branches/jsr283/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd
jackrabbit/branches/jsr283/jackrabbit-jcr-tests/src/main/resources/org/apache/jackrabbit/test/api/nodetype/spec/mix-etag.txt
Propchange: jackrabbit/branches/jsr283/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 27 13:56:49 2009
@@ -1,2 +1,3 @@
/jackrabbit/branches/1.5:794012,794100,794102
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
+/jackrabbit/trunk:808408
Modified: jackrabbit/branches/jsr283/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeTypeInstanceHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/jsr283/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeTypeInstanceHandler.java?rev=808416&r1=808415&r2=808416&view=diff
==============================================================================
--- jackrabbit/branches/jsr283/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeTypeInstanceHandler.java
(original)
+++ jackrabbit/branches/jsr283/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeTypeInstanceHandler.java
Thu Aug 27 13:56:49 2009
@@ -104,6 +104,12 @@
if (NameConstants.MIX_LASTMODIFIED.equals(declaringNT)) {
genValues = new InternalValue[]{InternalValue.create(userId)};
}
+ } else if (NameConstants.JCR_ETAG.equals(name)) {
+ // jcr:etag property of a mix:etag
+ if (NameConstants.MIX_ETAG.equals(declaringNT)) {
+ // TODO: provide real implementation
+ genValues = new InternalValue[]{InternalValue.create("")};
+ }
}
return genValues;
}
Modified: jackrabbit/branches/jsr283/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd
URL: http://svn.apache.org/viewvc/jackrabbit/branches/jsr283/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd?rev=808416&r1=808415&r2=808416&view=diff
==============================================================================
--- jackrabbit/branches/jsr283/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd
(original)
+++ jackrabbit/branches/jsr283/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd
Thu Aug 27 13:56:49 2009
@@ -242,8 +242,7 @@
*/
[mix:etag]
mixin
- // currently has a default value because auto-creation not handled see JCR-2116
- - jcr:etag (STRING) = '' protected autocreated
+ - jcr:etag (STRING) protected autocreated
//------------------------------------------------------------------------------
// U N S T R U C T U R E D C O N T E N T
Modified: jackrabbit/branches/jsr283/jackrabbit-jcr-tests/src/main/resources/org/apache/jackrabbit/test/api/nodetype/spec/mix-etag.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/jsr283/jackrabbit-jcr-tests/src/main/resources/org/apache/jackrabbit/test/api/nodetype/spec/mix-etag.txt?rev=808416&r1=808415&r2=808416&view=diff
==============================================================================
--- jackrabbit/branches/jsr283/jackrabbit-jcr-tests/src/main/resources/org/apache/jackrabbit/test/api/nodetype/spec/mix-etag.txt
(original)
+++ jackrabbit/branches/jsr283/jackrabbit-jcr-tests/src/main/resources/org/apache/jackrabbit/test/api/nodetype/spec/mix-etag.txt
Thu Aug 27 13:56:49 2009
@@ -11,7 +11,7 @@
PropertyDefinition
Name jcr:etag
RequiredType STRING
- DefaultValues []
+ DefaultValues null
AutoCreated true
Mandatory false
OnParentVersion COPY
|