JBoss-OSGI SVN: r94357 - projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 07:33:42 -0400 (Mon, 05 Oct 2009)
New Revision: 94357
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
Log:
Timeout for event delivery: 5 sec
Hudson shows errors
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 11:30:10 UTC (rev 94356)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 11:33:42 UTC (rev 94357)
@@ -532,8 +532,8 @@
@SuppressWarnings("unchecked")
private void waitForEvents(List events) throws InterruptedException
{
- // Timeout for event delivery: 2 sec
- int timeout = 20;
+ // Timeout for event delivery: 5 sec
+ int timeout = 50;
while (events.size() == 0 && 0 < timeout)
{
16 years, 9 months
JBoss-OSGI SVN: r94354 - projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 07:05:03 -0400 (Mon, 05 Oct 2009)
New Revision: 94354
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
Log:
Timeout for event delivery: 2 sec
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 11:02:46 UTC (rev 94353)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 11:05:03 UTC (rev 94354)
@@ -532,7 +532,9 @@
@SuppressWarnings("unchecked")
private void waitForEvents(List events) throws InterruptedException
{
- int timeout = 50;
+ // Timeout for event delivery: 2 sec
+ int timeout = 20;
+
while (events.size() == 0 && 0 < timeout)
{
synchronized (events)
16 years, 9 months
JBoss-OSGI SVN: r94352 - in projects/jboss-osgi/projects/runtime/microcontainer/trunk/src: test/java/org/jboss/test/osgi and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 06:57:04 -0400 (Mon, 05 Oct 2009)
New Revision: 94352
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java
Log:
[JBOSGI-159] Fire events asynchronously
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2009-10-05 10:49:22 UTC (rev 94351)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2009-10-05 10:57:04 UTC (rev 94352)
@@ -25,11 +25,14 @@
import java.security.AccessControlContext;
import java.security.AccessController;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import org.jboss.logging.Logger;
import org.jboss.osgi.framework.bundle.AbstractBundleState;
@@ -46,6 +49,7 @@
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
import org.osgi.framework.SynchronousBundleListener;
/**
@@ -59,6 +63,9 @@
// Provide logging
final Logger log = Logger.getLogger(FrameworkEventsPluginImpl.class);
+ /** The executor service */
+ private ExecutorService executorService;
+
/** The bundle listeners */
private final Map<Bundle, List<BundleListener>> bundleListeners = new ConcurrentHashMap<Bundle, List<BundleListener>>();
@@ -71,15 +78,17 @@
public FrameworkEventsPluginImpl(OSGiBundleManager bundleManager)
{
super(bundleManager);
+
+ this.executorService = Executors.newCachedThreadPool();
}
public void addBundleListener(Bundle bundle, BundleListener listener)
{
if (listener == null)
throw new IllegalArgumentException("Null listener");
-
+
bundle = assertBundle(bundle);
-
+
synchronized (bundleListeners)
{
List<BundleListener> listeners = bundleListeners.get(bundle);
@@ -97,7 +106,7 @@
{
if (listener == null)
throw new IllegalArgumentException("Null listener");
-
+
bundle = assertBundle(bundle);
synchronized (bundleListeners)
@@ -126,7 +135,7 @@
{
if (listener == null)
throw new IllegalArgumentException("Null listener");
-
+
bundle = assertBundle(bundle);
synchronized (frameworkListeners)
@@ -146,7 +155,7 @@
{
if (listener == null)
throw new IllegalArgumentException("Null listener");
-
+
bundle = assertBundle(bundle);
synchronized (frameworkListeners)
@@ -175,7 +184,7 @@
{
if (listener == null)
throw new IllegalArgumentException("Null listener");
-
+
bundle = assertBundle(bundle);
synchronized (serviceListeners)
@@ -186,7 +195,7 @@
listeners = new CopyOnWriteArrayList<ServiceListenerRegistration>();
serviceListeners.put(bundle, listeners);
}
-
+
ServiceListenerRegistration registration = new ServiceListenerRegistration(listener, filter);
if (listeners.contains(registration) == false)
listeners.add(registration);
@@ -197,9 +206,9 @@
{
if (listener == null)
throw new IllegalArgumentException("Null listener");
-
+
bundle = assertBundle(bundle);
-
+
synchronized (serviceListeners)
{
List<ServiceListenerRegistration> listeners = serviceListeners.get(bundle);
@@ -222,29 +231,41 @@
}
}
- public void fireBundleEvent(Bundle bundle, int type)
+ public void fireBundleEvent(final Bundle bundle, final int type)
{
+ // Get a snapshot of the current listeners
+ final List<BundleListener> listeners = new ArrayList<BundleListener>();
synchronized (bundleListeners)
{
- // Expose the wrapper not the state itself
- bundle = assertBundle(bundle);
- BundleEvent event = new BundleEvent(type, bundle);
- String typeName = ConstantsHelper.bundleEvent(event.getType());
+ for (Entry<Bundle, List<BundleListener>> entry : bundleListeners.entrySet())
+ {
+ for (BundleListener listener : entry.getValue())
+ {
+ listeners.add(listener);
+ }
+ }
+ }
- log.info("Bundle " + typeName + ": " + bundle);
-
- // Nobody is interested
- if (bundleListeners.isEmpty())
- return;
+ // Expose the bundl wrapper not the state itself
+ final BundleEvent event = new OSGiBundleEvent(type, assertBundle(bundle));
+ final String typeName = ConstantsHelper.bundleEvent(event.getType());
- // Are we active?
- if (getBundleManager().isActive() == false)
- return;
+ log.info("Bundle " + typeName + ": " + bundle);
- // Synchronous listeners first
- for (Entry<Bundle, List<BundleListener>> entry : bundleListeners.entrySet())
+ // Nobody is interested
+ if (listeners.isEmpty())
+ return;
+
+ // Are we active?
+ if (getBundleManager().isActive() == false)
+ return;
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
{
- for (BundleListener listener : entry.getValue())
+ // Synchronous listeners first
+ for (BundleListener listener : listeners)
{
try
{
@@ -256,14 +277,11 @@
log.warn("Error while firing " + typeName + " for bundle " + bundle, t);
}
}
- }
- // Normal listeners after, if required
- if (type != BundleEvent.STARTING && type != BundleEvent.STOPPING && type != BundleEvent.LAZY_ACTIVATION)
- {
- for (Entry<Bundle, List<BundleListener>> entry : bundleListeners.entrySet())
+ // Normal listeners after, if required
+ if (type != BundleEvent.STARTING && type != BundleEvent.STOPPING && type != BundleEvent.LAZY_ACTIVATION)
{
- for (BundleListener listener : entry.getValue())
+ for (BundleListener listener : listeners)
{
try
{
@@ -277,32 +295,55 @@
}
}
}
- }
+ };
+
+ // Fire the event in a runnable
+ executorService.execute(runnable);
}
- public void fireFrameworkEvent(Bundle bundle, int type, Throwable throwable)
+ public void fireFrameworkEvent(final Bundle bundle, final int type, final Throwable throwable)
{
+ // Get a snapshot of the current listeners
+ final ArrayList<FrameworkListener> listeners = new ArrayList<FrameworkListener>();
synchronized (frameworkListeners)
{
- // Expose the wrapper not the state itself
- bundle = assertBundle(bundle);
- FrameworkEvent event = new FrameworkEvent(type, bundle, throwable);
- String typeName = ConstantsHelper.frameworkEvent(event.getType());
+ for (Entry<Bundle, List<FrameworkListener>> entry : frameworkListeners.entrySet())
+ {
+ for (FrameworkListener listener : entry.getValue())
+ {
+ listeners.add(listener);
+ }
+ }
+ }
- log.info("Framwork " + typeName);
-
- // Nobody is interested
- if (frameworkListeners.isEmpty())
- return;
+ // Nobody is interested
+ if (listeners.isEmpty())
+ return;
- // Are we active?
- if (getBundleManager().isActive() == false)
- return;
+ // Are we active?
+ if (getBundleManager().isActive() == false)
+ return;
- // Call the listeners
- for (Entry<Bundle, List<FrameworkListener>> entry : frameworkListeners.entrySet())
+ Runnable runnable = new Runnable()
+ {
+ public void run()
{
- for (FrameworkListener listener : entry.getValue())
+ // Expose the wrapper not the state itself
+ FrameworkEvent event = new OSGiFrameworkEvent(type, assertBundle(bundle), throwable);
+ String typeName = ConstantsHelper.frameworkEvent(event.getType());
+
+ log.info("Framwork " + typeName);
+
+ // Nobody is interested
+ if (frameworkListeners.isEmpty())
+ return;
+
+ // Are we active?
+ if (getBundleManager().isActive() == false)
+ return;
+
+ // Call the listeners
+ for (FrameworkListener listener : listeners)
{
try
{
@@ -314,32 +355,47 @@
}
}
}
- }
+ };
+
+ // Fire the event in a runnable
+ executorService.execute(runnable);
}
- public void fireServiceEvent(Bundle bundle, int type, OSGiServiceState service)
+ public void fireServiceEvent(Bundle bundle, int type, final OSGiServiceState service)
{
+ // Get a snapshot of the current listeners
+ final ArrayList<ServiceListenerRegistration> listeners = new ArrayList<ServiceListenerRegistration>();
synchronized (serviceListeners)
{
- // Expose the wrapper not the state itself
- bundle = assertBundle(bundle);
- ServiceEvent event = new ServiceEvent(type, service.getReferenceInternal());
- String typeName = ConstantsHelper.serviceEvent(event.getType());
+ for (Entry<Bundle, List<ServiceListenerRegistration>> entry : serviceListeners.entrySet())
+ {
+ for (ServiceListenerRegistration listener : entry.getValue())
+ {
+ listeners.add(listener);
+ }
+ }
+ }
- log.info("Service " + typeName + ": " + service);
-
- // Nobody is interested
- if (serviceListeners.isEmpty())
- return;
+ // Expose the wrapper not the state itself
+ final ServiceEvent event = new OSGiServiceEvent(type, service.getReferenceInternal());
+ final String typeName = ConstantsHelper.serviceEvent(event.getType());
- // Are we active?
- if (getBundleManager().isActive() == false)
- return;
+ log.info("Service " + typeName + ": " + service);
- // Call the listeners
- for (Entry<Bundle, List<ServiceListenerRegistration>> entry : serviceListeners.entrySet())
+ // Nobody is interested
+ if (listeners.isEmpty())
+ return;
+
+ // Are we active?
+ if (getBundleManager().isActive() == false)
+ return;
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
{
- for (ServiceListenerRegistration registration : entry.getValue())
+ // Call the listeners
+ for (ServiceListenerRegistration registration : listeners)
{
try
{
@@ -356,7 +412,10 @@
}
}
}
- }
+ };
+
+ // Fire the event in a runnable
+ executorService.execute(runnable);
}
private Bundle assertBundle(Bundle bundle)
@@ -374,7 +433,7 @@
/**
* Filter and AccessControl for service events
*/
- private static class ServiceListenerRegistration
+ static class ServiceListenerRegistration
{
// Any filter
Filter filter;
@@ -393,13 +452,13 @@
{
if (listener == null)
throw new IllegalArgumentException("Null listener");
-
+
if (filter == null)
filter = NoFilter.INSTANCE;
this.listener = listener;
this.filter = filter;
-
+
if (System.getSecurityManager() != null)
accessControlContext = AccessController.getContext();
}
@@ -409,15 +468,63 @@
{
return listener.hashCode();
}
-
+
@Override
public boolean equals(Object obj)
{
if (obj instanceof ServiceListenerRegistration == false)
return false;
-
+
ServiceListenerRegistration other = (ServiceListenerRegistration)obj;
return other.listener.equals(listener) && other.filter.equals(filter);
}
}
+
+ static class OSGiFrameworkEvent extends FrameworkEvent
+ {
+ private static final long serialVersionUID = 6505331543651318189L;
+
+ public OSGiFrameworkEvent(int type, Bundle bundle, Throwable throwable)
+ {
+ super(type, bundle, throwable);
+ }
+
+ @Override
+ public String toString()
+ {
+ return "FrameworkEvent[type=" + ConstantsHelper.frameworkEvent(getType()) + ",source=" + getSource() + "]";
+ }
+ }
+
+ static class OSGiBundleEvent extends BundleEvent
+ {
+ private static final long serialVersionUID = -2705304702665185935L;
+
+ public OSGiBundleEvent(int type, Bundle bundle)
+ {
+ super(type, bundle);
+ }
+
+ @Override
+ public String toString()
+ {
+ return "BundleEvent[type=" + ConstantsHelper.bundleEvent(getType()) + ",source=" + getSource() + "]";
+ }
+ }
+
+ static class OSGiServiceEvent extends ServiceEvent
+ {
+ private static final long serialVersionUID = 62018288275708239L;
+
+ public OSGiServiceEvent(int type, ServiceReference reference)
+ {
+ super(type, reference);
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ServiceEvent[type=" + ConstantsHelper.serviceEvent(getType()) + ",source=" + getSource() + "]";
+ }
+ }
}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 10:49:22 UTC (rev 94351)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 10:57:04 UTC (rev 94352)
@@ -35,6 +35,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
import org.jboss.osgi.framework.bundle.OSGiBundleManager;
+import org.jboss.osgi.spi.util.ConstantsHelper;
import org.jboss.test.AbstractTestDelegate;
import org.jboss.test.kernel.junit.MicrocontainerTest;
import org.jboss.virtual.AssembledDirectory;
@@ -62,7 +63,7 @@
private List<FrameworkEvent> frameworkEvents = new CopyOnWriteArrayList<FrameworkEvent>();
private List<BundleEvent> bundleEvents = new CopyOnWriteArrayList<BundleEvent>();
private List<ServiceEvent> serviceEvents = new CopyOnWriteArrayList<ServiceEvent>();
-
+
/**
* Create a new OSGiTestCase.
*
@@ -92,7 +93,7 @@
*/
protected OSGiTestDelegate getDelegate()
{
- return (OSGiTestDelegate) super.getDelegate();
+ return (OSGiTestDelegate)super.getDelegate();
}
/**
@@ -134,7 +135,7 @@
{
expected.add(getSystemBundle());
}
-
+
/**
* Create a bundle
*
@@ -170,12 +171,12 @@
{
getDelegate().uninstall(bundle);
}
-
+
protected DeploymentUnit getDeploymentUnit(Bundle bundle)
{
return getDelegate().getDeploymentUnit(bundle);
}
-
+
/**
* Get MainDeployerStructure from Delegate
*
@@ -198,7 +199,7 @@
protected AssembledDirectory createAssembledDirectory(String name) throws Exception
{
- return getDelegate().createAssembledDirectory(name, "");
+ return getDelegate().createAssembledDirectory(name, "");
}
protected AssembledDirectory createAssembledDirectory(String name, String rootName) throws Exception
@@ -215,17 +216,17 @@
{
getDelegate().addPath(dir, path, name);
}
-
+
protected void assertClassEquality(Class<?> expected, Class<?> actual)
{
- assertTrue("Should be the same " + ClassLoaderUtils.classToString(expected) +" and " + ClassLoaderUtils.classToString(actual), expected == actual);
+ assertTrue("Should be the same " + ClassLoaderUtils.classToString(expected) + " and " + ClassLoaderUtils.classToString(actual), expected == actual);
}
-
+
protected void assertNoClassEquality(Class<?> expected, Class<?> actual)
{
- assertTrue("Should NOT be the same " + ClassLoaderUtils.classToString(expected) +" and " + ClassLoaderUtils.classToString(actual), expected != actual);
+ assertTrue("Should NOT be the same " + ClassLoaderUtils.classToString(expected) + " and " + ClassLoaderUtils.classToString(actual), expected != actual);
}
-
+
protected void assertClassLoader(Class<?> clazz, Bundle expected)
{
if (expected == null)
@@ -235,22 +236,22 @@
boolean result = bundleClassLoader.equals(cl);
assertTrue(ClassLoaderUtils.classToString(clazz) + " should have expected classloader=" + expected, result);
}
-
+
protected ClassLoader getBundleClassLoader(Bundle expected)
{
return getDeploymentUnit(expected).getClassLoader();
}
-
+
protected Class<?> assertLoadClass(Bundle start, Class<?> reference) throws Exception
{
return assertLoadClass(start, reference, start);
}
-
+
protected Class<?> assertLoadClass(Bundle start, Class<?> reference, Bundle expected) throws Exception
{
return assertLoadClass(start, reference, expected, false);
}
-
+
protected Class<?> assertLoadClass(Bundle start, Class<?> reference, Bundle expected, boolean isReference) throws Exception
{
Class<?> result = assertLoadClass(reference.getName(), start, expected);
@@ -260,7 +261,7 @@
assertNoClassEquality(reference, result);
return result;
}
-
+
protected Class<?> assertLoadClass(String name, Bundle bundle, Bundle expected)
{
Class<?> result = null;
@@ -276,12 +277,12 @@
assertClassLoader(result, expected);
return result;
}
-
+
protected void assertLoadClassFail(Bundle start, Class<?> reference)
{
assertLoadClassFail(start, reference.getName());
}
-
+
protected void assertLoadClassFail(Bundle start, String name)
{
try
@@ -294,12 +295,12 @@
checkThrowable(ClassNotFoundException.class, expected);
}
}
-
+
protected URL getBundleResource(Bundle bundle, String path)
{
return getDelegate().getBundleResource(bundle, path);
}
-
+
protected Enumeration<URL> getBundleResources(Bundle bundle, String path) throws Exception
{
return getDelegate().getBundleResources(bundle, path);
@@ -319,7 +320,7 @@
getLog().debug(bundleContext + " got nothing for clazz=" + clazz + " filter=" + filter);
assertNull("Expected no references for clazz=" + clazz + " filter=" + filter, actual);
}
-
+
protected void assertAllReferences(BundleContext bundleContext, String clazz, ServiceReference... expected) throws Exception
{
assertAllReferences(bundleContext, clazz, null, expected);
@@ -349,7 +350,7 @@
getLog().debug(bundleContext + " got nothing for clazz=" + clazz + " filter=" + filter);
assertNull("Expected no references for clazz=" + clazz + " filter=" + filter, actual);
}
-
+
protected void assertReferences(BundleContext bundleContext, String clazz, ServiceReference... expected) throws Exception
{
assertReferences(bundleContext, clazz, null, expected);
@@ -390,23 +391,23 @@
Set<Bundle> expected = new HashSet<Bundle>();
for (Bundle bundle : bundles)
expected.add(bundle);
-
+
Set<Bundle> actual = new HashSet<Bundle>();
Bundle[] users = reference.getUsingBundles();
if (users != null)
- for (Bundle bundle : users)
- actual.add(bundle);
-
+ for (Bundle bundle : users)
+ actual.add(bundle);
+
getLog().debug(reference + " users=" + actual);
-
+
assertEquals(expected, actual);
}
-
+
protected void assertObjectClass(String expected, ServiceReference reference)
{
assertObjectClass(new String[] { expected }, reference);
}
-
+
protected void assertObjectClass(String[] expected, ServiceReference reference)
{
Object actual = reference.getProperty(Constants.OBJECTCLASS);
@@ -414,38 +415,44 @@
fail("no object class???");
if (actual instanceof String[] == false)
fail(actual + " is not a string array??? " + actual.getClass().getName());
- assertEquals(expected, (String[]) actual);
+ assertEquals(expected, (String[])actual);
}
public void frameworkEvent(FrameworkEvent event)
{
- getLog().debug("FrameworkEvent type=" + event.getType() + " for " + event);
- frameworkEvents.add(event);
+ synchronized (frameworkEvents)
+ {
+ getLog().debug("FrameworkEvent type=" + ConstantsHelper.frameworkEvent(event.getType()) + " for " + event);
+ frameworkEvents.add(event);
+ frameworkEvents.notifyAll();
+ }
}
-
+
protected void assertNoFrameworkEvent() throws Exception
{
+ waitForEvents(frameworkEvents);
getLog().debug("frameworkEvents=" + frameworkEvents);
assertEquals(0, frameworkEvents.size());
}
-
+
protected void assertFrameworkEvent(int type) throws Exception
{
assertFrameworkEvent(type, getSystemBundle(), null);
}
-
+
protected void assertFrameworkEvent(int type, Class<? extends Throwable> expectedThrowable) throws Exception
{
assertFrameworkEvent(type, getSystemBundle(), expectedThrowable);
}
-
+
protected void assertFrameworkEvent(int type, Bundle bundle, Class<? extends Throwable> expectedThrowable) throws Exception
{
+ waitForEvents(frameworkEvents);
getLog().debug("frameworkEvents=" + frameworkEvents);
int size = frameworkEvents.size();
assertTrue("" + size, size > 0);
FrameworkEvent event = frameworkEvents.remove(0);
- assertEquals(type, event.getType());
+ assertEquals(ConstantsHelper.frameworkEvent(type), ConstantsHelper.frameworkEvent(event.getType()));
Throwable t = event.getThrowable();
if (expectedThrowable == null)
{
@@ -466,47 +473,75 @@
public void bundleChanged(BundleEvent event)
{
- getLog().debug("BundleChanged type=" + event.getType() + " for " + event);
- bundleEvents.add(event);
+ synchronized (bundleEvents)
+ {
+ getLog().debug("BundleChanged type=" + ConstantsHelper.bundleEvent(event.getType()) + " for " + event);
+ bundleEvents.add(event);
+ bundleEvents.notifyAll();
+ }
}
-
+
protected void assertNoBundleEvent() throws Exception
{
+ waitForEvents(bundleEvents);
getLog().debug("bundleEvents=" + bundleEvents);
assertEquals(0, bundleEvents.size());
}
-
+
protected void assertBundleEvent(int type, Bundle bundle) throws Exception
{
+ waitForEvents(bundleEvents);
getLog().debug("bundleEvents=" + bundleEvents);
int size = bundleEvents.size();
assertTrue("" + size, size > 0);
BundleEvent event = bundleEvents.remove(0);
- assertEquals(type, event.getType());
+ assertEquals(ConstantsHelper.bundleEvent(type), ConstantsHelper.bundleEvent(event.getType()));
assertEquals(bundle, event.getSource());
assertEquals(bundle, event.getBundle());
}
public void serviceChanged(ServiceEvent event)
{
- getLog().debug("ServiceChanged type=" + event.getType() + " for " + event);
- serviceEvents.add(event);
+ synchronized (serviceEvents)
+ {
+ getLog().debug("ServiceChanged type=" + ConstantsHelper.serviceEvent(event.getType()) + " for " + event);
+ serviceEvents.add(event);
+ serviceEvents.notifyAll();
+ }
}
-
+
protected void assertNoServiceEvent() throws Exception
{
+ waitForEvents(serviceEvents);
getLog().debug("serviceEvents=" + serviceEvents);
assertEquals(0, serviceEvents.size());
}
-
+
protected void assertServiceEvent(int type, ServiceReference reference) throws Exception
{
+ waitForEvents(serviceEvents);
getLog().debug("serviceEvents=" + serviceEvents);
int size = serviceEvents.size();
assertTrue("" + size, size > 0);
ServiceEvent event = serviceEvents.remove(0);
- assertEquals(type, event.getType());
+ assertEquals(ConstantsHelper.serviceEvent(type), ConstantsHelper.serviceEvent(event.getType()));
assertEquals(reference, event.getSource());
assertEquals(reference, event.getServiceReference());
}
+
+ @SuppressWarnings("unchecked")
+ private void waitForEvents(List events) throws InterruptedException
+ {
+ int timeout = 50;
+ while (events.size() == 0 && 0 < timeout)
+ {
+ synchronized (events)
+ {
+ events.wait(100);
+ if (events.size() > 0)
+ break;
+ }
+ timeout--;
+ }
+ }
}
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java 2009-10-05 10:49:22 UTC (rev 94351)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java 2009-10-05 10:57:04 UTC (rev 94352)
@@ -43,6 +43,7 @@
*
* TODO test security
* @author <a href="adrian(a)jboss.com">Adrian Brock</a>
+ * @author Thomas.Diesler(a)jboss.com
* @version $Revision: 1.1 $
*/
public class BundleContextUnitTestCase extends OSGiTestCase
@@ -424,7 +425,9 @@
assertBundleEvent(BundleEvent.STOPPED, bundle);
}
else
+ {
assertNoBundleEvent();
+ }
bundle.start();
if (events)
@@ -433,7 +436,9 @@
assertBundleEvent(BundleEvent.STARTED, bundle);
}
else
+ {
assertNoBundleEvent();
+ }
return bundleContext;
}
16 years, 9 months
JBoss-OSGI SVN: r94345 - projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 04:10:03 -0400 (Mon, 05 Oct 2009)
New Revision: 94345
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Fix test report location
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-05 08:04:14 UTC (rev 94344)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-05 08:10:03 UTC (rev 94345)
@@ -37,7 +37,7 @@
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>osgitck/osgi.ct/generated/**/test-reports/TEST-*.xml</testResults>
+ <testResults>osgitck/target/r4v42-core-cmpn-final/*/generated/**/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
</publishers>
<buildWrappers/>
16 years, 9 months
JBoss-OSGI SVN: r94344 - projects/jboss-osgi/projects/osgitck/r4v42.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 04:04:14 -0400 (Mon, 05 Oct 2009)
New Revision: 94344
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
Log:
Restore jdk1.5 and MAven setup
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-10-05 08:00:08 UTC (rev 94343)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-10-05 08:04:14 UTC (rev 94344)
@@ -18,8 +18,13 @@
# Hudson Setup ----------------------------------------------------------------
# JDK settings
+java.home.jdk15=/usr/java/jdk1.5.0_19
java.home.jdk16=/usr/java/jdk1.6.0_14
+# Maven setup
+hudson.maven.name=apache-maven-2.2.1
+hudson.maven.path=/usr/java/apache-maven-2.2.1
+
# Hudson QA Environment
hudson.username=changeme
hudson.password=changeme
16 years, 9 months
JBoss-OSGI SVN: r94343 - in projects/jboss-osgi/projects/osgitck/r4v42: hudson/hudson-home/jobs/osgi.core.tests and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 04:00:08 -0400 (Mon, 05 Oct 2009)
New Revision: 94343
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/build.xml
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Add setup.ri
Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-10-05 07:48:06 UTC (rev 94342)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-10-05 08:00:08 UTC (rev 94343)
@@ -11,7 +11,7 @@
<!-- $Id: build.xml 93515 2009-09-15 07:18:21Z thomas.diesler(a)jboss.com $ -->
-<project default="setup">
+<project default="setup.jboss">
<property name="target.dir" value="${basedir}/target" />
@@ -58,8 +58,16 @@
<available property="osgitck.dir.available" file="${osgitck.dir}" />
</target>
- <target name="setup" depends="init,unzip-osgitck">
+ <!-- Setup the TCK to use the RI (equinox) -->
+ <target name="setup.ri" depends="init,unzip-osgitck">
+
+ <!-- Copy the aQute.bnd -->
+ <copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" />
+ </target>
+ <!-- Setup the TCK to use the JBoss OSGi Framework -->
+ <target name="setup.jboss" depends="init,unzip-osgitck">
+
<!-- Check if the osgitck dir is available -->
<fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" />
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-05 07:48:06 UTC (rev 94342)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-05 08:00:08 UTC (rev 94343)
@@ -28,7 +28,7 @@
cp ant.properties.example ant.properties
# Setup the TCK
-ant clean setup
+ant clean setup.jboss
# Run the core tests
ant tck-core-tests
16 years, 9 months
JBoss-OSGI SVN: r94342 - projects/jboss-osgi/projects/osgitck/r4v42.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 03:48:06 -0400 (Mon, 05 Oct 2009)
New Revision: 94342
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
Log:
Fix hudson properties
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-10-05 07:46:07 UTC (rev 94341)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-10-05 07:48:06 UTC (rev 94342)
@@ -4,10 +4,10 @@
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
# The location of the OSGi TCK
-osgitck.zip=/home/tdiesler/svn/r4v42-core-cmpn-final.zip
+osgitck.zip=/home/hudson/svn/osgitck/r4v42-core-cmpn-final.zip
# The location od the local maven repository
-maven.local.repository=/home/tdiesler/.m2/repository
+maven.local.repository=/home/hudson/.m2/repository
# The aQute Bnd version
aQute.bnd.version=0.0.366-SNAPSHOT
@@ -18,14 +18,13 @@
# Hudson Setup ----------------------------------------------------------------
# JDK settings
-java.home.jdk15=/usr/java/jdk1.5.0_19
java.home.jdk16=/usr/java/jdk1.6.0_14
# Hudson QA Environment
hudson.username=changeme
hudson.password=changeme
-hudson.root=/home/tdiesler/workspace/hudson/osgitck
+hudson.root=/home/hudson/workspace/hudson/osgitck
hudson.host=localhost
hudson.admin.port=8150
16 years, 9 months
JBoss-OSGI SVN: r94341 - in projects/jboss-osgi/projects/osgitck/r4v42/overlay: osgi.ri and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 03:46:07 -0400 (Mon, 05 Oct 2009)
New Revision: 94341
Added:
projects/jboss-osgi/projects/osgitck/r4v42/overlay/osgi.ri/
projects/jboss-osgi/projects/osgitck/r4v42/overlay/osgi.ri/osgi.core.impls.bnd
Log:
Overlay the the RI setup
Added: projects/jboss-osgi/projects/osgitck/r4v42/overlay/osgi.ri/osgi.core.impls.bnd
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/overlay/osgi.ri/osgi.core.impls.bnd (rev 0)
+++ projects/jboss-osgi/projects/osgitck/r4v42/overlay/osgi.ri/osgi.core.impls.bnd 2009-10-05 07:46:07 UTC (rev 94341)
@@ -0,0 +1,14 @@
+Bundle-Description : \
+ OSGi Service Platform Release ${version;=;${core.release.version}} Version ${version;==;${core.release.version}}, \
+ Core Reference Implementation.
+
+Bundle-Version : ${core.release.version}
+
+Include-Resource : \
+ \
+ ${repo;${osgi.vendor.framework}}, \
+ ${repo;osgi.core;${version;===;${core.release.version}}}, \
+ \
+ NOTICE=legal/NOTICE.txt, \
+ {about.html=legal/about.html}
+
16 years, 9 months
JBoss-OSGI SVN: r94340 - in projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs: aQute.bnd and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 03:30:15 -0400 (Mon, 05 Oct 2009)
New Revision: 94340
Added:
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/aQute.bnd/
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/aQute.bnd/config.xml
Log:
Add aQute.bnd job
Added: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/aQute.bnd/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/aQute.bnd/config.xml (rev 0)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/aQute.bnd/config.xml 2009-10-05 07:30:15 UTC (rev 94340)
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <actions/>
+ <description>Build and test the aQute Bnd tool</description>
+ <logRotator>
+ <daysToKeep>60</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/aQute/trunk</remote>
+ <local>aQute.bnd</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossOSGi/</url>
+ <rootModule></rootModule>
+ </browser>
+ <excludedRegions></excludedRegions>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <jdk>jdk1.6</jdk>
+ <triggers class="vector"/>
+ <builders>
+ <hudson.tasks.Maven>
+ <targets>-U clean install</targets>
+ </hudson.tasks.Maven>
+ </builders>
+ <publishers>
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>aQute.bnd/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ </publishers>
+ <buildWrappers/>
+</project>
16 years, 9 months
JBoss-OSGI SVN: r94339 - in projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs: jboss.osgi.framework and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 03:27:48 -0400 (Mon, 05 Oct 2009)
New Revision: 94339
Added:
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/config.xml
Log:
Add jboss-osgi-framework job
Added: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/config.xml (rev 0)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/config.xml 2009-10-05 07:27:48 UTC (rev 94339)
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <actions/>
+ <description>Build and test the Microcontainer based OSGi Framework</description>
+ <logRotator>
+ <daysToKeep>60</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...</remote>
+ <local>jboss-osgi-framework</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossOSGi/</url>
+ <rootModule></rootModule>
+ </browser>
+ <excludedRegions></excludedRegions>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <jdk>jdk1.6</jdk>
+ <builders>
+ <hudson.tasks.Maven>
+ <targets>-U clean install</targets>
+ </hudson.tasks.Maven>
+ </builders>
+ <publishers>
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jboss-osgi-framework/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
16 years, 9 months