You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2012/07/13 00:13:30 UTC
svn commit: r1360984 -
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/XmlImportHandler.java
Author: jukka
Date: Thu Jul 12 22:13:30 2012
New Revision: 1360984
URL: http://svn.apache.org/viewvc?rev=1360984&view=rev
Log:
OAK-127: Support for XML imports
Handle the jcr:mixinTypes property in system view imports
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/XmlImportHandler.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/XmlImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/XmlImportHandler.java?rev=1360984&r1=1360983&r2=1360984&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/XmlImportHandler.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/XmlImportHandler.java Thu Jul 12 22:13:30 2012
@@ -80,9 +80,15 @@ public class XmlImportHandler extends De
if (values.size() == 1) {
if (name.equals("jcr:primaryType")) {
node.setPrimaryType(values.get(0));
+ } else if (name.equals("jcr:mixinTypes")) {
+ node.addMixin(values.get(0));
} else {
node.setProperty(name, values.get(0));
}
+ } else if (name.equals("jcr:mixinTypes")) {
+ for (String value : values) {
+ node.addMixin(value);
+ }
} else {
node.setProperty(name, values.toArray(new String[values.size()]));
}