Author: cziegeler
Date: Fri Jan 8 16:24:22 2016
New Revision: 1723753
URL: http://svn.apache.org/viewvc?rev=1723753&view=rev
Log:
SLING-5417 : Jobs are only partially persisted
Modified:
sling/trunk/bundles/extensions/event/pom.xml
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ChaosTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/HistoryTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/SchedulingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TopicMatchingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java
Modified: sling/trunk/bundles/extensions/event/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/pom.xml Fri Jan 8 16:24:22 2016
@@ -235,8 +235,9 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <artifactId>org.osgi.service.event</artifactId>
+ <version>1.3.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -291,6 +292,12 @@
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
Fri Jan 8 16:24:22 2016
@@ -33,15 +33,12 @@ import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.ComponentContext;
public class QueuesMBeanImplTest {
private QueuesMBeanImpl mbean;
@Mock
private BundleContext bundleContext;
- @Mock
- private ComponentContext componentContext;
@Captor
private ArgumentCaptor<String> serviceClass;
@Captor
@@ -59,8 +56,7 @@ public class QueuesMBeanImplTest {
@Before
public void setup() throws NoSuchFieldException {
mbean = new QueuesMBeanImpl();
-
Mockito.when(componentContext.getBundleContext()).thenReturn(bundleContext);
- mbean.activate(componentContext.getBundleContext());
+ mbean.activate(bundleContext);
}
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=1723753&r1=1723752&r2=1723753&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
Fri Jan 8 16:24:22 2016
@@ -242,6 +242,23 @@ public abstract class AbstractJobHandlin
resolver.close();
}
}
+ // remove all configurations and clean content
+ try {
+ final org.osgi.service.cm.Configuration[] cfgs =
this.configAdmin.listConfigurations(null);
+ if ( cfgs != null ) {
+ for(final org.osgi.service.cm.Configuration c : cfgs) {
+ try {
+ c.delete();
+ } catch (final IOException io) {
+ // ignore
+ }
+ }
+ }
+ } catch (final IOException io) {
+ // ignore
+ } catch (final InvalidSyntaxException e) {
+ // ignore
+ }
this.sleep(1000);
}
@@ -309,14 +326,4 @@ public abstract class AbstractJobHandlin
this.waitConsumerChangeCount(cc + 1);
return reg;
}
-
- /**
- * Helper method to remove a configuration
- */
- protected void removeConfiguration(final String pid) throws IOException {
- if ( pid != null ) {
- final org.osgi.service.cm.Configuration cfg =
this.configAdmin.getConfiguration(pid, null);
- cfg.delete();
- }
- }
}
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ChaosTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ChaosTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ChaosTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ChaosTest.java
Fri Jan 8 16:24:22 2016
@@ -50,8 +50,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -59,7 +57,6 @@ import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class ChaosTest extends AbstractJobHandlingTest {
/** Duration for firing jobs in seconds. */
@@ -93,11 +90,6 @@ public class ChaosTest extends AbstractJ
}
}
- private String orderedQueueConfPid;
-
- private String topicRRQueueConfPid;
-
-
@Override
@Before
public void setup() throws IOException {
@@ -113,8 +105,6 @@ public class ChaosTest extends AbstractJ
orderedProps.put(ConfigurationConstants.PROP_RETRY_DELAY, 2000L);
orderedConfig.update(orderedProps);
- orderedQueueConfPid = orderedConfig.getPid();
-
// create round robin test queue
final org.osgi.service.cm.Configuration rrConfig =
this.configAdmin.createFactoryConfiguration("org.apache.sling.event.jobs.QueueConfiguration",
null);
final Dictionary<String, Object> rrProps = new Hashtable<String,
Object>();
@@ -126,15 +116,12 @@ public class ChaosTest extends AbstractJ
rrProps.put(ConfigurationConstants.PROP_MAX_PARALLEL, 5);
rrConfig.update(rrProps);
- topicRRQueueConfPid = rrConfig.getPid();
-
this.sleep(1000L);
}
+ @Override
@After
- public void cleanUp() throws IOException {
- this.removeConfiguration(this.orderedQueueConfPid);
- this.removeConfiguration(this.topicRRQueueConfPid);
+ public void cleanup() {
super.cleanup();
}
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Fri Jan 8 16:24:22 2016
@@ -44,14 +44,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class ClassloadingTest extends AbstractJobHandlingTest {
private static final int CONDITION_INTERVAL_MILLIS = 50;
@@ -60,8 +57,6 @@ public class ClassloadingTest extends Ab
private static final String QUEUE_NAME = "cltest";
private static final String TOPIC = "sling/cltest";
- private String queueConfigPid;
-
@Override
@Before
public void setup() throws IOException {
@@ -75,14 +70,12 @@ public class ClassloadingTest extends Ab
orderedProps.put(ConfigurationConstants.PROP_TOPICS, TOPIC);
orderedConfig.update(orderedProps);
- queueConfigPid = orderedConfig.getPid();
-
this.sleep(1000L);
}
+ @Override
@After
- public void cleanUp() throws IOException {
- this.removeConfiguration(this.queueConfigPid);
+ public void cleanup() {
super.cleanup();
}
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/HistoryTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/HistoryTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/HistoryTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/HistoryTest.java
Fri Jan 8 16:24:22 2016
@@ -41,20 +41,15 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class HistoryTest extends AbstractJobHandlingTest {
private static final String TOPIC = "sling/test/history";
private static final String PROP_COUNTER = "counter";
- private String queueConfPid;
-
@Override
@Before
public void setup() throws IOException {
@@ -72,13 +67,12 @@ public class HistoryTest extends Abstrac
props.put(ConfigurationConstants.PROP_KEEP_JOBS, true);
config.update(props);
- this.queueConfPid = config.getPid();
this.sleep(1000L);
}
+ @Override
@After
- public void cleanUp() throws IOException {
- this.removeConfiguration(this.queueConfPid);
+ public void cleanup() {
super.cleanup();
}
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=1723753&r1=1723752&r2=1723753&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
Fri Jan 8 16:24:22 2016
@@ -49,20 +49,15 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class JobHandlingTest extends AbstractJobHandlingTest {
public static final String TOPIC = "sling/test";
- private String queueConfPid;
-
@Override
@Before
public void setup() throws IOException {
@@ -78,13 +73,12 @@ public class JobHandlingTest extends Abs
props.put(ConfigurationConstants.PROP_RETRY_DELAY, 2000L);
config.update(props);
- this.queueConfPid = config.getPid();
this.sleep(1000L);
}
+ @Override
@After
- public void cleanUp() throws IOException {
- this.removeConfiguration(this.queueConfPid);
+ public void cleanup() {
super.cleanup();
}
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
Fri Jan 8 16:24:22 2016
@@ -44,18 +44,13 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class OrderedQueueTest extends AbstractJobHandlingTest {
- private String queueConfPid;
-
@Override
@Before
public void setup() throws IOException {
@@ -71,14 +66,12 @@ public class OrderedQueueTest extends Ab
orderedProps.put(ConfigurationConstants.PROP_RETRY_DELAY, 2000L);
orderedConfig.update(orderedProps);
- this.queueConfPid = orderedConfig.getPid();
-
this.sleep(1000L);
}
+ @Override
@After
- public void cleanUp() throws IOException {
- this.removeConfiguration(this.queueConfPid);
+ public void cleanup() {
super.cleanup();
}
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
Fri Jan 8 16:24:22 2016
@@ -44,14 +44,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class RoundRobinQueueTest extends AbstractJobHandlingTest {
private static final String QUEUE_NAME = "roundrobintest";
@@ -59,8 +56,6 @@ public class RoundRobinQueueTest extends
private static int MAX_PAR = 5;
private static int NUM_JOBS = 300;
- private String queueConfPid;
-
@Override
@Before
public void setup() throws IOException {
@@ -77,14 +72,12 @@ public class RoundRobinQueueTest extends
rrProps.put(ConfigurationConstants.PROP_MAX_PARALLEL, MAX_PAR);
rrConfig.update(rrProps);
- queueConfPid = rrConfig.getPid();
-
this.sleep(1000L);
}
+ @Override
@After
- public void cleanUp() throws IOException {
- this.removeConfiguration(this.queueConfPid);
+ public void cleanup() {
super.cleanup();
}
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/SchedulingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/SchedulingTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/SchedulingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/SchedulingTest.java
Fri Jan 8 16:24:22 2016
@@ -32,12 +32,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class SchedulingTest extends AbstractJobHandlingTest {
private static final String TOPIC = "job/scheduled/topic";
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=1723753&r1=1723752&r2=1723753&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
Fri Jan 8 16:24:22 2016
@@ -33,12 +33,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class TimedJobsTest extends AbstractJobHandlingTest {
private static final String TOPIC = "timed/test/topic";
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TopicMatchingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TopicMatchingTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TopicMatchingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TopicMatchingTest.java
Fri Jan 8 16:24:22 2016
@@ -31,14 +31,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class TopicMatchingTest extends AbstractJobHandlingTest {
public static final String TOPIC = "sling/test/a";
@@ -47,6 +44,8 @@ public class TopicMatchingTest extends A
@Before
public void setup() throws IOException {
super.setup();
+
+ this.sleep(1000L);
}
@Override
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java?rev=1723753&r1=1723752&r2=1723753&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java
Fri Jan 8 16:24:22 2016
@@ -44,14 +44,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
public class UnorderedQueueTest extends AbstractJobHandlingTest {
private static final String QUEUE_NAME = "unorderedtestqueue";
@@ -59,8 +56,6 @@ public class UnorderedQueueTest extends
private static int MAX_PAR = 5;
private static int NUM_JOBS = 300;
- private String queueConfPid;
-
@Override
@Before
public void setup() throws IOException {
@@ -77,14 +72,12 @@ public class UnorderedQueueTest extends
rrProps.put(ConfigurationConstants.PROP_MAX_PARALLEL, MAX_PAR);
rrConfig.update(rrProps);
- queueConfPid = rrConfig.getPid();
-
this.sleep(1000L);
}
+ @Override
@After
- public void cleanUp() throws IOException {
- this.removeConfiguration(this.queueConfPid);
+ public void cleanup() {
super.cleanup();
}
