[jboss-svn-commits] JBL Code SVN: r10264 - in labs/jbossesb/trunk/product/core: listeners/src/org/jboss/soa/esb/listeners/lifecycle and 1 other directories.

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

Author: bill.burke at jboss.com
Date: 2007-03-16 11:08:52 -0400 (Fri, 16 Mar 2007)
New Revision: 10264

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/AbstractThreadedManagedLifecycle.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
Log:
* removed classloader property in AbstractThreadedManagedLifecycle and ManagedLIfecycleController
* Fix the datasource test.  DIdn't like Thread.currentTHread().getContextClassLoader().  Moved it back to Class.forName()

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2007-03-16 14:21:29 UTC (rev 10263)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2007-03-16 15:08:52 UTC (rev 10264)
@@ -66,21 +66,38 @@
    @Override
    public void createService()
    {
-      controller = Configuration.create(jbossEsbXml);
-      controller.setClassloader(classloader);
    }
 
    @Override
    public void startService() throws Exception
    {
-      controller.start();
+      ClassLoader old = Thread.currentThread().getContextClassLoader();
+      try
+      {
+         Thread.currentThread().setContextClassLoader(classloader);
+         controller = Configuration.create(jbossEsbXml);
+         controller.start();
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(old);
+      }
 
    }
 
    @Override
    public void stopService() throws Exception
    {
-      controller.stop();
+      ClassLoader old = Thread.currentThread().getContextClassLoader();
+      try
+      {
+         Thread.currentThread().setContextClassLoader(classloader);
+         controller.stop();
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(old);
+      }
    }
 
 }

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/AbstractThreadedManagedLifecycle.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/AbstractThreadedManagedLifecycle.java	2007-03-16 14:21:29 UTC (rev 10263)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/AbstractThreadedManagedLifecycle.java	2007-03-16 15:08:52 UTC (rev 10264)
@@ -66,9 +66,7 @@
     */
    private Set<ManagedLifecycleThreadEventListener> listeners = new CopyOnWriteArraySet<ManagedLifecycleThreadEventListener>();
 
-   private transient ClassLoader classloader;
 
-
    /**
     * Construct the threaded managed lifecycle.
     *
@@ -82,16 +80,6 @@
    }
 
 
-   public ClassLoader getClassloader()
-   {
-      return classloader;
-   }
-
-   public void setClassloader(ClassLoader classloader)
-   {
-      this.classloader = classloader;
-   }
-
    /**
     * Handle the start of the managed instance.
     *
@@ -126,10 +114,6 @@
       waitUntilNotState(ManagedLifecycleState.STARTING, getTerminationPeriod());
       try
       {
-         if (classloader != null)
-         {
-            Thread.currentThread().setContextClassLoader(classloader);
-         }
          changeState(ManagedLifecycleState.RUNNING);
          doRun();
       }

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java	2007-03-16 14:21:29 UTC (rev 10263)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java	2007-03-16 15:08:52 UTC (rev 10264)
@@ -115,10 +115,6 @@
          final ManagedLifecycle instance = instances[count];
          try
          {
-            if (instance instanceof AbstractThreadedManagedLifecycle)
-            {
-               ((AbstractThreadedManagedLifecycle)instance).setClassloader(classloader);
-            }
             instance.initialise();
          }
          catch (final ManagedLifecycleException mle)

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java	2007-03-16 14:21:29 UTC (rev 10263)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java	2007-03-16 15:08:52 UTC (rev 10264)
@@ -113,8 +113,9 @@
 	{
 		try
 		{
-			Thread.currentThread().getContextClassLoader().loadClass(p_sDriver);
-			m_sUrl = p_sDbURL;
+			//Thread.currentThread().getContextClassLoader().loadClass(p_sDriver);
+         Class.forName(p_sDriver);
+         m_sUrl = p_sDbURL;
 			getConnection(p_sUsr, p_sPwd);
 		}
 		catch (ClassNotFoundException ex)