[jboss-svn-commits] JBL Code SVN: r9136 - in labs/jbossesb/trunk/product/install/tomcat: war/WEB-INF/classes/org/jboss/soa/esb/servlet and 1 other directory.

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

Author: kurt.stam at jboss.com
Date: 2007-01-30 08:26:01 -0500 (Tue, 30 Jan 2007)
New Revision: 9136

Modified:
   labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigControllerService.java
   labs/jbossesb/trunk/product/install/tomcat/war/WEB-INF/classes/org/jboss/soa/esb/servlet/ConfigControllerService.class
Log:
Removing the startup of the listener and gatewayController. This is now done by the Configuration Controller.

Modified: labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigControllerService.java
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigControllerService.java	2007-01-30 13:25:29 UTC (rev 9135)
+++ labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigControllerService.java	2007-01-30 13:26:01 UTC (rev 9136)
@@ -30,10 +30,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.xml.DOMConfigurator;
 import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.listeners.ListenerManager;
-import org.jboss.soa.esb.listeners.ListenerUtil;
 import org.jboss.soa.esb.listeners.config.ConfigurationController;
-import org.jboss.soa.esb.listeners.gateway.GatewayListenerController;
 
 /**
  * @author Kurt Stam (kurt.stam at redhat.com)
@@ -54,7 +51,7 @@
             super.init();
             log.info("Hello ConfigController");
             log.info("starting message configuration controller with config file " + configurationFile);
-            String confDir = "file:";
+            String confDir = "";
             
             if (System.getProperty("catalina.home")!=null) {
                 String url = System.getProperty("catalina.home") + "/conf/";
@@ -72,9 +69,9 @@
             File propertiesFile = new File(confDir + "jbossesb-properties.xml");
             System.setProperty("org.jboss.soa.esb.propertyFile", "abs://" + propertiesFile.getAbsolutePath());
             log.info("Reading jbossesb-properties.xml from: " +  propertiesFile.getAbsolutePath());
-            String className = Configuration.getRegistryImplementationClass();
-            log.info("Registry class is: " + className);
-            log.info(Configuration.dump());
+            if (log.isDebugEnabled()) {
+                log.debug(Configuration.dump());
+            }
             
             String configFile = confDir + configurationFile;
             System.setProperty("juddi.propertiesFile", confDir + "juddi.properties");
@@ -83,15 +80,7 @@
             log.info("Starting Config Controller: " + configFile);
             ConfigurationController configurationController = new ConfigurationController(configFile,null);
             new Thread(configurationController).start();
-        
-            log.info("Starting Listener Controller: " + confDir + "jbossesb-listener.xml");
-            ListenerManager listenerManager = ListenerUtil.launchManager(confDir + "jbossesb-listener.xml", true) ;
-            listenerManager.waitUntilReady() ;
             
-            log.info("Starting Gateway Controller: " + confDir + "jbossesb-gateway.xml");
-            GatewayListenerController gatewayListController = new GatewayListenerController(confDir + "jbossesb-gateway.xml");
-            new Thread(gatewayListController).start();
-            
         } catch (Exception e) {
             e.printStackTrace();
         }

Modified: labs/jbossesb/trunk/product/install/tomcat/war/WEB-INF/classes/org/jboss/soa/esb/servlet/ConfigControllerService.class
===================================================================
(Binary files differ)