[jboss-svn-commits] JBL Code SVN: r23464 - in labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb: federate/bus/jms and 1 other directory.

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

Author: tfennelly
Date: 2008-10-15 14:14:17 -0400 (Wed, 15 Oct 2008)
New Revision: 23464

Modified:
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DefaultResourceLocator.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java
Log:
Fixes to get the tests passing again

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DefaultResourceLocator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DefaultResourceLocator.java	2008-10-15 17:01:59 UTC (rev 23463)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DefaultResourceLocator.java	2008-10-15 18:14:17 UTC (rev 23464)
@@ -23,10 +23,7 @@
 import org.jboss.esb.classpath.ClassUtil;
 import org.jboss.esb.context.ResourceLocator;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
 
 
 /**
@@ -40,11 +37,6 @@
 public class DefaultResourceLocator implements ResourceLocator
 {
     /**
-     * Default ClassLoader.
-     */
-    private ClassLoader classLoader = new DefaultClassLoader(getClass().getClassLoader());
-
-    /**
      * Simply delegates to {@link org.jboss.esb.classpath.ClassUtil#forName(String, Class)} and passes this
      * classes class as the second argument.
      *
@@ -91,34 +83,7 @@
      */
     public final ClassLoader getClassLoader()
     {
-        return classLoader;
+        return null;
     }
 
-    /**
-     * Default ClassLoader.
-     * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
-     */
-    public class DefaultClassLoader extends ClassLoader
-    {
-        public DefaultClassLoader(final ClassLoader parent)
-        {
-            super(parent);
-        }
-
-        protected Class<?> findClass(String name) throws ClassNotFoundException
-        {
-            return ClassUtil.forName(name, getClass());
-        }
-
-        protected URL findResource(String name)
-        {
-            return ClassUtil.getResource(name, getClass());
-        }
-
-        protected Enumeration<URL> findResources(String name) throws IOException
-        {
-            return ClassUtil.getResources(name, getClass());
-        }
-    }
-
 }

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-10-15 17:01:59 UTC (rev 23463)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-10-15 18:14:17 UTC (rev 23464)
@@ -265,7 +265,14 @@
      */
     public static ResourceLocator getResourceLocator(final DeploymentContext deploymentContext)
     {
-        return (ResourceLocator) deploymentContext.getContextObject(ResourceLocator.class);
+        if(deploymentContext != null)
+        {
+            return (ResourceLocator) deploymentContext.getContextObject(ResourceLocator.class);
+        }
+        else
+        {
+            return null;
+        }
     }
 
     /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java	2008-10-15 17:01:59 UTC (rev 23463)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java	2008-10-15 18:14:17 UTC (rev 23464)
@@ -447,14 +447,17 @@
      *
      * @param localBusProperties Local JMS Bus properties.
      */
-    private void connectJMSSessions(final ApplicationProperties localBusProperties)
+    private void connectJMSSessions(final ApplicationProperties localBusProperties) throws DeploymentException
     {
         ResourceLocator resourceLocator = DeploymentRuntime.getResourceLocator(DeploymentContext.getContext());
 
         topicSession = new JMSSession(JMSSession.Type.TOPIC, localBusProperties);
-        topicSession.setClassLoader(resourceLocator.getClassLoader());
         try
         {
+            if(resourceLocator != null)
+            {
+                topicSession.setClassLoader(resourceLocator.getClassLoader());
+            }
             topicSession.connect();
         }
         catch (Throwable t)
@@ -463,16 +466,20 @@
             logger.debug("Failed to connect shared deployment JMS Topic Session.", t);
             return;
         }
-        queueSession = new JMSSession(JMSSession.Type.QUEUE, localBusProperties);
-        queueSession.setClassLoader(resourceLocator.getClassLoader());
         try
         {
+            queueSession = new JMSSession(JMSSession.Type.QUEUE, localBusProperties);
+            if(resourceLocator != null)
+            {
+                queueSession.setClassLoader(resourceLocator.getClassLoader());
+            }
             queueSession.connect();
         }
         catch (Throwable t)
         {
             closeJMSSessions();
-            logger.debug("Failed to connect shared deployment JMS Queue Session.", t);
+            // OK... this is an error... we were able to connect to the topc, but not the queue???
+            throw new DeploymentException("Failed to connect shared deployment JMS Queue Session.", t);
         }
     }