You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2007/11/08 16:42:21 UTC
svn commit: r593205 - in /incubator/sling/trunk/sling:
event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java
scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java
Author: cziegeler
Date: Thu Nov 8 07:42:20 2007
New Revision: 593205
URL: http://svn.apache.org/viewvc?rev=593205&view=rev
Log:
Adapt to latest changes in sling core.
Modified:
incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java
incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java
Modified: incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java?rev=593205&r1=593204&r2=593205&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java (original)
+++ incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java Thu Nov 8 07:42:20 2007
@@ -29,7 +29,7 @@
import javax.jcr.Session;
import javax.jcr.observation.EventListenerIterator;
-import org.apache.sling.core.Constants;
+import org.apache.sling.core.CoreConstants;
import org.apache.sling.jcr.api.SlingRepository;
import org.jmock.Expectations;
import org.jmock.Mockery;
@@ -86,7 +86,7 @@
// lets set up the bundle context with the sling id
final BundleContext bundleContext = this.getMockery().mock(BundleContext.class);
this.getMockery().checking(new Expectations() {{
- allowing(bundleContext).getProperty(Constants.SLING_ID);
+ allowing(bundleContext).getProperty(CoreConstants.SLING_ID);
will(returnValue(SLING_ID));
}});
Modified: incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java?rev=593205&r1=593204&r2=593205&view=diff
==============================================================================
--- incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java (original)
+++ incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java Thu Nov 8 07:42:20 2007
@@ -20,7 +20,7 @@
import java.util.Map;
import org.apache.sling.api.services.ServiceLocator;
-import org.apache.sling.core.util.ServiceLocatorImpl;
+import org.apache.sling.core.impl.services.ServiceLocatorImpl;
import org.apache.sling.scheduler.JobContext;
import org.osgi.framework.BundleContext;
import org.quartz.Job;