Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 27E846A47 for ; Thu, 16 Jun 2011 12:11:02 +0000 (UTC) Received: (qmail 27618 invoked by uid 500); 16 Jun 2011 12:11:02 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 27579 invoked by uid 500); 16 Jun 2011 12:11:02 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 27572 invoked by uid 99); 16 Jun 2011 12:11:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jun 2011 12:11:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jun 2011 12:10:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6129E23889E7; Thu, 16 Jun 2011 12:10:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1136389 - in /jackrabbit/sandbox/spi2microkernel/src: main/java/org/apache/jackrabbit/spi2microkernel/ main/java/org/apache/jackrabbit/spi2microkernel/util/ test/java/org/apache/jackrabbit/spi2microkernel/ Date: Thu, 16 Jun 2011 12:10:37 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110616121037.6129E23889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Jun 16 12:10:36 2011 New Revision: 1136389 URL: http://svn.apache.org/viewvc?rev=1136389&view=rev Log: spi2microkernel prototype (WIP) write: set mixin Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Values.java jackrabbit/sandbox/spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1136389&r1=1136388&r2=1136389&view=diff ============================================================================== --- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java (original) +++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Thu Jun 16 12:10:36 2011 @@ -448,8 +448,12 @@ public class RepositoryServiceImpl exten } public void setMixins(NodeId nodeId, Name[] mixinNodeTypeNames) throws RepositoryException { - // todo implement setMixins - throw new UnsupportedRepositoryOperationException("setMixin"); + if (mixinNodeTypeNames.length == 0) { + setProperty(nodeId, NameConstants.JCR_MIXINTYPES, "null"); + } + else { + setProperty(nodeId, NameConstants.JCR_MIXINTYPES, Values.create(mixinNodeTypeNames)); + } } public void setPrimaryType(NodeId nodeId, Name primaryNodeTypeName) throws RepositoryException { Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java?rev=1136389&r1=1136388&r2=1136389&view=diff ============================================================================== --- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java (original) +++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java Thu Jun 16 12:10:36 2011 @@ -213,8 +213,10 @@ public final class ItemInfos { if (Paths.translateQName(NameConstants.JCR_PRIMARYTYPE).equals(currentKey)) { nodeInfoBuilder.setPrimaryType(Values.create(value).getName()); } - - if (currentKey.startsWith(":")) { // ignore other internal values + else if (Paths.translateQName(NameConstants.JCR_MIXINTYPES).equals(currentKey)) { + nodeInfoBuilder.addMixin(Values.create(value).getName()); + } + else if (currentKey.startsWith(":")) { // ignore other internal values return !infoListener.done(); } Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Values.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Values.java?rev=1136389&r1=1136388&r2=1136389&view=diff ============================================================================== --- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Values.java (original) +++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Values.java Thu Jun 16 12:10:36 2011 @@ -200,6 +200,24 @@ public final class Values { return typeEncode(PropertyType.NAME, JsonBuilder.escape(name.toString())); } + public static String create(Name[] names) { + if (names.length == 0) { + return "[]"; + } + else { + StringBuilder sb = new StringBuilder("["); + sb.append(create(names[0])); + + for (int k = 1; k < names.length; k++) { + sb.append(',').append(create(names[k])); + } + sb.append(']'); + + return sb.toString(); + + } + } + public static String create(QValue value) throws RepositoryException { int type = value.getType(); Modified: jackrabbit/sandbox/spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java?rev=1136389&r1=1136388&r2=1136389&view=diff ============================================================================== --- jackrabbit/sandbox/spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java (original) +++ jackrabbit/sandbox/spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java Thu Jun 16 12:10:36 2011 @@ -744,7 +744,7 @@ public class RepositoryTest { assertEquals("nt:unstructured", testNode.getProperty("jcr:primaryType").getString()); testNode.setPrimaryType("nt:base"); - testNode.getSession().save(); + getSession().save(); Session session2 = getRepository().login(); try { @@ -771,6 +771,32 @@ public class RepositoryTest { assertFalse(ntMgr.hasNodeType("foo")); } + @Test + public void mixin() throws RepositoryException { + NodeTypeManager ntMgr = getSession().getWorkspace().getNodeTypeManager(); + NodeTypeTemplate mixTest = ntMgr.createNodeTypeTemplate(); + mixTest.setName("mix:test"); + mixTest.setMixin(true); + ntMgr.registerNodeType(mixTest, false); + + Node testNode = getNode(testPath); + NodeType[] mix = testNode.getMixinNodeTypes(); + assertEquals(0, mix.length); + + testNode.addMixin("mix:test"); + testNode.getSession().save(); + + mix = testNode.getMixinNodeTypes(); + assertEquals(1, mix.length); + assertEquals("mix:test", mix[0].getName()); + + testNode.removeMixin("mix:test"); + testNode.getSession().save(); + + mix = testNode.getMixinNodeTypes(); + assertEquals(0, mix.length); + } + //------------------------------------------< private >--- private void addProperty(Node parentNode, String name, Value value) throws RepositoryException {