[jboss-svn-commits] JBL Code SVN: r7484 - labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util

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

Author: daniel.brum at jboss.com
Date: 2006-11-08 15:36:53 -0500 (Wed, 08 Nov 2006)
New Revision: 7484

Modified:
   labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/Launcher.java
Log:


Modified: labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/Launcher.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/Launcher.java	2006-11-08 20:32:53 UTC (rev 7483)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/Launcher.java	2006-11-08 20:36:53 UTC (rev 7484)
@@ -5,6 +5,7 @@
 import java.sql.Statement;
 
 import org.apache.log4j.Logger;
+import org.apache.log4j.xml.DOMConfigurator;
 import org.jboss.internal.soa.esb.persistence.format.db.DBConnectionManager;
 import org.jboss.soa.esb.common.Configuration;
 import org.jboss.soa.esb.listeners.gateway.GatewayListenerController;
@@ -21,7 +22,12 @@
 	private Logger _logger = Logger.getLogger(Launcher.class);
 	
 	public static void main (String args[]) throws Exception {
-				
+		
+		System.out.println("args passed into Launcher: " + args.length);
+		for (int x=0; x<args.length; x++)
+			System.out.println("arg[" + x + "]=" + args[x]);
+		
+		
 		Launcher launcher = new Launcher();
 		if(args.length > 2)
 			launcher.triggerListener(Long.valueOf(args[0]).longValue(), args[1], args[2]);
@@ -50,19 +56,26 @@
     			Thread.sleep(4000);
     		}
 
+    		_logger.info("going to sleep now for " + runTime + " milliseconds...");    		
     		Thread.sleep(runTime);
-    		if (null != messageAwareConfigFile)
+    		if (null != messageAwareConfigFile) {
+    			_logger.info("shutting down message aware listener...");
     			_esbListController.requestEnd();
+    		}
     		
-    		if (null != gatewayConfigFile)
-    			_gatewayController.requestEnd();    		
+    		if (null != gatewayConfigFile) {
+    			_logger.info("shutting down gateway listener...");
+    			_gatewayController.requestEnd();
+    		}
     		    	
         }
         catch (Exception e) { 
         	_logger.error(e);
         	throw(e);
         }
-        finally { Launcher.runAfterAllTests(); }
+        finally { 
+        	Launcher.runAfterAllTests(); 
+        	}
 	
 
 	}
@@ -81,14 +94,16 @@
 //		
 //	}
 	
-protected static void runBeforeAllTests() throws Exception{
-	TestEnvironmentUtil.setESBPropertiesFileToUse();
-							
+protected static void runBeforeAllTests() throws Exception{	
+//	System.setProperty("com.arjuna.common.util.propertyservice.verbosePropertyManager", "on");
+	DOMConfigurator.configure("log4j.xml");
 	if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
-		HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir() + "build/hsqltestdb", "jbossesb");
+//		HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir() + "build/hsqltestdb", "jbossesb");
+		HsqldbUtil.startHsqldb("../../../build/hsqltestdb", "jbossesb");
 		//Get the registry-schema create scripts
 		String database = "hsqldb";
-		String sqlDir = TestEnvironmentUtil.getUserDir() + "install/message-store/sql/" + database + "/";
+//		String sqlDir = TestEnvironmentUtil.getUserDir() + "install/message-store/sql/" + database + "/";
+		String sqlDir = "../../../install/message-store/sql/" + database + "/";
 		//Drop what is there now, if exists. We want to start fresh.				
 		String sqlCreateCmd    = TestEnvironmentUtil.readTextFile(new File(sqlDir + "create_database.sql"));
 		String sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(sqlDir + "drop_database.sql"));