Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 62400 invoked from network); 14 Apr 2010 13:59:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Apr 2010 13:59:22 -0000 Received: (qmail 15527 invoked by uid 500); 14 Apr 2010 13:59:22 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 15459 invoked by uid 500); 14 Apr 2010 13:59:22 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 15449 invoked by uid 99); 14 Apr 2010 13:59:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Apr 2010 13:59:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 14 Apr 2010 13:59:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 046E02388905; Wed, 14 Apr 2010 13:58:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r933956 - /sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java Date: Wed, 14 Apr 2010 13:58:58 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100414135859.046E02388905@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: justin Date: Wed Apr 14 13:58:58 2010 New Revision: 933956 URL: http://svn.apache.org/viewvc?rev=933956&view=rev Log: SLING-1447 - adding ws2 workspace creation code to JcrResourceResolverTest Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java?rev=933956&r1=933955&r2=933956&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java (original) +++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java Wed Apr 14 13:58:58 2010 @@ -137,6 +137,14 @@ public class JcrResourceResolverTest ext resResolver = resFac.getResourceResolver(session); + try { + getSession().getWorkspace().createWorkspace("ws2"); + } catch (Exception e) { + if (!e.getMessage().equals("workspace 'ws2' already exists.")) { + throw e; + } + } + ws2Session = getRepository().loginAdministrative("ws2"); rootWs2Node = ws2Session.getRootNode().addNode(rootPath.substring(1), "nt:unstructured");