Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 7663 invoked from network); 16 Apr 2010 12:01:01 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Apr 2010 12:01:01 -0000 Received: (qmail 56813 invoked by uid 500); 16 Apr 2010 12:01:01 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 56749 invoked by uid 500); 16 Apr 2010 12:01:00 -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 56742 invoked by uid 99); 16 Apr 2010 12:01:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Apr 2010 12:01:00 +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; Fri, 16 Apr 2010 12:00:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6CD962388A4B; Fri, 16 Apr 2010 12:00:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r934819 - in /sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal: JcrResourceListenerTest.java SynchronousJcrResourceListener.java Date: Fri, 16 Apr 2010 12:00:36 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100416120036.6CD962388A4B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Apr 16 12:00:36 2010 New Revision: 934819 URL: http://svn.apache.org/viewvc?rev=934819&view=rev Log: SLING-1447 : support for resource paths containing workspace name - fix tests Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java?rev=934819&r1=934818&r2=934819&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java (original) +++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java Fri Apr 16 12:00:36 2010 @@ -16,7 +16,8 @@ */ package org.apache.sling.jcr.resource.internal; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; @@ -138,7 +139,7 @@ public class JcrResourceListenerTest ext final ServiceTracker tracker = mock(ServiceTracker.class); when(tracker.getService()).thenReturn(mockEA); - JcrResourceListener listener = new SynchronousJcrResourceListener(getRepository(), workspaceName, factory, "/", + JcrResourceListener listener = new SynchronousJcrResourceListener(workspaceName, factory, "/", "/", tracker); createdPath = createTestPath(); Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java?rev=934819&r1=934818&r2=934819&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java (original) +++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java Fri Apr 16 12:00:36 2010 @@ -21,7 +21,6 @@ import javax.jcr.RepositoryException; import org.apache.jackrabbit.core.observation.SynchronousEventListener; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.ResourceResolverFactory; -import org.apache.sling.jcr.api.SlingRepository; import org.osgi.util.tracker.ServiceTracker; /** @@ -33,10 +32,10 @@ import org.osgi.util.tracker.ServiceTrac */ public class SynchronousJcrResourceListener extends JcrResourceListener implements SynchronousEventListener { - public SynchronousJcrResourceListener(SlingRepository repository, String workspaceName, + public SynchronousJcrResourceListener(String workspaceName, ResourceResolverFactory factory, String startPath, String mountPrefix, ServiceTracker eventAdminTracker) throws LoginException, RepositoryException { - super(repository, workspaceName, factory, startPath, mountPrefix, eventAdminTracker); + super(workspaceName, factory, startPath, mountPrefix, eventAdminTracker); } }