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 26AD34379 for ; Wed, 15 Jun 2011 12:55:22 +0000 (UTC) Received: (qmail 93334 invoked by uid 500); 15 Jun 2011 12:55:22 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 93302 invoked by uid 500); 15 Jun 2011 12:55:22 -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 93295 invoked by uid 99); 15 Jun 2011 12:55:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jun 2011 12:55:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_ADULT2 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; Wed, 15 Jun 2011 12:55:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7411A23889BF; Wed, 15 Jun 2011 12:54:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1136016 - in /jackrabbit/sandbox/spi2microkernel/src: main/java/org/apache/jackrabbit/spi2microkernel/util/Values.java test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java Date: Wed, 15 Jun 2011 12:54:56 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110615125456.7411A23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Wed Jun 15 12:54:56 2011 New Revision: 1136016 URL: http://svn.apache.org/viewvc?rev=1136016&view=rev Log: spi2microkernel prototype (WIP) value types: uri Modified: 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/util/Values.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Values.java?rev=1136016&r1=1136015&r2=1136016&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 Wed Jun 15 12:54:56 2011 @@ -122,6 +122,17 @@ public final class Values { }; put(TYPES[PropertyType.DATE], valueFactory); + valueFactory = new ValueFactory() { + public QValue create(Object value) throws RepositoryException { + throw new RepositoryException("Invalid value " + value); + } + + public QValue create(String value) throws RepositoryException { + return FACTORY.create(value, PropertyType.URI); + } + }; + put(TYPES[PropertyType.URI], valueFactory); + // todo handle other value types }}; @@ -172,18 +183,16 @@ public final class Values { return value.getString(); case PropertyType.DECIMAL: - return typeEncode(type, value.getString()); - case PropertyType.DATE: + case PropertyType.URI: return typeEncode(type, value.getString()); - // todo implement support for the other value types + // todo implement support for the other value types case PropertyType.BINARY: case PropertyType.NAME: case PropertyType.PATH: case PropertyType.REFERENCE: case PropertyType.WEAKREFERENCE: - case PropertyType.URI: default: throw new RepositoryException("Cannot handle value of type " + PropertyType.nameFromValue(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=1136016&r1=1136015&r2=1136016&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 Wed Jun 15 12:54:56 2011 @@ -415,6 +415,36 @@ public class RepositoryTest { } } + @Test + public void addURIProperty() throws RepositoryException { + Node parentNode = getNode(testPath); + addProperty(parentNode, "uri", getSession().getValueFactory().createValue("http://www.day.com/", PropertyType.URI)); + } + + @Test + public void addMultiValuedURI() throws RepositoryException { + Node parentNode = getNode(testPath); + Value[] values = new Value[2]; + values[0] = getSession().getValueFactory().createValue("http://www.day.com", PropertyType.URI); + values[1] = getSession().getValueFactory().createValue("file://var/dam", PropertyType.URI); + + parentNode.setProperty("multi date", values); + parentNode.getSession().save(); + + Session session2 = getRepository().login(); + try { + Property property = session2.getProperty(testPath + "/multi date"); + assertTrue(property.isMultiple()); + Value[] values2 = property.getValues(); + assertEquals(2, values.length); + assertEquals(values[0], values2[0]); + assertEquals(values[1], values2[1]); + } + finally { + session2.logout(); + } + } + @Ignore // todo set element type @Test public void addEmptyMultiValuedProperty() throws RepositoryException {