Permalink
Browse files

Merge commit 'simong/master'

* commit 'simong/master':
  Changed the sakai:propertiesmix nodetype so that we can now have multivalued properties beside sakai:labels as well.

Conflicts:
	slingtests/osgikernel/bundles/messaging/src/main/java/org/sakaiproject/kernel/api/message/MessageConstants.java
  • Loading branch information...
ieb committed Sep 17, 2009
2 parents d28cfaf + fb3e4ff commit 50835e194c768aa76b3466d8cb8b5d8c0263fe21
@@ -178,5 +178,4 @@
*/
public static final String REG_PROCESSOR_NAMES = "sakai.message.createpreprocessor";
public static final String MESSAGE_CREATE_PREPROCESSOR = "CreateMessagePreProcessor";
-
}
@@ -13,6 +13,10 @@
// Add a mixin that allows nodes to accept other properties, (eg nt:file)
[sakai:propertiesmix] > mix:versionable mixin
+ - '*' (undefined)
+ copy
+ multiple
+
- '*' (undefined)
copy

0 comments on commit 50835e1

Please sign in to comment.