[jboss-svn-commits] JBL Code SVN: r7300 - labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util

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

Author: jokum
Date: 2006-11-01 18:07:46 -0500 (Wed, 01 Nov 2006)
New Revision: 7300

Modified:
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/ListenerUtils.java
Log:
Refactored

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/ListenerUtils.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/ListenerUtils.java	2006-11-01 23:04:12 UTC (rev 7299)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/ListenerUtils.java	2006-11-01 23:07:46 UTC (rev 7300)
@@ -30,7 +30,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.internal.soa.esb.command.JmsCommandQueue;
 import org.jboss.internal.soa.esb.parameters.ParamFileRepository;
-import org.jboss.soa.esb.listeners.old.GpListener;
+import org.jboss.soa.esb.listeners.message.EsbListenerController;
 import org.jboss.soa.esb.parameters.ParamRepositoryException;
 import org.jboss.soa.esb.parameters.ParamRepositoryFactory;
 
@@ -57,9 +57,9 @@
 		
 		logger.info("Waiting on Listener Manager the start...");
 		manager.start();
-		while(manager.listenersManager.getState() != GpListener.State.Running) {
+		while(manager.listenersManager.getState() != EsbListenerController.State.Running) {
 			Thread.sleep(50);
-			if(manager.listenersManager.getState() == GpListener.State.Exception_thrown) {
+			if(manager.listenersManager.getState() == EsbListenerController.State.Exception_thrown) {
 				Exception e = manager.listenersManager.getState().getException();
 				logger.error("Failed to start the Listener Manager!", e);
 				TestCase.fail(e.getMessage());
@@ -78,10 +78,10 @@
 	 * @param paramName Config classpath.
 	 * @return The {@link GpListener} instance.
 	 */
-	public static GpListener createGpListener(String paramName) throws Exception {		
-		fixUpConfig(paramName);
-		GpListener.setDefaultCommandQueue(new JmsCommandQueue());
-		return new GpListener(paramName + CONFIG_TMP_EXT);
+	public static EsbListenerController createGpListener(String paramName) throws Exception {		
+		//fixUpConfig(paramName);
+		EsbListenerController.setDefaultCommandQueue(new JmsCommandQueue());
+		return new EsbListenerController(paramName);
 	}
 	
 	/**
@@ -123,9 +123,9 @@
 	 */
 	public static class ListenersManagerExecThread extends Thread {
 		
-		private GpListener listenersManager;
+		private EsbListenerController listenersManager;
 
-		private ListenersManagerExecThread(GpListener listenersManager) {
+		private ListenersManagerExecThread(EsbListenerController listenersManager) {
 			super(listenersManager);
 			this.listenersManager = listenersManager;
 		}
@@ -134,7 +134,7 @@
 		 * Get the {@link GpListener} Listeners Manager class executing in this thread.
 		 * @return The listenersManager property value.
 		 */
-		public GpListener getListenersManager() {
+		public EsbListenerController getListenersManager() {
 			return listenersManager;
 		}
 
@@ -142,7 +142,7 @@
 		 * Assert that the listener Manager is in an Exception state..
 		 */
 		public void asserttInException() {
-			if(listenersManager.getState() != GpListener.State.Exception_thrown) {
+			if(listenersManager.getState() != EsbListenerController.State.Exception_thrown) {
 				String errorMsg = "ListenerManager not in Exception state.  Listener Manager Thread: " + this.getName();
 				logger.error(errorMsg);
 				TestCase.fail(errorMsg);
@@ -153,7 +153,7 @@
 		 * Assert that the listener Manager is not in an Exception state..
 		 */
 		public void assertNotInException() {
-			if(listenersManager.getState() == GpListener.State.Exception_thrown) {
+			if(listenersManager.getState() == EsbListenerController.State.Exception_thrown) {
 				String errorMsg = "ListenerManager in Exception state.  See log.  Listener Manager Thread: " + this.getName();
 				logger.error(errorMsg, listenersManager.getState().getException());
 				TestCase.fail(errorMsg);
@@ -168,7 +168,7 @@
 			long endTime = System.currentTimeMillis() + maxWait;
 			
 			while(System.currentTimeMillis() < endTime) {
-				if(listenersManager.getState() == GpListener.State.Done_OK) {
+				if(listenersManager.getState() == EsbListenerController.State.Done_OK) {
 					logger.info("Shutdown was successful.  Listener Manager Thread: " + this.getName());
 					return;
 				}