From 6a8257127b3dce1f18a650afe6921a34b6c6f5b8 Mon Sep 17 00:00:00 2001 From: liyin Date: Mon, 8 May 2017 09:04:32 +0000 Subject: Delete testcase of rubbos and vstf. JIRA:BOTTLENECK-167 This patch will delete vstf and rubbos testcase code. Include some testcase config file, if there will be someone who want to use this testcase maybe B or C version code will contain those testcase. if you use the D version code to run this two testcase we will info you that: Rubbos testsuite is not updating anymore. This entrance for running Rubbos within Bottlenecks is no longer supported. Change-Id: I04e4042ff3998b3696df2ed47a9ffab6f1620ec3 Signed-off-by: liyin --- .../rubbos_tomcat/files/tomcat_sl/build.properties | 7 - .../rubbos_tomcat/files/tomcat_sl/mysql.properties | 17 -- .../files/tomcat_sl/rubbos_files/Makefile | 79 -------- .../files/tomcat_sl/rubbos_files/config.mk | 32 ---- .../rubbos_tomcat/manifests/rubbos_tomcat_off.pp | 80 -------- .../rubbos_tomcat/manifests/rubbos_tomcat_on.pp | 201 --------------------- 6 files changed, 416 deletions(-) delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.properties delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/mysql.properties delete mode 100755 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/rubbos_files/Makefile delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/rubbos_files/config.mk delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/manifests/rubbos_tomcat_off.pp delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/manifests/rubbos_tomcat_on.pp (limited to 'testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat') diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.properties b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.properties deleted file mode 100644 index 5c108b45..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -src = . -dist =. -classes.dir = ./build -web.dir = ../Servlet_HTML - -j2ee = REPLACED_RUBBOS_APP_TOOLS/j2sdkee1.3.1 -mysql_connector = ./mysql-connector-java-5.1.7-bin.jar diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/mysql.properties b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/mysql.properties deleted file mode 100644 index 966cfa59..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/mysql.properties +++ /dev/null @@ -1,17 +0,0 @@ -## DataSource configuration -datasource.name mysql - -#datasource.url jdbc:mysql://btnks-1:3313/rubbos -datasource.url REPLACED_MYSQL_JDBC_DB_URL -datasource.classname com.mysql.jdbc.Driver - -datasource.username REPLACED_MYSQL_USERNAME -datasource.password REPLACED_MYSQL_PASSWORD - - -## ConnectionManager configuration -jdbc.connchecklevel 1 -jdbc.connmaxage 30 -jdbc.connmaxthreads 4 -jdbc.connexcltimeout 30 -jdbc.connteststmt select 1 diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/rubbos_files/Makefile b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/rubbos_files/Makefile deleted file mode 100755 index e01d4e3e..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/rubbos_files/Makefile +++ /dev/null @@ -1,79 +0,0 @@ - - -########################### -# RUBBoS Makefile # -########################### - -include config.mk - -############################## -# Environment variables # -############################## - -JAVA = $(JAVA_HOME)/bin/java -JAVAC = $(JAVA_HOME)/bin/javac -JAVACOPTS = -deprecation -JAVACC = $(JAVAC) $(JAVACOPTS) -RMIC = $(JAVA_HOME)/bin/rmic -RMIREGISTRY= $(JAVA_HOME)/bin/rmiregistry -CLASSPATH = .:$(J2EE_HOME)/lib/j2ee.jar:$(JAVA_HOME)/jre/lib/rt.jar -JAVADOC = $(JAVA_HOME)/javadoc - - -######################### -# Servlets version # -######################### -#ServletPrinter -Servlets = Config TimeManagement BrowseCategories Auth RegisterUser RubbosHttpServlet BrowseRegions SearchItemsByCategory SearchItemsByRegion ViewItem ViewBidHistory ViewUserInfo SellItemForm RegisterItem PutCommentAuth PutComment StoreComment BuyNowAuth BuyNow StoreBuyNow PutBidAuth PutBid StoreBid AboutMe - -all_servlets_sources = $(addprefix edu/rice/rubbos/servlets/, $(addsuffix .java, $(Servlets))) -all_servlets_obj = $(addprefix edu/rice/rubbos/servlets/, $(addsuffix .class, $(Servlets))) - -servlets: $(all_servlets_obj) - -clean_servlets: - rm -f edu/rice/rubbos/servlets/*.class - -#################### -# Client # -#################### - -ClientFiles = URLGenerator URLGeneratorPHP RUBBoSProperties Stats \ - TransitionTable ClientEmulator UserSession - -all_client_sources = $(addprefix edu/rice/rubbos/client/, $(addsuffix .java, $(ClientFiles))) -all_client_obj = $(addprefix edu/rice/rubbos/client/, $(addsuffix .class, $(ClientFiles))) edu/rice/rubbos/beans/TimeManagement.class - -client: $(all_client_obj) - -initDB: - ${JAVA} -classpath .:./database edu.rice.rubbos.client.InitDB ${PARAM} - -emulator: - ${JAVA} -classpath Client:Client/rubbos_client.jar:. -Xmx1300m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator - -emulatorDebug: - ${JAVA} -classpath Client:Client/rubbos_client.jar:. -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Xmx1300m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator - - -############################ -# Global rules # -############################ - - -all: beans ejb_servlets client javadoc flush_cache - -world: all servlets - -javadoc : - ${JAVADOC} -d ./doc/api -bootclasspath ${CLASSPATH} -version -author -windowtitle "RUBBoS API" -header "RUBBoS (C)2001 Rice University/INRIA
" edu.rice.rubbos.beans edu.rice.rubbos.beans.servlets edu.rice.rubbos.client - -clean: - rm -f core edu/rice/rubbos/beans/*.class edu/rice/rubbos/beans/JOnAS* edu/rice/rubbos/beans/servlets/*.class edu/rice/rubbos/client/*.class edu/rice/rubbos/servlets/*.class - -%.class: %.java - ${JAVACC} -classpath ${CLASSPATH} $< - -flush_cache: bench/flush_cache.c - gcc bench/flush_cache.c -o bench/flush_cache - diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/rubbos_files/config.mk b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/rubbos_files/config.mk deleted file mode 100644 index 9182da4d..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/rubbos_files/config.mk +++ /dev/null @@ -1,32 +0,0 @@ - -############################## -# Environment variables # -############################## - -JAVA = $(JAVA_HOME)/bin/java -JAVAC = $(JAVA_HOME)/bin/javac -JAVACOPTS = -deprecation -JAVACC = $(JAVAC) $(JAVACOPTS) -RMIC = $(JAVA_HOME)/bin/rmic -RMIREGISTRY= $(JAVA_HOME)/bin/rmiregistry -CLASSPATH = .:$(J2EE_HOME)/lib/j2ee.jar:$(JAVA_HOME)/jre/lib/rt.jar:$(SERVLET_API_PATH) -JAVADOC = $(JAVA_HOME)/bin/javadoc -JAR = $(JAVA_HOME)/bin/jar - -GENIC = ${JONAS_ROOT}/bin/unix/GenIC - -MAKE = gmake -CP = /bin/cp -RM = /bin/rm -MKDIR = /bin/mkdir - - -# EJB server: supported values are jonas or jboss -EJB_SERVER = jonas - -# DB server: supported values are MySQL or PostgreSQL -DB_SERVER = MySQL - -%.class: %.java - ${JAVACC} -classpath ${CLASSPATH} $< - diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/manifests/rubbos_tomcat_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/manifests/rubbos_tomcat_off.pp deleted file mode 100644 index 30673b67..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/manifests/rubbos_tomcat_off.pp +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################# -# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -class rubbos_tomcat::rubbos_tomcat_off { - - include params::rubbos_params - - # Declare some variables - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - $rubbos_home = $params::rubbos_params::rubbos_home - - # stop tomcat server - exec {'${rubbos_app_tools}/apache-tomcat-5.5.17/bin/shutdown.sh': - cwd => "${rubbos_app_tools}/apache-tomcat-5.5.17", - command => "${rubbos_app_tools}/apache-tomcat-5.5.17/bin/shutdown.sh", - path => "/usr/bin:/usr/sbin:/bin:/sbin", - environment => "JAVA_HOME=${rubbos_app_tools}/jdk1.6.0_27", - onlyif => "test -f ${rubbos_app_tools}/apache-tomcat-5.5.17/bin/shutdown.sh", - notify => [ - File['${rubbos_app_tools}/apache-tomcat-5.5.17'], - File['${rubbos_app_tools}/j2sdkee1.3.1'], - File['${rubbos_app_tools}/apache-ant-1.6.5'], - ], - } - - file {'${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz': - ensure => absent, - path => "${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz", - backup => false, - } - - file {'${rubbos_app_tools}/apache-tomcat-5.5.17': - ensure => absent, - path => "${rubbos_app_tools}/apache-tomcat-5.5.17", - force => true, - backup => false, - } - - file {'${rubbos_app_tools}/j2sdkee1.3.1.tar.gz': - ensure => absent, - path => "${rubbos_app_tools}/j2sdkee1.3.1.tar.gz", - backup => false, - } - - file {'${rubbos_app_tools}/j2sdkee1.3.1': - ensure => absent, - path => "${rubbos_app_tools}/j2sdkee1.3.1", - force => true, - backup => false, - } - - file {'${rubbos_app_tools}/apache-ant-1.6.5.tar.gz': - ensure => absent, - path => "${rubbos_app_tools}/apache-ant-1.6.5.tar.gz", - backup => false, - } - - file {'${rubbos_app_tools}/apache-ant-1.6.5': - ensure => absent, - path => "${rubbos_app_tools}/apache-ant-1.6.5", - force => true, - backup => false, - } - - file {'${rubbos_home}/Servlets': - ensure => absent, - path => "${rubbos_home}/Servlets", - force => true, - recurse => true, - backup => false, - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/manifests/rubbos_tomcat_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/manifests/rubbos_tomcat_on.pp deleted file mode 100644 index 154b5fcb..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/manifests/rubbos_tomcat_on.pp +++ /dev/null @@ -1,201 +0,0 @@ -############################################################################# -# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -class rubbos_tomcat::rubbos_tomcat_on { - - include params::rubbos_params - require rubbos_common::rubbos_common_on - - # Declare some variables - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - $rubbos_home = $params::rubbos_params::rubbos_home - - # Prepare packages - file {'${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz': - ensure => file, - path => "${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz", - source => "puppet:///modules/rubbos_tomcat/apache-tomcat-5.5.17.tar.gz", - backup => false, - } - - exec {'tar xzvf ${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz': - cwd => "${rubbos_app_tools}", - command => "tar xzvf ${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz'], - } - - file {'${rubbos_app_tools}/j2sdkee1.3.1.jar.gz': - ensure => file, - path => "${rubbos_app_tools}/j2sdkee1.3.1.jar.gz", - source => "puppet:///modules/rubbos_common/j2sdkee1.3.1.jar.gz", - backup => false, - } - - exec {'tar xzvf ${rubbos_app_tools}/j2sdkee1.3.1.jar.gz': - cwd => "${rubbos_app_tools}", - command => "tar xzvf ${rubbos_app_tools}/j2sdkee1.3.1.jar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_app_tools}/j2sdkee1.3.1.jar.gz'], - } - - file {'${rubbos_app_tools}/apache-ant-1.6.5.tar.gz': - ensure => file, - path => "${rubbos_app_tools}/apache-ant-1.6.5.tar.gz", - source => "puppet:///modules/rubbos_common/apache-ant-1.6.5.tar.gz", - backup => false, - } - - exec {'tar xzvf ${rubbos_app_tools}/apache-ant-1.6.5.tar.gz': - cwd => "${rubbos_app_tools}", - command => "tar xzvf ${rubbos_app_tools}/apache-ant-1.6.5.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_app_tools}/apache-ant-1.6.5.tar.gz'], - } - - # Override a config file: servier.xml - file {'${rubbos_app_tools}/apache-tomcat-5.5.17/conf/server.xml': - ensure => file, - path => "${rubbos_app_tools}/apache-tomcat-5.5.17/conf/server.xml", - source => "puppet:///modules/rubbos_tomcat/server.xml", - show_diff => false, - backup => false, - require => Exec['tar xzvf ${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz'], - } - - # Config tomcal_sl - file {'${rubbos_home}/build.properties': - ensure => file, - path => "${rubbos_home}/build.properties", - source => "puppet:///modules/rubbos_tomcat/tomcat_sl/build.properties", - backup => false, - } - - # Makefile - file {'${rubbos_home}/Makefile': - ensure => file, - path => "${rubbos_home}/Makefile", - source => "puppet:///modules/rubbos_tomcat/tomcat_sl/rubbos_files/Makefile", - backup => false, - } - - # config.mk - file {'${rubbos_home}/config.mk': - ensure => file, - path => "${rubbos_home}/config.mk", - source => "puppet:///modules/rubbos_tomcat/tomcat_sl/rubbos_files/config.mk", - backup => false, - } - - # servlets codes - file {'${rubbos_home}/Servlets': - ensure => directory, - path => "${rubbos_home}/Servlets", - recurse => true, - source => "puppet:///modules/rubbos_tomcat/tomcat_sl/rubbos_files/Servlets", - show_diff => false, - backup => false, - } - - # mysql.properties etc. - file {'${rubbos_home}/Servlets/mysql.properties': - ensure => file, - path => "${rubbos_home}/Servlets/mysql.properties", - source => "puppet:///modules/rubbos_tomcat/tomcat_sl/mysql.properties", - backup => false, - } - - file {'${rubbos_home}/Servlets/build.xml': - ensure => file, - path => "${rubbos_home}/Servlets/build.xml", - source => "puppet:///modules/rubbos_tomcat/tomcat_sl/build.xml", - backup => false, - show_diff => false, - require => File['${rubbos_home}/Servlets'], - } - - file {'${rubbos_home}/Servlets/edu/rice/rubbos/servlets/Config.java': - ensure => file, - path => "${rubbos_home}/Servlets/edu/rice/rubbos/servlets/Config.java", - source => "puppet:///modules/rubbos_tomcat/tomcat_sl/Config.java", - backup => false, - require => File['${rubbos_home}/Servlets'], - } - - # mkdir for web.xml - exec {'mkdir -p ${rubbos_home}/Servlet_HTML/WEB-INF': - command => "mkdir -p ${rubbos_home}/Servlet_HTML/WEB-INF", - creates => "${rubbos_home}/Servlet_HTML/WEB-INF", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - } - file {'${rubbos_home}/Servlet_HTML/WEB-INF/web.xml': - ensure => file, - path => "${rubbos_home}/Servlet_HTML/WEB-INF/web.xml", - source => "puppet:///modules/rubbos_tomcat/tomcat_sl/web.xml", - backup => false, - require => Exec['mkdir -p ${rubbos_home}/Servlet_HTML/WEB-INF'], - } - - ## build rubbos.war - exec {'ant clean': - cwd => "${rubbos_home}/Servlets", - command => "${rubbos_app_tools}/apache-ant-1.6.5/bin/ant clean", - environment => ["JAVA_HOME=${rubbos_app_tools}/jdk1.6.0_27","ANT_HOME=${rubbos_app_tools}/apache-ant-1.6.5"], - path => [ - "/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin", - "${rubbos_app_tools}/jdk1.6.0_27/bin", - "${rubbos_app_tools}/jdk1.6.0_27/jre/bin", - "${rubbos_app_tools}/apache-ant-1.6.5/bin"], - require => [ - Exec['tar xzvf ${rubbos_app_tools}/j2sdkee1.3.1.jar.gz'], - Exec['tar xzvf ${rubbos_app_tools}/apache-ant-1.6.5.tar.gz'], - File['${rubbos_home}/build.properties'], - File['${rubbos_home}/Makefile'], - File['${rubbos_home}/config.mk'], - File['${rubbos_home}/Servlets/mysql.properties'], - File['${rubbos_home}/Servlets/build.xml'], - File['${rubbos_home}/Servlets/edu/rice/rubbos/servlets/Config.java'], - File['${rubbos_home}/Servlet_HTML/WEB-INF/web.xml']], - } - - exec {'ant dist': - cwd => "${rubbos_home}/Servlets", - command => "${rubbos_app_tools}/apache-ant-1.6.5/bin/ant dist", - environment => ["JAVA_HOME=${rubbos_app_tools}/jdk1.6.0_27","ANT_HOME=${rubbos_app_tools}/apache-ant-1.6.5"], - path => [ - "/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin", - "${rubbos_app_tools}/jdk1.6.0_27/bin", - "${rubbos_app_tools}/jdk1.6.0_27/jre/bin", - "${rubbos_app_tools}/apache-ant-1.6.5/bin"], - subscribe => Exec['ant clean'], - } ## ant dist will generate: servlets.jar and rubbos.war - - exec {'deploy rubbos.war': - cwd => "${rubbos_app_tools}/apache-tomcat-5.5.17", - command => "cp ${rubbos_home}/Servlets/rubbos.war ${rubbos_app_tools}/apache-tomcat-5.5.17/webapps/", - onlyif => "test -f ${rubbos_home}/Servlets/rubbos.war", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => [ - Exec['ant dist'], - Exec['tar xzvf ${rubbos_app_tools}/apache-tomcat-5.5.17.tar.gz']], - } - - # Finally, start tomcat server - exec {'${rubbos_app_tools}/apache-tomcat-5.5.17/bin/startup.sh': - cwd => "${rubbos_app_tools}/apache-tomcat-5.5.17", - command => "${rubbos_app_tools}/apache-tomcat-5.5.17/bin/startup.sh", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - environment => "JAVA_HOME=${rubbos_app_tools}/jdk1.6.0_27", - require => [ - File['${rubbos_app_tools}/apache-tomcat-5.5.17/conf/server.xml'], - Exec['deploy rubbos.war']], - } - -} -- cgit 1.2.3-korg