svn commit: r812700 - /incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java

[sh...@apache.org]

Author: sheetal
Date: Tue Sep  8 21:28:05 2009
New Revision: 812700

URL: http://svn.apache.org/viewvc?rev=812700&view=rev
Log:
OLIO#84 modified php-driver to use annotations

Modified:
    incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java

Modified: incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java?rev=812700&r1=812699&r2=812700&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java (original)
+++ incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java Tue Sep  8 21:28:05 2009
@@ -22,13 +22,9 @@
 
 import com.sun.faban.common.Command;
 import com.sun.faban.common.CommandHandle;
-import com.sun.faban.common.NameValuePair;
-import com.sun.faban.harness.DefaultFabanBenchmark;
-import com.sun.faban.harness.RunContext;
-import com.sun.faban.harness.engine.*;
+import com.sun.faban.harness.DefaultFabanBenchmark2;
+import com.sun.faban.harness.PreRun;
 
-import java.io.File;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.logging.Logger;
 
@@ -43,7 +39,7 @@
  *
  * @author Akara Sucharitakul
  */
-public class OlioBenchmark extends DefaultFabanBenchmark {
+public class OlioBenchmark extends DefaultFabanBenchmark2 {
     
     static Logger logger = Logger.getLogger(
                                         OlioBenchmark.class.getName());
@@ -56,7 +52,7 @@
      *
      * @throws Exception If configuration was not successful
      */
-    public void configure() throws Exception {
+    @PreRun public void prerun() throws Exception {
         
         params = getParamRepository();
 
@@ -136,22 +132,5 @@
         this.totalRunningTimeInSecs = Integer.parseInt(rampUp) +
                 Integer.parseInt(steadyState) + Integer.parseInt(rampDown);
 
-        super.configure();
-    }
-
-    /* override DefaultBenchmark's end method to collect webserver log file
-     * via the OlioBenchmark harness class
-     */
-    public void end () throws Exception {
-     
-        super.end();
-        
-    }
-
-    /* Override DefaultBenchmark's kill method to stop the servers.
-     */
-    public void kill() throws Exception {
-       
-        super.kill();
     }
 }