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 2013/10/09 19:28:26 UTC
svn commit: r1530723 [2/2] - in /sling/trunk/bundles/extensions/event: ./
src/main/java/org/apache/sling/event/impl/dea/
src/main/java/org/apache/sling/event/impl/jobs/
src/main/java/org/apache/sling/event/impl/jobs/console/
src/main/java/org/apache/sl...
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/jobs/consumer/JobConsumer.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/jobs/consumer/JobConsumer.java?rev=1530723&r1=1530722&r2=1530723&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/jobs/consumer/JobConsumer.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/jobs/consumer/JobConsumer.java Wed Oct 9 17:28:25 2013
@@ -19,7 +19,6 @@
package org.apache.sling.event.jobs.consumer;
import org.apache.sling.event.jobs.Job;
-import org.apache.sling.event.jobs.consumer.JobConsumer.JobResult;
import aQute.bnd.annotation.ConsumerType;
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1530723&r1=1530722&r2=1530723&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Wed Oct 9 17:28:25 2013
@@ -112,11 +112,11 @@ public abstract class AbstractJobHandlin
mavenBundle("org.apache.sling", "org.apache.sling.commons.json", "2.0.6"),
mavenBundle("org.apache.sling", "org.apache.sling.commons.mime", "2.1.4"),
mavenBundle("org.apache.sling", "org.apache.sling.commons.classloader", "1.3.0"),
- mavenBundle("org.apache.sling", "org.apache.sling.commons.scheduler", "2.3.4"),
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.scheduler", "2.4.0"),
mavenBundle("org.apache.sling", "org.apache.sling.commons.threads", "3.1.0"),
mavenBundle("org.apache.sling", "org.apache.sling.launchpad.api", "1.1.0"),
- mavenBundle("org.apache.sling", "org.apache.sling.auth.core", "1.1.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.auth.core", "1.1.4"),
mavenBundle("org.apache.sling", "org.apache.sling.discovery.api", "1.0.0"),
mavenBundle("org.apache.sling", "org.apache.sling.discovery.standalone", "1.0.0"),
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java?rev=1530723&r1=1530722&r2=1530723&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java Wed Oct 9 17:28:25 2013
@@ -36,6 +36,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.sling.event.impl.Barrier;
import org.apache.sling.event.impl.jobs.config.ConfigurationConstants;
+import org.apache.sling.event.impl.support.ResourceHelper;
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.JobManager;
import org.apache.sling.event.jobs.JobProcessor;
@@ -91,9 +92,9 @@ public class JobHandlingTest extends Abs
*/
private Event getJobEvent(String id) {
final Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(JobUtil.PROPERTY_JOB_TOPIC, "sling/test");
+ props.put(ResourceHelper.PROPERTY_JOB_TOPIC, "sling/test");
if ( id != null ) {
- props.put(JobUtil.PROPERTY_JOB_NAME, id);
+ props.put(ResourceHelper.PROPERTY_JOB_NAME, id);
}
return new Event(JobUtil.TOPIC_JOB, props);
@@ -231,17 +232,17 @@ public class JobHandlingTest extends Abs
assertEquals(1, jobManager.findJobs(JobManager.QueryType.ALL, "sling/test", -1, (Map<String, Object>[])null).size());
// job is currently waiting, therefore cancel fails
- final Event e1 = jobManager.findJob("sling/test", Collections.singletonMap(JobUtil.PROPERTY_JOB_NAME, (Object)"myid2"));
+ final Event e1 = jobManager.findJob("sling/test", Collections.singletonMap(ResourceHelper.PROPERTY_JOB_NAME, (Object)"myid2"));
assertNotNull(e1);
- assertFalse(jobManager.removeJob((String)e1.getProperty(JobUtil.JOB_ID)));
+ assertFalse(jobManager.removeJob((String)e1.getProperty(ResourceHelper.PROPERTY_JOB_ID)));
cb2.block(); // and continue job
sleep(200);
// the job is now in the queue again
- final Event e2 = jobManager.findJob("sling/test", Collections.singletonMap(JobUtil.PROPERTY_JOB_NAME, (Object)"myid2"));
+ final Event e2 = jobManager.findJob("sling/test", Collections.singletonMap(ResourceHelper.PROPERTY_JOB_NAME, (Object)"myid2"));
assertNotNull(e2);
- assertTrue(jobManager.removeJob((String)e2.getProperty(JobUtil.JOB_ID)));
+ assertTrue(jobManager.removeJob((String)e2.getProperty(ResourceHelper.PROPERTY_JOB_ID)));
assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL, "sling/test", -1, (Map<String, Object>[])null).size());
final Collection<Job> col = jobManager.findJobs(JobManager.QueryType.HISTORY, "sling/test", -1, (Map<String, Object>[])null);
try {
@@ -280,9 +281,9 @@ public class JobHandlingTest extends Abs
assertEquals(1, jobManager.findJobs(JobManager.QueryType.ALL, "sling/test", -1, (Map<String, Object>[])null).size());
// job is currently sleeping, but force cancel always waits!
- final Event e = jobManager.findJob("sling/test", Collections.singletonMap(JobUtil.PROPERTY_JOB_NAME, (Object)"myid3"));
+ final Event e = jobManager.findJob("sling/test", Collections.singletonMap(ResourceHelper.PROPERTY_JOB_NAME, (Object)"myid3"));
assertNotNull(e);
- jobManager.forceRemoveJob((String)e.getProperty(JobUtil.JOB_ID));
+ jobManager.forceRemoveJob((String)e.getProperty(ResourceHelper.PROPERTY_JOB_ID));
// the job is now removed
assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL, "sling/test", -1, (Map<String, Object>[])null).size());
final Collection<Job> col = jobManager.findJobs(JobManager.QueryType.HISTORY, "sling/test", -1, (Map<String, Object>[])null);
@@ -401,7 +402,7 @@ public class JobHandlingTest extends Abs
@Override
public void handleEvent(Event event) {
final Event job = (Event) event.getProperty(JobUtil.PROPERTY_NOTIFICATION_JOB);
- final String id = (String)job.getProperty(JobUtil.PROPERTY_JOB_NAME);
+ final String id = (String)job.getProperty(ResourceHelper.PROPERTY_JOB_NAME);
cancelled.add(id);
}
});
@@ -411,7 +412,7 @@ public class JobHandlingTest extends Abs
@Override
public void handleEvent(Event event) {
final Event job = (Event) event.getProperty(JobUtil.PROPERTY_NOTIFICATION_JOB);
- final String id = (String)job.getProperty(JobUtil.PROPERTY_JOB_NAME);
+ final String id = (String)job.getProperty(ResourceHelper.PROPERTY_JOB_NAME);
failed.add(id);
}
});
@@ -421,7 +422,7 @@ public class JobHandlingTest extends Abs
@Override
public void handleEvent(Event event) {
final Event job = (Event) event.getProperty(JobUtil.PROPERTY_NOTIFICATION_JOB);
- final String id = (String)job.getProperty(JobUtil.PROPERTY_JOB_NAME);
+ final String id = (String)job.getProperty(ResourceHelper.PROPERTY_JOB_NAME);
finished.add(id);
}
});
@@ -431,7 +432,7 @@ public class JobHandlingTest extends Abs
@Override
public void handleEvent(Event event) {
final Event job = (Event) event.getProperty(JobUtil.PROPERTY_NOTIFICATION_JOB);
- final String id = (String)job.getProperty(JobUtil.PROPERTY_JOB_NAME);
+ final String id = (String)job.getProperty(ResourceHelper.PROPERTY_JOB_NAME);
started.add(id);
}
});
@@ -521,7 +522,7 @@ public class JobHandlingTest extends Abs
for(int i = 0; i < COUNT; i++ ) {
final String jobTopic = (i % 2 == 0 ? TOPIC : TOPIC + "2");
final Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(JobUtil.PROPERTY_JOB_TOPIC, jobTopic);
+ props.put(ResourceHelper.PROPERTY_JOB_TOPIC, jobTopic);
this.eventAdmin.postEvent(new Event(JobUtil.TOPIC_JOB, props));
}
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java?rev=1530723&r1=1530722&r2=1530723&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java Wed Oct 9 17:28:25 2013
@@ -19,7 +19,7 @@
package org.apache.sling.event.it;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import java.util.Date;
@@ -49,7 +49,7 @@ public class TimedJobsTest extends Abstr
this.sleep(1000L);
}
- @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ @Test(timeout = 1000*60)
public void testTimedJob() throws Exception {
final AtomicInteger counter = new AtomicInteger();
@@ -66,16 +66,15 @@ public class TimedJobsTest extends Abstr
});
try {
final Date d = new Date();
- d.setTime(System.currentTimeMillis() + 2000); // run in 2 seconds
+ d.setTime(System.currentTimeMillis() + 3000); // run in 3 seconds
// create scheduled job
- assertTrue(this.getJobManager().createJob(TOPIC).schedule("simpleTest").at(d));
+ assertNotNull(this.getJobManager().createJob(TOPIC).schedule("simpleTest").at(d).add());
while ( counter.get() == 0 ) {
this.sleep(1000);
}
- this.sleep(1000);
- assertEquals(0, this.getJobManager().getScheduledJobs().size());
+ assertEquals(1, this.getJobManager().getScheduledJobs().size()); // job is still scheduled
} finally {
ehReg.unregister();
}