Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java
===================================================================
RCS file: /usr/local/cvsroot/TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java,v
diff -u -r1.2 -r1.3
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java	17 Sep 2006 06:09:25 -0000	1.2
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java	13 Jan 2014 08:47:10 -0000	1.3
@@ -29,47 +29,40 @@
 import com.meterware.httpunit.HttpUnitOptions;
 
 /**
- * @version
- *
- * <p>
- * <a href="Main.java.html"><i>View Source</i></a>
- * </p>
- *
- * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
- *
+ * @author Fei Yang, Marcin Cieslak
+ * 
  */
 public class Main {
 
-	static {
-		// configure log4j
-		PropertyConfigurator.configure("log.properties");
-		// configure HttpUnit
-		// stops the unsupported javascript stuff from throwing an exception
-		HttpUnitOptions.setExceptionsThrownOnScriptError(false);
-		//WebClient.getResponse does not throw an exception when it receives an error status.
-		HttpUnitOptions.setExceptionsThrownOnErrorStatus(false);
-	}
+    private static final Logger log = Logger.getLogger(Main.class);
+    
+    static {
+	// configure log4j
+	PropertyConfigurator.configure("log.properties");
+	// configure HttpUnit
+	// stops the unsupported javascript stuff from throwing an exception
+	HttpUnitOptions.setExceptionsThrownOnScriptError(false);
+	// WebClient.getResponse does not throw an exception when it receives an error status.
+	HttpUnitOptions.setExceptionsThrownOnErrorStatus(false);
+    }
 
-	private static final Logger log = Logger.getLogger(Main.class);
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		log.info("Starting...");
-		if (args.length == 0) {
-			log.error("No argument supplied! Please refer to readme.txt");
-			System.exit(1);
-		}
-		// create test manager and hand over the control to him.
-		AbstractTestManager manager = new PropertyFileTestManager(args[0]);
-		try{
-			manager.kickOff();
-			TestReporter.generateReport(manager);
-			log.info("It's done, anyway");
-		}catch(Exception e){
-			log.error(e.getMessage(),e);
-			System.exit(1);
-		}
+    public static void main(String[] args) {
+	Main.log.info("Starting...");
+	if (args.length == 0) {
+	    Main.log.error("No argument supplied! Please refer to readme.txt");
+	    System.exit(1);
 	}
-}
+	
+	// create test manager and hand over the control to him.
+	TestManager manager = new TestManager(args[0]);
+	try {
+	    manager.start();
+	    TestReporter.generateReportLog(manager);
+	    TestReporter.generateReportFile(manager);
+	    Main.log.info("Test suite finished");
+	} catch (Exception e) {
+	    Main.log.error("Error in tests", e);
+	    System.exit(1);
+	}
+    }
+}
\ No newline at end of file