You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/12/20 23:40:47 UTC
svn commit: r1647061 - in /felix/sandbox/pderop/dependencymanager-prototype:
./ org.apache.felix.dependencymanager.benchmark/
org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/controller/impl/
org.apache.felix.dependencyman...
Author: pderop
Date: Sat Dec 20 22:40:47 2014
New Revision: 1647061
URL: http://svn.apache.org/r1647061
Log:
cleanup. Fixed some integration tests.
Removed:
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsParallelTest.java
Modified:
felix/sandbox/pderop/dependencymanager-prototype/README
felix/sandbox/pderop/dependencymanager-prototype/gradle.properties
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/README
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/controller/impl/ScenarioControllerImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/dependencymanager/ParallelActivator.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bundle.bnd
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4158_DependencyDeclarationTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/Activator.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/SpellChecker.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/DispatchExecutor.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/README
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/README?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/README (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/README Sat Dec 20 22:40:47 2014
@@ -9,11 +9,10 @@ Dependency Manager 4.0.0 general README
* to compile:
- Install either Eclipse Kepler SR2 (+ Java8 support which is needed by benchmark sub project) or Eclipse Luna.
-- Install java7/Java8 JREs in Eclipse (Window -> Preferences -> Java -> Installed JREs). Use JRE 1.7 as the default JRE.
+- Install java7/Java8 JREs in Eclipse (Window -> Preferences -> Java -> Installed JREs).
+ (Use JRE 1.7 as the default JRE)
- Open BndTools perpective.
-- Import Dependency Manager in Eclipse.
-- Open BndTools perspective and recompile every sub projects
-- Restart Eclipse
+- Import Dependency Manager into Eclipse.
* To run tests:
@@ -26,7 +25,7 @@ Dependency Manager 4.0.0 general README
- Click on org.apache.felix.dependencymanager.samples and run it as "Bnd OSGi Run Launcher"
-* To execute the benchmark:
+* To execute the benchmark (requires Jdk1.8)
- Click on org.apache.felix.dependencymanager.benchmark and run it as ""Bnd OSGi Run Launcher"
More informations on the benchmark can be found from org.apache.felix.dependencymanager.benchmark/README file.
Modified: felix/sandbox/pderop/dependencymanager-prototype/gradle.properties
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/gradle.properties?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/gradle.properties (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/gradle.properties Sat Dec 20 22:40:47 2014
@@ -1,3 +1,9 @@
+# http proxy settings (optional)
+#systemProp.http.proxyHost=
+#systemProp.http.proxyPort=
+#systemProp.https.proxyHost=
+#systemProp.https.proxyPort=
+
# cnf project name
bnd_cnf=cnf
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/README
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/README?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/README (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/README Sat Dec 20 22:40:47 2014
@@ -8,7 +8,7 @@ How to launch the stress test under bndt
The stress test performs two kind of tests on DM and parallel DM.
-1) first kind of tests: starts/stops several times each tested bundle (SCR/DM/Parallel DM). When
+1) first kind of tests: starts/stops several times each tested bundle (DM/Parallel DM). When
started, the test bundle is expected to register/unregister several services. And no processing is
done at all in each component start methods).
@@ -127,9 +127,6 @@ on several Track services.
"Track" service: A piece of music.
-By default, a scenario consists in registering 5 artists, each artist having 10 albums, and each
-album having 5 music tracks (~ 300 services).
-
The scenario is implemented in the following bundles
- org.apache.felix.dm.benchmark.scenario: defines the interfaces.
@@ -137,8 +134,7 @@ The scenario is implemented in the follo
The Scenario Controller (see
org.apache.felix.dm.benchmark.scenario/org.apache.felix.dm.benchmark.scenario.impl) is in charge of
-starting/stopping many times some DI specific bundles (DM4, SCR), which are expected to create all
-expected Artist/Album/Track services.
+starting/stopping many times some specific bundles (DM, Parallel DM).
By default, when a tested bundle is started, it will create several Artists (see Artists.ARTISTS
constant). each Artist depends on several Albums (see Artists.ALBUMS constant), and each Album
@@ -152,18 +148,15 @@ It contains a simple activator, which cr
- org.apache.felix.dm.benchmark.dependencymanager.parallel:
same as above, but using parallel dependency manager where components dependency management and
-components activation/deactivation processing is performed concurrently, using a fixed thread pool.
+components activation processing is performed concurrently, using a fixed thread pool.
-The org.apache.felix.dm.benchmark.controller bundle, when starting, first stops all tested bundles.
+The org.apache.felix.dm.benchmark.controller bundle, when started, first stops all tested bundles.
Then for each one, it performs the following test (multiple times):
-- register the ScenarioController service (using the OSGi BundleContext API)
- start the tested bundle
-- wait for all expected services to be registered
-- unregister the ScenarioController service (this will trigger a full deactivation of services,
-because all services are expected to depend on it).
-- wait for all expected services to be unregistered
+- wait for all expected services to be registered (Artists/Albums/Tracks)
- stop the tested bundle.
+- wait for all expected services to be unregistered
All the elapsed time (nanoseconds) used to execute each iteration is then recorded in a list.
When enough iterations are done, the list is sorted (that is : the first entry in the list
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/controller/impl/ScenarioControllerImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/controller/impl/ScenarioControllerImpl.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/controller/impl/ScenarioControllerImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/controller/impl/ScenarioControllerImpl.java Sat Dec 20 22:40:47 2014
@@ -81,7 +81,7 @@ public class ScenarioControllerImpl impl
+ " components during bundle activation).");
// Stop all tested bundles.
- forEachScenarioBundle(TESTS, Unchecked.consumer((bundle) -> {
+ forEachScenarioBundle(TESTS, Unchecked.consumer(bundle -> {
debug(() -> "Stopping bundle " + bundle.getSymbolicName());
bundle.stop();
}));
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/dependencymanager/ParallelActivator.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/dependencymanager/ParallelActivator.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/dependencymanager/ParallelActivator.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.benchmark/src/org/apache/felix/dm/benchmark/dependencymanager/ParallelActivator.java Sat Dec 20 22:40:47 2014
@@ -16,7 +16,7 @@ public class ParallelActivator extends A
context.registerService(ComponentExecutorFactory.class.getName(), new ComponentExecutorFactory() {
@Override
public Executor getExecutorFor(Component component) {
- return Helper.getThreadPool();
+ return Helper.getThreadPool(); // Return our thread pool shared for all components
}
}, null);
super.init(context, mgr);
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bundle.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bundle.bnd?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bundle.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bundle.bnd Sat Dec 20 22:40:47 2014
@@ -1,3 +1,3 @@
Private-Package: \
org.apache.felix.dm.itest.bundle
-Bundle-Activator:org.apache.felix.dm.itest.bundle.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dm.itest.bundle.Activator
\ No newline at end of file
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java Sat Dec 20 22:40:47 2014
@@ -59,6 +59,7 @@ public class AspectDynamicsTest extends
m.remove(provider);
m.remove(consumer);
e.waitForStep(16, 15000);
+ m.clear();
}
static interface ServiceInterface {
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java Sat Dec 20 22:40:47 2014
@@ -34,6 +34,7 @@ public class FELIX2955_ShellCommandTest
private Bundle m_testBundle;
public void testShellCommands() throws Throwable {
+ try {
m_myBundleId = context.getBundle().getBundleId();
for (Bundle b : context.getBundles()) {
if (b.getSymbolicName().equals("org.apache.felix.dependencymanager.itest.bundle")) {
@@ -76,6 +77,11 @@ public class FELIX2955_ShellCommandTest
e.ensure();
m.remove(shellClient);
m.clear();
+ }
+
+ catch (Throwable t) {
+ error("test failed", t);
+ }
}
public class ShellClient {
@@ -90,7 +96,7 @@ public class FELIX2955_ShellCommandTest
m_missingId = missingId;
}
- public void start() {
+ public void start() throws InterruptedException {
Thread t = new Thread("Shell Client") {
public void run() {
String bsn = context.getBundle().getSymbolicName();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4158_DependencyDeclarationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4158_DependencyDeclarationTest.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4158_DependencyDeclarationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4158_DependencyDeclarationTest.java Sat Dec 20 22:40:47 2014
@@ -27,6 +27,7 @@ public class FELIX4158_DependencyDeclara
Assert.assertEquals(cdds[0].getSimpleName(), "org.osgi.service.log.LogService");
Assert.assertNotNull(cdds[0].getFilter());
Assert.assertEquals(cdds[0].getFilter(), "(foo=bar)");
+ m.clear();
}
public void testConfigurationDependencyDeclaration() {
@@ -42,6 +43,7 @@ public class FELIX4158_DependencyDeclara
Assert.assertEquals(cdds[0].getName(), "foo");
Assert.assertEquals(cdds[0].getSimpleName(), "foo");
Assert.assertNull(cdds[0].getFilter());
+ m.clear();
}
public void testResourceDependencyDeclaration() throws MalformedURLException {
@@ -59,6 +61,7 @@ public class FELIX4158_DependencyDeclara
Assert.assertNotNull(cdds[0].getSimpleName());
Assert.assertEquals(cdds[0].getSimpleName(), "file://localhost/path/to/file1.txt");
Assert.assertNull(cdds[0].getFilter());
+ m.clear();
}
public void testResourceDependencyDeclarationWithFilter() {
@@ -76,6 +79,7 @@ public class FELIX4158_DependencyDeclara
Assert.assertNull(cdds[0].getSimpleName());
Assert.assertNotNull(cdds[0].getFilter());
Assert.assertEquals(cdds[0].getFilter(), "(&(path=/path/to/*.txt)(host=localhost))");
+ m.clear();
}
public void testBundleDependencyDeclaration() throws MalformedURLException {
@@ -92,6 +96,7 @@ public class FELIX4158_DependencyDeclara
Assert.assertNotNull(cdds[0].getSimpleName());
Assert.assertEquals(cdds[0].getSimpleName(), "active installed resolved");
Assert.assertNull(cdds[0].getFilter());
+ m.clear();
}
public void testBundleDependencyDeclarationWithMask() throws MalformedURLException {
@@ -109,6 +114,7 @@ public class FELIX4158_DependencyDeclara
Assert.assertNotNull(cdds[0].getSimpleName());
Assert.assertEquals(cdds[0].getSimpleName(), "active resolved");
Assert.assertNull(cdds[0].getFilter());
+ m.clear();
}
public void testBundleDependencyDeclarationWithFilter() throws MalformedURLException {
@@ -128,5 +134,6 @@ public class FELIX4158_DependencyDeclara
Assert.assertEquals(cdds[0].getSimpleName(), "active");
Assert.assertNotNull(cdds[0].getFilter());
Assert.assertEquals(cdds[0].getFilter(), "(DependencyManager-Component=*)");
+ m.clear();
}
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java Sat Dec 20 22:40:47 2014
@@ -52,7 +52,7 @@ public class ResourceAdapterDependencyAd
.setRequired(true);
CallbackInstance callbackInstance = new CallbackInstance(e, d);
Component component = m.createResourceAdapterService("(&(path=/path/to/*.txt)(host=localhost))", false, callbackInstance, "changed")
- .setImplementation(new ResourceAdapter(e, d))
+ .setImplementation(new ResourceAdapter(e))
.setCallbacks(callbackInstance, "init", "start", "stop", "destroy");
// add the resource adapter
@@ -80,16 +80,10 @@ public class ResourceAdapterDependencyAd
static class ResourceAdapter {
protected URL m_resource; // injected by reflection.
private Ensure m_ensure;
- private final Dependency m_dependency;
- ResourceAdapter(Ensure e, Dependency d) {
+ ResourceAdapter(Ensure e) {
m_ensure = e;
- m_dependency = d;
}
-
- void init(Component c) {
- c.add(m_dependency);
- }
}
class ResourceProvider {
@@ -196,8 +190,9 @@ public class ResourceAdapterDependencyAd
m_dependency = d;
}
- void init() {
+ void init(Component c) {
debug("CallbackInstance.init");
+ c.add(m_dependency);
}
void start() {
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java Sat Dec 20 22:40:47 2014
@@ -84,10 +84,6 @@ public class ResourceAdapterDependencyAd
m_ensure = e;
m_dependency = d;
}
-
- void init(Component c) {
- c.add(m_dependency);
- }
}
static class ResourceProvider {
@@ -188,7 +184,8 @@ public class ResourceAdapterDependencyAd
m_dependency = d;
}
- void init() {
+ void init(Component c) {
+ c.add(m_dependency);
System.out.println("init");
m_ensure.step(1);
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/Activator.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/Activator.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/Activator.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/Activator.java Sat Dec 20 22:40:47 2014
@@ -27,11 +27,11 @@ public class Activator extends Dependenc
Hashtable<String, Object> props = new Hashtable<>();
props.put("device.id", id);
dm.add(createComponent()
- .setImplementation(new DeviceImpl(id)).setInterface(Device.class.getName(), props));
+ .setImplementation(new DeviceImpl(id)).setInterface(Device.class.getName(), props));
props = new Hashtable<>();
props.put("device.id", id);
dm.add(createComponent()
- .setImplementation(new DeviceParameterImpl(id)).setInterface(DeviceParameter.class.getName(), props));
+ .setImplementation(new DeviceParameterImpl(id)).setInterface(DeviceParameter.class.getName(), props));
}
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/SpellChecker.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/SpellChecker.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/SpellChecker.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/SpellChecker.java Sat Dec 20 22:40:47 2014
@@ -39,7 +39,7 @@ import org.osgi.service.log.LogService;
*/
@Component(provides = { SpellChecker.class }, properties = {
@Property(name = CommandProcessor.COMMAND_SCOPE, value = "dictionary.annotation"),
- @Property(name = CommandProcessor.COMMAND_FUNCTION, values = { "spellcheck" }) })
+ @Property(name = CommandProcessor.COMMAND_FUNCTION, value = "spellcheck" ) })
public class SpellChecker {
/**
* We'll use the OSGi log service for logging. If no log service is available, then we'll use a NullObject.
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/DispatchExecutor.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/DispatchExecutor.java?rev=1647061&r1=1647060&r2=1647061&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/DispatchExecutor.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/DispatchExecutor.java Sat Dec 20 22:40:47 2014
@@ -1,9 +1,6 @@
package org.apache.felix.dm.impl;
-import java.lang.ref.WeakReference;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -113,7 +110,7 @@ public class DispatchExecutor implements
}
/**
- * Schedules the execution of this DispatchQueue in the threadpool.
+ * Schedules the execution of this DispatchQueue in the threadpool, or from a single caller thread.
*
* @param threadpool true means the DispatchQueue is executed in the threadpool, false means the queue is executed from the
* caller thread.