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 2016/07/24 11:50:49 UTC
svn commit: r1753913 - in /sling/trunk/bundles/commons/scheduler: ./
src/main/java/org/apache/sling/commons/scheduler/
src/test/java/org/apache/sling/commons/scheduler/impl/
Author: cziegeler
Date: Sun Jul 24 11:50:49 2016
New Revision: 1753913
URL: http://svn.apache.org/viewvc?rev=1753913&view=rev
Log:
Update to parent pom 27
Modified:
sling/trunk/bundles/commons/scheduler/pom.xml
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/ScheduleOptions.java
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/package-info.java
sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java
Modified: sling/trunk/bundles/commons/scheduler/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/pom.xml?rev=1753913&r1=1753912&r2=1753913&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/pom.xml (original)
+++ sling/trunk/bundles/commons/scheduler/pom.xml Sun Jul 24 11:50:49 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>27</version>
<relativePath />
</parent>
@@ -142,11 +142,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -183,6 +183,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -203,11 +208,5 @@
<version>1.0.10</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.9.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java?rev=1753913&r1=1753912&r2=1753913&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java Sun Jul 24 11:50:49 2016
@@ -16,7 +16,7 @@
*/
package org.apache.sling.commons.scheduler;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* A job is executed by the {@link Scheduler} service.
Modified: sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java?rev=1753913&r1=1753912&r2=1753913&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java Sun Jul 24 11:50:49 2016
@@ -19,7 +19,7 @@ package org.apache.sling.commons.schedul
import java.io.Serializable;
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The context for a {@link Job}.
Modified: sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/ScheduleOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/ScheduleOptions.java?rev=1753913&r1=1753912&r2=1753913&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/ScheduleOptions.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/ScheduleOptions.java Sun Jul 24 11:50:49 2016
@@ -19,7 +19,7 @@ package org.apache.sling.commons.schedul
import java.io.Serializable;
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Scheduler options provide an extensible way of defining how to schedule a job.
Modified: sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java?rev=1753913&r1=1753912&r2=1753913&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java Sun Jul 24 11:50:49 2016
@@ -21,7 +21,7 @@ import java.util.Date;
import java.util.Map;
import java.util.NoSuchElementException;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A scheduler to schedule time/cron based jobs.
Modified: sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/package-info.java?rev=1753913&r1=1753912&r2=1753913&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/package-info.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/package-info.java Sun Jul 24 11:50:49 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.5.0")
+@Version("2.5.1")
package org.apache.sling.commons.scheduler;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Modified: sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java?rev=1753913&r1=1753912&r2=1753913&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java Sun Jul 24 11:50:49 2016
@@ -31,8 +31,7 @@ import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
+import org.osgi.framework.ServiceRegistration;
import org.quartz.JobKey;
import org.quartz.SchedulerException;
@@ -40,9 +39,6 @@ public class WhiteboardHandlerTest {
private WhiteboardHandler handler;
private BundleContext context;
private QuartzScheduler quartzScheduler;
- //We will test WhiteboardHandler methods from ServiceTrackerCustomizer
- //since it uses its methods.
- private ServiceTrackerCustomizer customizer;
@Before
public void setUp() throws Exception {
@@ -53,20 +49,13 @@ public class WhiteboardHandlerTest {
Field schedulerField = WhiteboardHandler.class.getDeclaredField("scheduler");
schedulerField.setAccessible(true);
- //Creating quartzscheduler for private field and activating it
+ // Creating quartz scheduler for private field and activating it
quartzScheduler = ActivatedQuartzSchedulerFactory.create(context, "testName");
//Injecting quartzScheduler to WhiteboardHandler
schedulerField.set(handler, quartzScheduler);
handler.activate(context);
- Field trackerField = WhiteboardHandler.class.getDeclaredField("serviceTracker");
- trackerField.setAccessible(true);
-
- ServiceTracker serviceTracker = (ServiceTracker) trackerField.get(handler);
- Field customizerField = ServiceTracker.class.getDeclaredField("customizer");
- customizerField.setAccessible(true);
- customizer = (ServiceTrackerCustomizer) customizerField.get(serviceTracker);
}
@Test
@@ -87,14 +76,10 @@ public class WhiteboardHandlerTest {
serviceProps.put(Constants.SERVICE_PID, "1");
serviceProps.put(Constants.SERVICE_ID, 1L);
- //Register service only to get a reference of it.
- //This reference is needed to test our method.
- context.registerService(serviceName, service, serviceProps);
- ServiceReference reference = context.getServiceReference(serviceName);
+ final ServiceRegistration<?> reg = context.registerService(serviceName, service, serviceProps);
+ ServiceReference<?> reference = reg.getReference();
JobKey jobKey = JobKey.jobKey(schedulerName + "." + reference.getProperty(Constants.SERVICE_ID));
- assertNull(quartzScheduler.getSchedulers().get("testName"));
- customizer.addingService(reference);
assertNotNull(quartzScheduler.getSchedulers().get("testName").getScheduler().getJobDetail(jobKey));
}
@@ -119,14 +104,13 @@ public class WhiteboardHandlerTest {
//Register service only to get a reference of it.
//This reference is needed to test our method.
- context.registerService(serviceName, service, serviceProps);
- ServiceReference reference = context.getServiceReference(serviceName);
+ final ServiceRegistration<?> reg = context.registerService(serviceName, service, serviceProps);
+ ServiceReference<?> reference = reg.getReference();
JobKey jobKey = JobKey.jobKey(schedulerName + "." + reference.getProperty(Constants.SERVICE_ID));
- assertNull(quartzScheduler.getSchedulers().get("testName"));
- customizer.addingService(reference);
assertNotNull(quartzScheduler.getSchedulers().get("testName").getScheduler().getJobDetail(jobKey));
- customizer.removedService(reference, service);
+
+ reg.unregister();
assertNull(quartzScheduler.getSchedulers().get("testName").getScheduler().getJobDetail(jobKey));
}