[jboss-svn-commits] JBL Code SVN: r24024 - in labs/jbossesb/workspace/skeagh: api/src/main/java/org/jboss/esb/api/bus and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 21 03:04:14 EST 2008
Author: tfennelly
Date: 2008-11-21 03:04:13 -0500 (Fri, 21 Nov 2008)
New Revision: 24024
Added:
labs/jbossesb/workspace/skeagh/api/src/main/java/org/jboss/esb/api/bus/
labs/jbossesb/workspace/skeagh/api/src/main/java/org/jboss/esb/api/bus/package.html
Modified:
labs/jbossesb/workspace/skeagh/examples/jms-router/esb-jms-router/
labs/jbossesb/workspace/skeagh/examples/jms-router/jms-consumer/
labs/jbossesb/workspace/skeagh/examples/jms-router/jms-provider/
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/Bus.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java
Log:
https://jira.jboss.org/jira/browse/JBESB-2182
Added: labs/jbossesb/workspace/skeagh/api/src/main/java/org/jboss/esb/api/bus/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/src/main/java/org/jboss/esb/api/bus/package.html (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/src/main/java/org/jboss/esb/api/bus/package.html 2008-11-21 08:04:13 UTC (rev 24024)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+JBoss ESB Bus API.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file
Property changes on: labs/jbossesb/workspace/skeagh/examples/jms-router/esb-jms-router
___________________________________________________________________
Name: svn:ignore
+ jbossesb-examples-jms-router-esb-jms-router.iml
Property changes on: labs/jbossesb/workspace/skeagh/examples/jms-router/jms-consumer
___________________________________________________________________
Name: svn:ignore
+ jbossesb-examples-jms-router-consumer.iml
Property changes on: labs/jbossesb/workspace/skeagh/examples/jms-router/jms-provider
___________________________________________________________________
Name: svn:ignore
+ jbossesb-examples-jms-router-provider.iml
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java 2008-11-21 07:56:21 UTC (rev 24023)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java 2008-11-21 08:04:13 UTC (rev 24024)
@@ -111,7 +111,14 @@
{
Bus bus = BusFactory.newInstance(busProtocol, busClassName, runtime);
- bus.connect();
+ try
+ {
+ bus.connect();
+ }
+ catch (RoutingException e)
+ {
+ throw new DeploymentException("Unable to start Bus Interface. Failed to connect bus '" + bus.getClass().getName() + "'.", e);
+ }
if (bus.isConnected())
{
try
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/Bus.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/Bus.java 2008-11-21 07:56:21 UTC (rev 24023)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/Bus.java 2008-11-21 08:04:13 UTC (rev 24024)
@@ -62,7 +62,7 @@
*
* @throws DeploymentException Connection exception.
*/
- void connect() throws DeploymentException;
+ void connect() throws RoutingException;
/**
* Is the bus connected.
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-11-21 07:56:21 UTC (rev 24023)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java 2008-11-21 08:04:13 UTC (rev 24024)
@@ -150,9 +150,9 @@
/**
* Connect the bus.
*
- * @throws DeploymentException Connection exception.
+ * @throws RoutingException Connection exception.
*/
- public final void connect() throws DeploymentException
+ public final void connect() throws RoutingException
{
if (deploymentName == null)
{
@@ -177,8 +177,14 @@
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try
{
- //Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- connectJMSSessions(properties);
+ try
+ {
+ connectJMSSessions(properties);
+ }
+ catch (DeploymentException e)
+ {
+ throw new RoutingException("Unable to connect JMS Bus interface for deployment '" + deploymentName + "'.", e);
+ }
if (topicSession != null && queueSession != null)
{
@@ -197,16 +203,16 @@
{
if (!logger.isDebugEnabled())
{
- logger.info("Deployment '" + deploymentName + "' is not being coordinated with any other local deployment. Turn on deug logging for more details.");
+ logger.info("Deployment '" + deploymentName + "' is not being coordinated with any other deployment. Turn on deug logging for more details.");
}
else
{
- logger.debug("Deployment '" + deploymentName + "' is not being coordinated with any other local deployment.", e);
+ logger.debug("Deployment '" + deploymentName + "' is not being coordinated with any other deployment.", e);
}
}
else
{
- throw e;
+ throw new RoutingException("Unable to connect JMS Bus interface for deployment '" + deploymentName + "'.", e);
}
}
finally
@@ -217,7 +223,7 @@
catch (Throwable t)
{
closeJMSSessions();
- throw new DeploymentException("Failed to connect coordination listener", t);
+ throw new RoutingException("Unable to connect JMS Bus interface for deployment '" + deploymentName + "'.", t);
}
}
}
@@ -466,7 +472,7 @@
catch (Throwable t)
{
closeJMSSessions();
- // OK... this is an error... we were able to connect to the topc, but not the queue???
+ // OK... this is an error... we were able to connect to the topic, but not the queue???
throw new DeploymentException("Failed to connect shared deployment JMS Queue Session.", t);
}
}
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java 2008-11-21 07:56:21 UTC (rev 24023)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java 2008-11-21 08:04:13 UTC (rev 24024)
@@ -199,7 +199,14 @@
busInterface1.setDeploymentName(name);
busInterface1.setDeploymentId(name); // using the name as the ID for testing
busInterface1.setProperties(properties);
- busInterface1.connect();
+ try
+ {
+ busInterface1.connect();
+ }
+ catch (org.jboss.esb.api.routing.RoutingException e)
+ {
+ e.printStackTrace();
+ }
Thread.sleep(500);
More information about the jboss-svn-commits
mailing list