[jboss-cvs] JBossAS SVN: r94010 - in projects/jboss-osgi: trunk and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-09-24 20:57:26 -0400 (Thu, 24 Sep 2009)
New Revision: 94010

Modified:
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
Log:
[JBCL-116] Potential deadlock in ClassLoaderManager

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml	2009-09-24 21:15:53 UTC (rev 94009)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml	2009-09-25 00:57:26 UTC (rev 94010)
@@ -40,7 +40,7 @@
     <version.apache.felix.log>1.0.0</version.apache.felix.log>
     <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
     <version.jboss.aop>2.1.0.CR3</version.jboss.aop>
-    <version.jboss.classloading>2.0.7.CR1</version.jboss.classloading>
+    <version.jboss.classloading>2.0.7-SNAPSHOT</version.jboss.classloading>
     <version.jboss.deployers>2.0.8.GA</version.jboss.deployers>
     <version.jboss.logging.log4j>2.1.0.GA</version.jboss.logging.log4j>
     <version.jboss.osgi.apache.xerces>2.9.1.SP2</version.jboss.osgi.apache.xerces>

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-09-24 21:15:53 UTC (rev 94009)
+++ projects/jboss-osgi/trunk/pom.xml	2009-09-25 00:57:26 UTC (rev 94010)
@@ -57,7 +57,7 @@
     <version.jboss.osgi.runtime.equinox>3.5</version.jboss.osgi.runtime.equinox>
     <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
     <version.jboss.osgi.runtime.jbossas>1.0.1</version.jboss.osgi.runtime.jbossas>
-    <version.jboss.osgi.runtime.jbossmc>1.0.0.Beta3-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
+    <version.jboss.osgi.runtime.jbossmc>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
     <version.jboss.osgi.spi>1.0.1</version.jboss.osgi.spi>
     <version.jboss.osgi.webconsole>1.0.1</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java	2009-09-24 21:15:53 UTC (rev 94009)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java	2009-09-25 00:57:26 UTC (rev 94010)
@@ -25,6 +25,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 import java.io.BufferedReader;
@@ -66,12 +67,13 @@
          Thread.sleep(200);
          sref = runtime.getServiceReference(HttpService.class.getName());
       }
-      
+
       if (sref == null && new OSGiTestHelper().isFrameworkJBossMC())
       {
-         System.out.println("FIXME [JBCL-116] Potential deadlock in ClassLoaderManager");
-         httpServiceAvailable = false;
-         return;
+         fail("FIXME [JBCL-116] Potential deadlock in ClassLoaderManager");
+         //System.out.println("FIXME [JBCL-116] Potential deadlock in ClassLoaderManager");
+         //httpServiceAvailable = false;
+         //return;
       }
 
       assertNotNull("HttpService not null", sref);
@@ -91,7 +93,7 @@
    public void testServletAccess() throws Exception
    {
       assumeTrue(httpServiceAvailable);
-      
+
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/servlet?test=plain");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("Hello from Servlet", br.readLine());
@@ -101,7 +103,7 @@
    public void testServletInitProps() throws Exception
    {
       assumeTrue(httpServiceAvailable);
-      
+
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/servlet?test=initProp");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("initProp=SomeValue", br.readLine());
@@ -111,7 +113,7 @@
    public void testServletBundleContext() throws Exception
    {
       assumeTrue(httpServiceAvailable);
-      
+
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/servlet?test=context");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("example-http", br.readLine());
@@ -121,7 +123,7 @@
    public void testServletStartLevel() throws Exception
    {
       assumeTrue(httpServiceAvailable);
-      
+
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/servlet?test=startLevel");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("startLevel=1", br.readLine());
@@ -131,7 +133,7 @@
    public void testResourceAccess() throws Exception
    {
       assumeTrue(httpServiceAvailable);
-      
+
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/file/message.txt");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("Hello from Resource", br.readLine());