Add liscense to file headers

JIRA: BOTTLENECK-133

Some Yaml, XML and __init__.py file do not have liscense headers.
This patch is to add headers to those files or delete those are deprecated.

Change-Id: Ie059b1f1879eb420eec171f96985247510c74642
Signed-off-by: yuyang <Gabriel.yuyang@huawei.com>

5 files changed, 0 insertions, 780 deletions

diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml
deleted file mode 100644
index 07a64362..00000000
--- a/testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0"?>
-
-<xtbl name="RubbosBenchmark" version="0.1">
-
-
-<instances>
-  <params>
-    <env>
-      <!-- Experiment name on Emulab -->
-      <param name="EMULAB_EXPERIMENT_NAME" value="hanwei.infosphere.emulab.net"/>
-
-      <!-- Directories from which files are copied -->
-	  <param name="WORK_HOME" value="/bottlenecks/rubbos/rubbos_scripts/rubbosMulini6"/>
-	  <param name="OUTPUT_HOME" value="/bottlenecks/rubbos/rubbos_scripts/1-1-1"/>
-      <param name="SOFTWARE_HOME" value="/bottlenecks/rubbos/app_tools"/>
-
-      <!-- Output directory for results of RUBBoS benchmark -->
-      <param name="RUBBOS_RESULTS_HOST" value="bonn.cc.gt.atl.ga.us"/>
-	  <param name="RUBBOS_RESULTS_DIR_BASE" value="/bottlenecks/rubbos/rubbos_results"/>
-
-      <!-- Top directories -->
-      <param name="BOTTLENECKS_TOP" value="/bottlenecks"/>
-      <param name="RUBBOS_TOP" value="$BOTTLENECKS_TOP/rubbos"/>
-      <param name="RUBBOS_APP" value="$RUBBOS_TOP/app">
-      <param name="TMP_RESULTS_DIR_BASE" value="$RUBBOS_TOP/tmp_results"/>
-
-      <!-- Sysstat & Dstat-->
-      <param name="SYSSTAT_HOME" value="$RUBBOS_APP/sysstat-9.0.6"/>
-      <param name="SYSSTAT_TARBALL" value="sysstat-9.0.6.tar.gz"/>
-	  <param name="DSTAT_TARBALL" value="$SOFTWARE_HOME/dstat.tar.gz"/>
-	  
-	  <!-- Ant -->
-      <param name="ANT_HOME" value="$RUBBOS_TOP/apache-ant-1.6.5"/>
-      <param name="ANT_TARBALL" value="apache-ant-1.6.5.tar.gz"/>
-
-      <!-- Rubbos -->
-      <param name="RUBBOS_HOME" value="$RUBBOS_APP/RUBBoS"/>
-      <param name="RUBBOS_TARBALL" value="RUBBoS-servlets.tar.gz"/>
-      <param name="RUBBOS_DATA_TARBALL" value="rubbos_data.tar.gz"/>
-      <param name="RUBBOS_DATA_TEXTFILES_TARBALL" value="smallDB-rubbos-modified.tgz"/>
-
-      <!-- Java -->
-      <!--jdk j2sdk-1_4_2_19-linux-i586
-      <param name="JAVA_HOME" value="/mnt/elba/rubbos/jdk1.5.0_07"/>
-      <param name="JAVA_OPTS" value="-Xmx1300m"/>
-      <param name="JAVA_TARBALL" value="jdk1.5.0_07.tar.gz"/> 
-      -->
-	  <!-- jdk-1_5_0_7-linux-i586
-      <param name="JAVA_HOME" value="/mnt/elba/rubbos/jdk1.5.0_07"/>
-      <param name="JAVA_OPTS" value="-Xmx1300m"/>
-	  <param name="JAVA_TARBALL" value="jdk1.5.0_07.tar.gz"/>
-	  -->
-      <!--jdk-1_5_0_22-linux-i586
-      <param name="JAVA_HOME" value="/mnt/elba/rubbos/jdk1.5.0_07"/>
-      <param name="JAVA_OPTS" value="-Xmx1300m"/>
-      <param name="JAVA_TARBALL" value="jdk1.5.0_07.tar.gz"/> 
-      -->     
-	  <!-- jdk-6u27-linux-i586 -->
-      <param name="JAVA_HOME" value="$RUBBOS_APP/jdk1.6.0_27"/>
-      <param name="JAVA_OPTS" value="-Xmx1300m"/>
-	  <param name="JAVA_TARBALL" value="jdk1.6.0_27.tar.gz"/> 
-      <!-- J2EE -->
-      <param name="J2EE_HOME" value="$RUBBOS_APP/j2sdkee1.3.1"/>
-      <param name="J2EE_TARBALL" value="j2sdkee1.3.1.jar.gz"/>
-
-      <!-- Apache -->
-      <param name="HTTPD_HOME" value="$RUBBOS_APP/apache2"/>
-      <param name="HTTPD_INSTALL_FILES" value="$RUBBOS_APP/httpd-2.0.64"/>
-      <param name="HTTPD_TARBALL" value="httpd-2.0.64.tar.gz"/>
-
-      <!-- mod_jk -->
-	  <!-- jakarta-tomcat-connectors-1.2.15
-      <param name="MOD_JK_INSTALL_FILES" value="$RUBBOS_TOP/jakarta-tomcat-connectors-1.2.15-src"/>
-      <param name="MOD_JK_INSTALL_CONFIGURE" value="$MOD_JK_INSTALL_FILES/jk/native"/>
-	  <param name="MOD_JK_TARBALL" value="jakarta-tomcat-connectors-1.2.15-src.tar.gz"/>
-	  -->
-	  <!-- tomcat-connectors-1.2.32 -->
-      <param name="MOD_JK_INSTALL_FILES" value="$RUBBOS_APP/tomcat-connectors-1.2.32-src"/>
-      <param name="MOD_JK_INSTALL_CONFIGURE" value="$MOD_JK_INSTALL_FILES/native"/>
-      <param name="MOD_JK_TARBALL" value="tomcat-connectors-1.2.32-src.tar.gz"/>
-	  
-      <!-- Tomcat -->
-	  <!-- apache-tomcat-5.5.17 -->
-      <param name="CATALINA_HOME" value="$RUBBOS_APP/apache-tomcat-5.5.17"/>
-      <param name="CATALINA_BASE" value="$CATALINA_HOME"/>
-      <param name="TOMCAT_TARBALL" value="apache-tomcat-5.5.17.tar.gz"/>
-	  <param name="SERVLET_API_PATH" value="$CATALINA_HOME/common/lib/servlet-api.jar"/>
-	  
-	  <!-- apache-tomcat-5.5.33
-      <param name="CATALINA_HOME" value="/mnt/elba/rubbos/apache-tomcat-5.5.33"/>
-      <param name="CATALINA_BASE" value="$CATALINA_HOME"/>
-      <param name="TOMCAT_TARBALL" value="apache-tomcat-5.5.33.tar.gz"/>
-	  <param name="SERVLET_API_PATH" value="$CATALINA_HOME/common/lib/servlet-api.jar"/>
-	  -->
-      <!-- apache-tomcat-6.0.33 
-      <param name="CATALINA_HOME" value="/mnt/elba/rubbos/apache-tomcat-6.0.33"/>
-      <param name="CATALINA_BASE" value="$CATALINA_HOME"/>
-      <param name="TOMCAT_TARBALL" value="apache-tomcat-6.0.33.tar.gz"/>
-      <param name="SERVLET_API_PATH" value="$CATALINA_HOME/lib/servlet-api.jar"/>
-      -->
-      <!-- apache-tomcat-7.0.21
-      <param name="CATALINA_HOME" value="/mnt/elba/rubbos/apache-tomcat-7.0.21"/>
-      <param name="CATALINA_BASE" value="$CATALINA_HOME"/>
-      <param name="TOMCAT_TARBALL" value="apache-tomcat-7.0.21.tar.gz"/>
-      <param name="SERVLET_API_PATH" value="$CATALINA_HOME/lib/servlet-api.jar"/>
-      -->
-
-      <!-- C-JDBC
-      <param name="CJDBC_HOME" value="$RUBBOS_TOP/c-jdbc-2.0.2-bin"/>
-      <param name="CJDBC_TARBALL" value="c-jdbc-2.0.2-bin-modified.tar.gz"/>      
-      <param name="CJDBC_DRIVER" value="c-jdbc-driver.jar"/>
-      <param name="CJDBC_CONTROLLER" value="c-jdbc-controller.jar"/>
-      <param name="CJDBC_PORT" value="25322"/> 
-	  -->
-	  
-      <!-- Mysql -->
-      <param name="MYSQL_HOME" value="$RUBBOS_APP/mysql-5.0.51a-linux-i686-glibc23"/>
-      <param name="MYSQL_TARBALL" value="mysql-5.0.51a-linux-i686-glibc23.tar.gz"/>
-      <param name="MYSQL_TARBALL_RT" value="mysql-5.0.51a-modified-bin.tar.gz"/>
-      <param name="MYSQL_CONNECTOR" value="mysql-connector-java-5.1.7-bin.jar"/>      
-      <param name="MYSQL_PORT" value="3313"/>
-      <param name="MYSQL_SOCKET" value="$MYSQL_HOME/mysql.sock"/>
-      <param name="MYSQL_DATA_DIR" value="$MYSQL_HOME/data"/>
-      <param name="MYSQL_ERR_LOG" value="$MYSQL_HOME/data/mysql.log"/>
-      <param name="MYSQL_PID_FILE" value="$MYSQL_HOME/run/mysqld.pid"/>
-      <param name="MYSQL_ROOT_PW" value="new-password"/>
-
-      <!-- for PostgreSQL 
-      <param name="POSTGRES_HOME" value="$RUBBOS_TOP/pgsql"/>
-      <param name="POSTGRES_INSTALL_FILES" value="$RUBBOS_TOP/postgresql-8.3.1"/>      
-      <param name="POSTGRES_CONNECTOR" value="postgresql-8.3-603.jdbc3.jar"/>
-      <param name="POSTGRES_DATA_DIR" value="$POSTGRES_HOME/data"/> 
-      -->
-
-      <!-- for DBs & C-JDBC -->
-      <param name="ROOT_PASSWORD" value="new-password"/>
-      <param name="ELBA_USER" value="elba"/>
-      <param name="ELBA_PASSWORD" value="elba"/>
-
-    </env>
-
-    <workloads>
-      <param name="workload" value="200"/>
-      <param name="workload" value="300"/>
-      <param name="workload" value="400"/>
-      <param name="workload" value="500"/>
-      <param name="workload" value="600"/>
-      <param name="workload" value="700"/>
-      <param name="workload" value="800"/>
-      <param name="workload" value="900"/>
-	    <param name="workload" value="1000"/>
-	    <param name="workload" value="1100"/>
-			<param name="workload" value="1200"/>
-			<param name="workload" value="1300"/>
-			<param name="workload" value="1400"/>
-			<param name="workload" value="1500"/>
-      <param name="workload" value="1600"/>
-      <param name="workload" value="1700"/>
-    </workloads>
-
-    <rubbos-conf>
-      <param name="connectionPoolSize" value="12"/>
-      <param name="upRampTime" value="480000"/>
-      <param name="runTime" value="720000"/>
-      <param name="downRampTime" value="30000"/>
-      <param name="removeBinFiles" value="true"/>
-      <param name="MON_FREQUENCY" value="1" />
-      <param name="sarMonitor" value="false"/>
-      <param name="psMonitor" value="false"/>
-	  <param name="iostatMonitor" value="true"/>
-	  <param name="connectionTimeoutValue" value="300"/>
-    </rubbos-conf>
-
-    <apache-conf>
-      <param name="Timeout" value="5"/>
-      <param name="KeepAlive" value="Off"/>
-      <param name="MaxKeepAliveRequests" value="100"/>
-      <param name="ServerLimit" value="200"/>
-      <param name="ThreadLimit" value="300"/>
-      <param name="StartServers" value="1"/>
-      <param name="MaxClients" value="300"/>
-      <param name="MinSpareThreads" value="5"/>
-      <param name="MaxSpareThreads" value="50"/>
-      <param name="ThreadsPerChild" value="150"/>
-      <param name="MaxRequestsPerChild" value="0"/>
-    </apache-conf>
-
-    <tomcat-conf>
-      <param name="maxThreads" value="330"/>
-      <param name="minSpareThreads" value="5"/>
-      <param name="maxSpareThreads" value="50"/>
-      <param name="acceptCount" value="6000"/>
-    </tomcat-conf>
-
-    <cjdbc-conf>
-      <param name="initPoolSize" value="30"/>
-      <param name="minPoolSize" value="25"/>
-      <param name="maxPoolSize" value="90"/>
-      <param name="idleTimeout" value="30"/>
-      <param name="waitTimeout" value="10"/>
-      <param name="waitForCompletion" value="all"/>
-          <!-- "all" or "first", "first" is default" -->
-      <param name="loadBalancing" value="LeastPendingRequestsFirst"/>
-          <!-- "LeastPendingRequestsFirst" or "RoundRobin", "LeastPendingRequestsFirst" is default" -->
-    </cjdbc-conf>
-
-    <!--
-    <postgres-conf>
-      <param name="max_connections" value="150"/>
-      <param name="shared_buffers" value="24MB"/>
-      <param name="max_fsm_pages" value="153600"/>
-      <param name="checkpoint_segments" value="16"/>
-    </postgres-conf>
-    -->
-    <logging>
-      <param name="apacheResponseTime" value="false"/>
-      <param name="tomcatResponseTime" value="false"/>
-      <param name="cjdbcResponseTime" value="false"/>
-      <param name="mysqlResponseTime" value="false"/>
-    </logging>
-
-  </params>
-
-  <instance name="CONTROL" type="control_server">
-    <target>node1</target>
-    <action type="checkScp_exec" seq="1" template="../templates/DeployScript/check_scp.xsl" />
-    <action type="emulabConf_exec" seq="2" template="../templates/DeployScript/emulab_config.xsl" />
-    <action type="rubbos_exec" seq="250" template="../templates/DeployScript/RUBBOSexecution.xsl" />
-  </instance> 
-  
-  <instance name="BENCHMARK" type="benchmark_server">
-    <target>node2</target>
-    <action type="rubbos_install" seq="19" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="install" seq="21" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
-    <action type="configure" seq="104" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
-    <action type="uninstall" seq="401" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
-    <action type="rubbos_uninstall" seq="402" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-  </instance> 
-  
-  <instance name="CLIENT1" type="client_server">
-    <target>node3</target>
-    <action type="rubbos_install" seq="20" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="install" seq="22" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
-    <action type="configure" seq="105" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
-    <action type="uninstall" seq="403" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
-    <action type="rubbos_uninstall" seq="404" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-  </instance> 
-  
-  <instance name="CLIENT2" type="client_server">
-    <target>node4</target>
-    <action type="rubbos_install" seq="20" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="install" seq="22" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
-    <action type="configure" seq="105" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
-    <action type="uninstall" seq="403" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
-    <action type="rubbos_uninstall" seq="404" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-  </instance> 
-  
-  <instance name="CLIENT3" type="client_server">
-    <target>node5</target>
-    <action type="rubbos_install" seq="20" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="install" seq="22" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
-    <action type="configure" seq="105" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
-    <action type="uninstall" seq="403" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
-    <action type="rubbos_uninstall" seq="404" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-  </instance> 
-  
-  <instance name="CLIENT4" type="client_server">
-    <target>node6</target>
-    <action type="rubbos_install" seq="20" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="install" seq="22" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
-    <action type="configure" seq="105" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
-    <action type="uninstall" seq="403" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
-    <action type="rubbos_uninstall" seq="404" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-  </instance> 
-  
-  <instance name="HTTPD" type="web_server">
-    <target>node7</target>
-    <action type="install" seq="14" template="../templates/DeployScript/WEBinstall.xsl" />
-    <action type="rubbos_install" seq="18" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="configure" seq="103" template="../templates/DeployScript/WEBconfigure.xsl" />
-    <action type="ignition" seq="204" template="../templates/DeployScript/WEBignition.xsl" />
-    <action type="stop" seq="301" template="../templates/DeployScript/WEBstop.xsl" />
-    <action type="rubbos_uninstall" seq="405" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-    <action type="uninstall" seq="406" template="../templates/DeployScript/WEBuninstall.xsl" />
-  </instance>
-  
-  <instance name="TOMCAT1" type="app_server">
-    <target>node8</target>
-    <action type="install" seq="13" template="../templates/DeployScript/TOMCATinstall.xsl"/>
-    <action type="rubbos_install" seq="17" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="configure" seq="102" template="../templates/DeployScript/TOMCATconfigure.xsl" />
-    <action type="rubbosSL_configure" seq="106" template="../templates/DeployScript/RUBBOS_SERVLETconfigure.xsl" />
-    <action type="ignition" seq="203" template="../templates/DeployScript/TOMCATignition.xsl" />
-    <action type="stop" seq="302" template="../templates/DeployScript/TOMCATstop.xsl" />
-    <action type="rubbos_uninstall" seq="407" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-    <action type="uninstall" seq="408" template="../templates/DeployScript/TOMCATuninstall.xsl" />
-  </instance>
-
-  <!--
-  <instance name="TOMCAT2" type="app_server">
-    <target>node9</target>
-    <action type="install" seq="13" template="../templates/DeployScript/TOMCATinstall.xsl"/>
-    <action type="rubbos_install" seq="17" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="configure" seq="102" template="../templates/DeployScript/TOMCATconfigure.xsl" />
-    <action type="rubbosSL_configure" seq="106" template="../templates/DeployScript/RUBBOS_SERVLETconfigure.xsl" />
-    <action type="ignition" seq="203" template="../templates/DeployScript/TOMCATignition.xsl" />
-    <action type="stop" seq="302" template="../templates/DeployScript/TOMCATstop.xsl" />
-    <action type="rubbos_uninstall" seq="407" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-    <action type="uninstall" seq="408" template="../templates/DeployScript/TOMCATuninstall.xsl" />
-  </instance>
-  
-  <instance name="CJDBC" type="cjdbc_server">
-    <swname>CJDBC_Controller</swname>
-    <target>node10</target>
-    <action type="install" seq="12" template="../templates/DeployScript/CJDBC_CONTROLLERinstall.xsl" />
-    <action type="rubbos_install" seq="16" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="ignition" seq="202" template="../templates/DeployScript/CJDBC_CONTROLLERignition.xsl" />
-    <action type="stop" seq="303" template="../templates/DeployScript/CJDBC_CONTROLLERstop.xsl" />
-    <action type="rubbos_uninstall" seq="409" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-    <action type="uninstall" seq="410" template="../templates/DeployScript/CJDBC_CONTROLLERuninstall.xsl" />
-  </instance>
-  -->
-  
-  <instance name="MYSQL1" type="db_server">
-    <target>node9</target>
-    <action type="install" seq="11" template="../templates/DeployScript/MYSQLinstall.xsl" />
-    <action type="rubbos_install" seq="15" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="configure" seq="101" template="../templates/DeployScript/MYSQLconfigure.xsl" />
-    <action type="reset" seq="150" template="../templates/DeployScript/MYSQLreset.xsl" />
-    <action type="ignition" seq="201" template="../templates/DeployScript/MYSQLignition.xsl" />
-    <action type="stop" seq="304" template="../templates/DeployScript/MYSQLstop.xsl" />
-    <action type="rubbos_uninstall" seq="411" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-    <action type="uninstall" seq="412" template="../templates/DeployScript/MYSQLuninstall.xsl" />
-  </instance>
-  <!--
-  <instance name="MYSQL2" type="db_server">
-    <target>node12</target>
-    <action type="install" seq="11" template="../templates/DeployScript/MYSQLinstall.xsl" />
-    <action type="rubbos_install" seq="15" template="../templates/DeployScript/RUBBOSinstall.xsl" />
-    <action type="configure" seq="101" template="../templates/DeployScript/MYSQLconfigure.xsl" />
-    <action type="reset" seq="150" template="../templates/DeployScript/MYSQLreset.xsl" />
-    <action type="ignition" seq="201" template="../templates/DeployScript/MYSQLignition.xsl" />
-    <action type="stop" seq="304" template="../templates/DeployScript/MYSQLstop.xsl" />
-    <action type="rubbos_uninstall" seq="411" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
-    <action type="uninstall" seq="412" template="../templates/DeployScript/MYSQLuninstall.xsl" />
-  </instance>
-  -->
-</instances>
-
-</xtbl>
diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java
deleted file mode 100644
index f84ded04..00000000
--- a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package edu.rice.rubbos.servlets;
-
-public class Config
-{
-
-  /**
-   * Creates a new <code>Config</code> instance.
-   */
-  Config()
-  {
-  }
-
-
-  public static final String HTMLFilesPath                 = "/bottlenecks/rubbos/app/RUBBoS/Servlet_HTML";
-  public static final String[] DatabaseProperties          = {"/bottlenecks/rubbos/app/RUBBoS/Servlets/mysql.properties"};
-  public static final int DatabasePropertiesSize = 1;
-
-  public static final int    AboutMePoolSize               = 10;
-  public static final int    BrowseCategoriesPoolSize      = 6;
-  public static final int    BrowseRegionsPoolSize         = 6;
-  public static final int    BuyNowPoolSize                = 4;
-  public static final int    PutBidPoolSize                = 8;
-  public static final int    PutCommentPoolSize            = 2;
-  public static final int    RegisterItemPoolSize          = 2;
-  public static final int    RegisterUserPoolSize          = 2;
-  public static final int    SearchItemsByCategoryPoolSize = 15;
-  public static final int    SearchItemsByRegionPoolSize   = 20;
-  public static final int    StoreBidPoolSize              = 8;
-  public static final int    StoreBuyNowPoolSize           = 4;
-  public static final int    StoreCommentPoolSize          = 2;
-  public static final int    ViewBidHistoryPoolSize        = 4;
-  public static final int    ViewItemPoolSize              = 20;
-  public static final int    ViewUserInfoPoolSize          = 4;
-}
diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml
deleted file mode 100644
index 37472041..00000000
--- a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-<project name="RUBBoS Servlets" default="dist" basedir=".">
-  <!-- RUBBoS Servlets Ant build file -->
-
-  <!-- set global properties for this build -->
-  <property file="../build.properties" />
-  <property name="servlets.html" value="../Servlet_HTML" />
-  
-<!-- ====================================================================== -->
-<!-- Init -->
-<!-- ====================================================================== -->
-
-  <!-- init rule creates build directory -->
-  <target name="init">
-    <!-- Create the time stamp -->
-    <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${classes.dir}"/>
-  </target>
-  
-<!-- ====================================================================== -->
-<!-- Servlets -->
-<!-- ====================================================================== -->
-  
-   <!-- The classpath to be used to compile  -->
-  <path id="base.classpath">
-    <pathelement location="${classes.dir}" />
-    <fileset dir="${j2ee}/lib">
-      <include name="j2ee.jar"/>
-    </fileset>
-  </path>
-
-  <!-- Creates a jar file containing the servlets -->
-  <target name="jar" depends="init, compile">
-     <jar destfile="${dist}/rubbos_servlets.jar">
-        <fileset dir="${classes.dir}"
-                 includes="edu/rice/rubbos/servlets/*.class"/>
-    </jar>
-  </target>
-
-  <!-- Create a war file-->
-  <target name="war" depends="init, compile, jar">
-    <copy file="${dist}/rubbos_servlets.jar" todir="${servlets.html}/WEB-INF/lib"/>
-    <copy file="${j2ee}/lib/j2ee.jar" todir="${servlets.html}/WEB-INF/lib"/>
-
-    <copy file="${mysql_connector}" todir="${servlets.html}/WEB-INF/lib"/>
-  
-     <war destfile="${dist}/rubbos.war" webxml="${servlets.html}/WEB-INF/web.xml" basedir="${web.dir}">
-        <fileset dir="${classes.dir}"
-                 includes="*" excludes="**/web.xml" />
-    </war>
-  </target>
-  
-    <!-- Dist rule -->
-  <target name="dist" depends="init, compile, jar, war">
-  </target>
-  
-  <!-- compile rule: Compile the beans and the servlets -->
-  <target name="compile" depends="init">
-    <javac srcdir="${src}"
-           includes="edu/rice/rubbos/servlets/*"
-           destdir="${classes.dir}"
-           classpath="${build.classpath}"
-           depend="yes"
-           deprecation="yes">
-    <classpath refid="base.classpath" />
-    </javac>
-  </target>
-
-<!-- ====================================================================== -->
-<!-- Javadoc -->
-<!-- ====================================================================== -->
-
-  <!-- Generate Javadoc documentation -->
-  <target name="doc">
-     <mkdir dir="docs/api"/>
-     <javadoc classpathref="base.classpath"
-           packagenames="edu.rice.rubbos.*.*"
-           sourcepath="."
-           defaultexcludes="yes"
-           destdir="docs/api"
-           author="true"
-           version="true"
-           use="true"
-           windowtitle="RUBBoS API">
-       <doctitle><![CDATA[<h1>RUBBoS API</h1>]]></doctitle>
-       <bottom><![CDATA[<i>Copyright &#169; 2004 - ObjectWeb Consortium - All Rights Reserved.</i>]]></bottom>
-     </javadoc>
-  </target>
-  
-<!-- ====================================================================== -->
-<!-- Clean -->
-<!-- ====================================================================== -->
-
-  <target name="clean">
-    <!-- Delete the ${classes.dir} and ${dist} directory trees -->
-    <delete dir="${classes.dir}"/>
-    <delete>
-      <fileset dir="${dist}" includes="rubbos_servlets.jar"/>
-    </delete>
-    <delete>
-      <fileset dir="${dist}" includes="rubbos.war"/>
-    </delete>
-    <delete>
-      <fileset dir="edu" includes="**/*.class"/>
-    </delete>
-  </target>
-  
-  <target name="clean-doc">
-    <delete dir="docs/api"/>
-  </target>
-</project>
-
diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml
deleted file mode 100644
index e0a32b6b..00000000
--- a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-
-<web-app>
-
-    <display-name>RUBBos</display-name>
-	<description>
-	Rice University Bulletin Board System
-	</description>
-
-
-    <servlet>
-      <servlet-name>BrowseCategories</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.BrowseCategories</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>BrowseStoriesByCategory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.BrowseStoriesByCategory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>ViewComment</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.ViewComment</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>ModerateComment</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.ModerateComment</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>PostComment</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.PostComment</servlet-class>
-    </servlet>
-
-   <servlet>
-      <servlet-name>StoreComment</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.StoreComment</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>SubmitStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.SubmitStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>AcceptStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.AcceptStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>RejectStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.RejectStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>ReviewStories</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.ReviewStories</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>StoreStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.StoreStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>ViewStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.ViewStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>StoriesOfTheDay</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.StoriesOfTheDay</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>Search</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.Search</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>StoreModeratorLog</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.StoreModeratorLog</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>RegisterUser</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.RegisterUser</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>Author</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.Author</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>OlderStories</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.OlderStories</servlet-class>
-    </servlet>
-
- 
-    <servlet-mapping>
-      <servlet-name>BrowseCategories</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.BrowseCategories</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>BrowseStoriesByCategory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.BrowseStoriesByCategory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>ViewComment</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.ViewComment</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>ModerateComment</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.ModerateComment</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>PostComment</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.PostComment</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>StoreComment</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreComment</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>SubmitStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.SubmitStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>AcceptStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.AcceptStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>RejectStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.RejectStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>ReviewStories</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.ReviewStories</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>StoreStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>ViewStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.ViewStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>StoriesOfTheDay</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.StoriesOfTheDay</url-pattern>
-    </servlet-mapping>
-
-
-    <servlet-mapping>
-      <servlet-name>Search</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.Search</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>StoreModeratorLog</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreModeratorLog</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-       <servlet-name>RegisterUser</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.RegisterUser</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-       <servlet-name>Author</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.Author</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-       <servlet-name>OlderStories</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.OlderStories</url-pattern>
-    </servlet-mapping>
-
-
-    <session-config>
-      <session-timeout>30</session-timeout>    <!-- 30 minutes -->
-    </session-config>
-
-</web-app>
diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
deleted file mode 100644
index 525c4398..00000000
--- a/testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
-
-  <!-- Global JNDI resources -->
-  <GlobalNamingResources>
-
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-       description="User database that can be updated and saved"
-           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-          pathname="conf/tomcat-users.xml" />
-
-  </GlobalNamingResources>
-
-
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Catalina">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-    -->
-
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 2117 (default 8080) -->
-    <Connector port="8080" maxHttpHeaderSize="8192"
-               maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
-               enableLookups="false" redirectPort="8443" acceptCount="6000"
-               connectionTimeout="20000" disableUploadTimeout="true" />
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009"
-               maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
-               acceptCount="6000" redirectPort="8443" protocol="AJP/1.3" />
-
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector port="8082"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" acceptCount="100" connectionTimeout="20000"
-               proxyPort="80" disableUploadTimeout="true" />
-    -->
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine jvmRoute="TOMCAT1" name="Catalina" defaultHost="localhost">
-
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
-
-      <!-- Define the default virtual host -->
-
-      <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
-
-   <!--    <Context path="" docBase="webapps" debug="0" reloadable="true"/> -->
-
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-      </Host>
-
-
-    </Engine>
-
-  </Service>
-
-</Server>
-