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 A6896640B for ; Thu, 9 Jun 2011 12:06:54 +0000 (UTC) Received: (qmail 88814 invoked by uid 500); 9 Jun 2011 12:06:54 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 88774 invoked by uid 500); 9 Jun 2011 12:06:54 -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 88767 invoked by uid 99); 9 Jun 2011 12:06:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jun 2011 12:06:54 +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, 09 Jun 2011 12:06:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 59EFA2388900; Thu, 9 Jun 2011 12:06:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1133817 - in /jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel: RepositoryServiceImpl.java util/Values.java Date: Thu, 09 Jun 2011 12:06:31 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110609120631.59EFA2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Jun 9 12:06:30 2011 New Revision: 1133817 URL: http://svn.apache.org/viewvc?rev=1133817&view=rev Log: spi2microkernel prototype (WIP) fixed escaping/quoting of string values Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Values.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=1133817&r1=1133816&r2=1133817&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 9 12:06:30 2011 @@ -444,8 +444,8 @@ public class RepositoryServiceImpl exten return PathUtil.concat(PathUtil.relativize("/", path), name); } - private void addProperty(NodeId parentId, Name propertyName, String val) throws RepositoryException { - sb.append('^').append(target(parentId, propertyName)).append(" : ").append(val); + private void addProperty(NodeId parentId, Name propertyName, String jsonValue) throws RepositoryException { + sb.append('^').append(target(parentId, propertyName)).append(" : ").append(jsonValue); } } 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=1133817&r1=1133816&r2=1133817&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 9 12:06:30 2011 @@ -86,7 +86,7 @@ public final class Values { public static String create(QValue value) throws RepositoryException { switch(value.getType()) { case PropertyType.STRING: - return JsonBuilder.quote(value.getString()); + return JsonBuilder.quote(JsonBuilder.escape(value.getString())); case PropertyType.LONG: case PropertyType.DOUBLE: