diff options
Diffstat (limited to 'testsuites/rubbos/puppet_manifests/modules')
24 files changed, 0 insertions, 2060 deletions
diff --git a/testsuites/rubbos/puppet_manifests/modules/params/manifests/rubbos_params.pp b/testsuites/rubbos/puppet_manifests/modules/params/manifests/rubbos_params.pp deleted file mode 100644 index b9072316..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/params/manifests/rubbos_params.pp +++ /dev/null @@ -1,23 +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 -############################################################################## - - -## Variables used in {rubbos} test suite -class params::rubbos_params { - - $rubbos_app = "/bottlenecks/rubbos/app" - $rubbos_app_tools = "/bottlenecks/rubbos/app_tools" - $rubbos_home = "/bottlenecks/rubbos/app/RUBBoS" - $mysql_user_group = "mysql" - $mysql_user_name = "mysql" - $mysql_user_password = "mysql" - $rubbos_os_username = "ubuntu" - $rubbos_os_usergroup = "ubuntu" - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/Makefile b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/Makefile deleted file mode 100755 index 77dec805..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/Makefile +++ /dev/null @@ -1,86 +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 -############################################################################## - - -########################### -# 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:. -Xms256m -Xmx2048m -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 -Xms128m -Xmx1024m -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 "<b>RUBBoS (C)2001 Rice University/INRIA</b><br>" 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_client/files/build.properties b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/build.properties deleted file mode 100644 index 77de8ba3..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/build.properties +++ /dev/null @@ -1,16 +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 -############################################################################## - - -src = . -dist =. -classes.dir = ./build -web.dir = ../Servlet_HTML - -j2ee = REPLACED_RUBBOS_APP_TOOLS/j2sdkee1.3.1 diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/config.mk b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/config.mk deleted file mode 100644 index 407bc25d..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/config.mk +++ /dev/null @@ -1,36 +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 -############################################################################## - -## 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:$(CATALINA_HOME)/common/lib/servlet-api.jar -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_client/files/rubbos.properties.template b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/rubbos.properties.template deleted file mode 100644 index 33aa46e9..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/rubbos.properties.template +++ /dev/null @@ -1,85 +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 -############################################################################## - - -# HTTP server information -httpd_hostname = REPLACED_WEB_SERVER -httpd_port = 8000 - -# C/JDBC server to monitor (if any) -cjdbc_hostname = - -# Precise which version to use. Valid options are : PHP, Servlets, EJB -httpd_use_version = Servlets - -# EJB server information -ejb_server = -ejb_html_path = -ejb_script_path = - -# Servlets server information -servlets_server = REPLACED_APPLICATION_SERVER -servlets_html_path = /rubbos -servlets_script_path = /rubbos/servlet - -# PHP information -php_html_path = /PHP -php_script_path = /PHP - -#Database information -database_master_server = REPLACED_DB_SERVER - -database_slave_servers = -workload_remote_client_nodes = REPLACED_CLIENT_SERVERS -workload_remote_client_command = REPLACED_RUBBOS_APP_TOOLS/jdk1.6.0_27/bin/java -classpath .:REPLACED_RUBBOS_HOME/Client/:REPLACED_RUBBOS_HOME/Client/rubbos_client.jar -Xms512m -Xmx2048m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator - -workload_number_of_clients_per_node = REPLACED_NUMBER_OF_CLIENTS_PER_NODE - -# Workload: precise which transition table to use -workload_user_transition_table = REPLACED_RUBBOS_HOME/workload/user_transitions.txt -workload_author_transition_table = REPLACED_RUBBOS_HOME/workload/author_transitions.txt -workload_number_of_columns = 24 -workload_number_of_rows = 26 -workload_maximum_number_of_transitions = 1000 -workload_use_tpcw_think_time = yes -workload_number_of_stories_per_page = 20 - -workload_up_ramp_time_in_ms = 15000 -workload_up_ramp_slowdown_factor = 2 - -workload_session_run_time_in_ms = 60000 - -workload_down_ramp_time_in_ms = 10000 -workload_down_ramp_slowdown_factor = 3 -workload_percentage_of_author = 10 - -# Users policy -database_number_of_authors = 50 -database_number_of_users = 500000 - -# Stories policy -database_story_dictionnary = REPLACED_RUBBOS_HOME/database/dictionary -database_story_maximum_length = 1024 -database_oldest_story_year = 1998 -database_oldest_story_month = 1 - -# Comments policy -database_comment_max_length = 1024 - -# Connection timedout settings -connection_time_out_interval = 300 - -# Monitoring Information -monitoring_debug_level = 1 -monitoring_program = REPLACED_RUBBOS_APP/sysstat-9.0.6/bin/sar -monitoring_options = -u ALL -I SUM -monitoring_sampling_in_seconds = 1 -monitoring_rsh = /usr/bin/ssh -monitoring_scp = /usr/bin/scp -monitoring_gnuplot_terminal = png diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/run_emulator.sh b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/run_emulator.sh deleted file mode 100755 index 5e8a6e95..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/run_emulator.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -############################################################################## -# 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 -############################################################################## - -## Usage: run_emulator.sh -echo "==> Rubbos emulator start $(date)" - -REPLACED_RUBBOS_APP_TOOLS/jdk1.6.0_27/bin/java -classpath .:REPLACED_RUBBOS_HOME/Client:REPLACED_RUBBOS_HOME/Client/rubbos_client.jar -Xms512m -Xmx2048m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator - -echo "==> Rubbos emulator end $(date)" diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp deleted file mode 100644 index aeb1f12f..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp +++ /dev/null @@ -1,103 +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_client::rubbos_client_off { - - include params::rubbos_params - - # Declare some variables - $rubbos_home = $params::rubbos_params::rubbos_home - - # build.properties - file {'${rubbos_home}/build.properties': - ensure => absent, - path => "${rubbos_home}/build.properties", - show_diff => false, - backup => false, - } - - # config.mk - file {'${rubbos_home}/config.mk': - ensure => absent, - path => "${rubbos_home}/config.mk", - show_diff => false, - backup => false, - } - - # Makefile - file {'${rubbos_home}/Makefile': - ensure => absent, - path => "${rubbos_home}/Makefile", - show_diff => false, - backup => false, - } - - # Client/rubbos.properties.template - file {'${rubbos_home}/Client/rubbos.properties.template': - ensure => absent, - path => "${rubbos_home}/Client/rubbos.properties.template", - show_diff => false, - backup => false, - } - - # bench/run_emulator.sh - file {'${rubbos_home}/bench/run_emulator.sh': - ensure => absent, - path => "${rubbos_home}/bench/run_emulator.sh", - show_diff => false, - backup => false, - } - - file {'${rubbos_home}/Client.tar.gz': - ensure => absent, - path => "${rubbos_home}/Client.tar.gz", - backup => false, - } - - file {'${rubbos_home}/Client': - ensure => absent, - path => "${rubbos_home}/Client", - force => true, - recurse => true, - show_diff => false, - backup => false, - } - - file {'${rubbos_home}/workload.tar.gz': - ensure => absent, - path => "${rubbos_home}/workload.tar.gz", - backup => false, - } - - file {'${rubbos_home}/workload': - ensure => absent, - path => "${rubbos_home}/workload", - force => true, - recurse => true, - show_diff => false, - backup => false, - } - - file {'${rubbos_home}/database.tar.gz': - ensure => absent, - path => "${rubbos_home}/database.tar.gz", - backup => false, - } - - file {'${rubbos_home}/database': - ensure => absent, - path => "${rubbos_home}/database", - force => true, - recurse => true, - show_diff => false, - backup => false, - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp deleted file mode 100644 index 7cda7e14..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp +++ /dev/null @@ -1,179 +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_client::rubbos_client_on { - - include params::rubbos_params - require rubbos_common::rubbos_common_on - require rubbos_monitor::rubbos_monitor_on - - # Declare some variables - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - $rubbos_home = $params::rubbos_params::rubbos_home - $rubbos_os_username = $params::rubbos_params::rubbos_os_username - $rubbos_os_usergroup = $params::rubbos_params::rubbos_os_usergroup - - # Prepare needed tools - 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'], - } - - # Prepare client codes and files - file {'${rubbos_home}/Client.tar.gz': - ensure => file, - path => "${rubbos_home}/Client.tar.gz", - source => "puppet:///modules/rubbos_client/Client.tar.gz", - backup => false, - } - - exec {'tar xvzf ${rubbos_home}/Client.tar.gz': - cwd => "${rubbos_home}", - command => "tar xvzf ${rubbos_home}/Client.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_home}/Client.tar.gz'], - } - - file {'${rubbos_home}/workload.tar.gz': - ensure => file, - path => "${rubbos_home}/workload.tar.gz", - source => "puppet:///modules/rubbos_client/workload.tar.gz", - backup => false, - } - - exec {'tar xvzf ${rubbos_home}/workload.tar.gz': - cwd => "${rubbos_home}", - command => "tar xvzf ${rubbos_home}/workload.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_home}/workload.tar.gz'], - } - - file {'${rubbos_home}/database.tar.gz': - ensure => file, - path => "${rubbos_home}/database.tar.gz", - source => "puppet:///modules/rubbos_client/database.tar.gz", - backup => false, - } - - exec {'tar xvzf ${rubbos_home}/database.tar.gz': - cwd => "${rubbos_home}", - command => "tar xvzf ${rubbos_home}/database.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_home}/database.tar.gz'], - } - - # build.properties - file {'${rubbos_home}/build.properties': - ensure => file, - path => "${rubbos_home}/build.properties", - source => "puppet:///modules/rubbos_client/build.properties", - show_diff => false, - backup => false, - } - - # config.mk - file {'${rubbos_home}/config.mk': - ensure => file, - path => "${rubbos_home}/config.mk", - source => "puppet:///modules/rubbos_client/config.mk", - show_diff => false, - backup => false, - } - - # Makefile - file {'${rubbos_home}/Makefile': - ensure => file, - path => "${rubbos_home}/Makefile", - source => "puppet:///modules/rubbos_client/Makefile", - show_diff => false, - backup => false, - } - - # Client/rubbos.properties.template - file {'${rubbos_home}/Client/rubbos.properties.template': - ensure => file, - path => "${rubbos_home}/Client/rubbos.properties.template", - source => "puppet:///modules/rubbos_client/rubbos.properties.template", - show_diff => false, - backup => false, - require => Exec['tar xvzf ${rubbos_home}/Client.tar.gz'], - } - - # bench/executable scripts - file {'${rubbos_home}/bench/run_emulator.sh': - ensure => file, - path => "${rubbos_home}/bench/run_emulator.sh", - source => "puppet:///modules/rubbos_client/run_emulator.sh", - backup => false, - } - - # Build rubbos_client.jar - exec {'ant clean': - cwd => "${rubbos_home}/Client", - 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'], - Exec['tar xvzf ${rubbos_home}/Client.tar.gz']], - } - - exec {'ant jar': - cwd => "${rubbos_home}/Client", - command => "${rubbos_app_tools}/apache-ant-1.6.5/bin/ant jar", - 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'], - } - - # Change owner and group for the Client folder - exec {'chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_home}/Client': - cwd => "${rubbos_home}", - command => "chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_home}/Client", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['ant jar'], - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_common/manifests/rubbos_common_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_common/manifests/rubbos_common_on.pp deleted file mode 100644 index ca192f73..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_common/manifests/rubbos_common_on.pp +++ /dev/null @@ -1,72 +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_common::rubbos_common_on { - - include params::rubbos_params - - # Declare some variables - $rubbos_app = $params::rubbos_params::rubbos_app - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - $rubbos_home = $params::rubbos_params::rubbos_home - - # Prepare RUBBOS_APP folder - exec {'mkdir -p ${rubbos_app}': - command => "mkdir -p ${rubbos_app}", - unless => "test -d ${rubbos_app}", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - } - - # Prepare RUBBOS_APP_TOOLS folder - exec {'mkdir -p ${rubbos_app_tools}': - command => "mkdir -p ${rubbos_app_tools}", - unless => "test -d ${rubbos_app_tools}", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - } - - # Prepare RUBBOS_HOME folder - exec {'mkdir -p ${rubbos_home}': - command => "mkdir -p ${rubbos_home}", - unless => "test -d ${rubbos_home}", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['mkdir -p ${rubbos_app}'], - } - - # Prepare common packages: - package {'make': - name => "make", - ensure => installed, - } - package {'gcc': - name => "gcc", - ensure => installed, - } - package {'g++': - name => "g++", - ensure => installed, - } - - # Install jdk - file {'${rubbos_app_tools}/jdk-6u27-linux-x64.bin': - ensure => file, - path => "${rubbos_app_tools}/jdk-6u27-linux-x64.bin", - source => "puppet:///modules/rubbos_common/jdk-6u27-linux-x64.bin", - mode => 0711, - backup => false, - require => Exec['mkdir -p ${rubbos_app_tools}'], - } - exec {'jdk-6u27-linux-x64.bin': - cwd => "${rubbos_app_tools}", - command => "${rubbos_app_tools}/jdk-6u27-linux-x64.bin", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_app_tools}/jdk-6u27-linux-x64.bin'], - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/files/apache_conf/httpd.conf b/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/files/apache_conf/httpd.conf deleted file mode 100644 index 88c62581..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/files/apache_conf/httpd.conf +++ /dev/null @@ -1,324 +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 -############################################################################## - - -ServerRoot "REPLACED_RUBBOS_APP_TOOLS/apache2" - -<IfModule !mpm_winnt.c> -<IfModule !mpm_netware.c> -</IfModule> -</IfModule> - -<IfModule !mpm_netware.c> -<IfModule !perchild.c> -</IfModule> -</IfModule> - -<IfModule !mpm_netware.c> -PidFile logs/httpd.pid -</IfModule> - -Timeout 5 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 15 - -<IfModule prefork.c> -StartServers 5 -MinSpareServers 5 -MaxSpareServers 10 -ServerLimit 4000 -MaxClients 4000 -MaxRequestsPerChild 0 -</IfModule> - -<IfModule worker.c> -ServerLimit 200 -ThreadLimit 300 -StartServers 1 -MaxClients 300 -MinSpareThreads 5 -MaxSpareThreads 50 -ThreadsPerChild 150 -MaxRequestsPerChild 0 -</IfModule> - -<IfModule perchild.c> -NumServers 5 -StartThreads 5 -MinSpareThreads 5 -MaxSpareThreads 10 -MaxThreadsPerChild 20 -MaxRequestsPerChild 0 -</IfModule> - -<IfModule mpm_winnt.c> -ThreadsPerChild 250 -MaxRequestsPerChild 0 -</IfModule> - -<IfModule beos.c> -StartThreads 10 -MaxClients 50 -MaxRequestsPerThread 10000 -</IfModule> - -<IfModule mpm_netware.c> -ThreadStackSize 65536 -StartThreads 250 -MinSpareThreads 25 -MaxSpareThreads 250 -MaxThreads 1000 -MaxRequestsPerChild 0 -MaxMemFree 100 -</IfModule> - -<IfModule mpmt_os2.c> -StartServers 2 -MinSpareThreads 5 -MaxSpareThreads 10 -MaxRequestsPerChild 0 -</IfModule> - -Listen 8000 - -<IfModule !mpm_winnt.c> -<IfModule !mpm_netware.c> -User apache -Group apache -</IfModule> -</IfModule> - -ServerAdmin you@example.com - -UseCanonicalName Off - -DocumentRoot "REPLACED_RUBBOS_APP_TOOLS/apache2/htdocs" - -<Directory /> - Options FollowSymLinks - AllowOverride None -</Directory> - -<Directory "REPLACED_RUBBOS_APP_TOOLS/apache2/htdocs"> - Options Indexes FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all -</Directory> - -UserDir public_html -DirectoryIndex index.html index.html.var -AccessFileName .htaccess -<Files ~ "^\.ht"> - Order allow,deny - Deny from all -</Files> - -TypesConfig conf/mime.types -DefaultType text/plain - -<IfModule mod_mime_magic.c> - MIMEMagicFile conf/magic -</IfModule> - -HostnameLookups Off - -ErrorLog logs/error_log -LogLevel warn -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -CustomLog logs/access_log common - -ServerTokens Full -ServerSignature On -Alias /icons/ "REPLACED_RUBBOS_APP_TOOLS/apache2/icons/" - -<Directory "REPLACED_RUBBOS_APP_TOOLS/apache2/icons"> - Options Indexes MultiViews - AllowOverride None - Order allow,deny - Allow from all -</Directory> - -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "REPLACED_RUBBOS_APP_TOOLS/apache2/manual$1" - -<Directory "REPLACED_RUBBOS_APP_TOOLS/apache2/manual"> - Options Indexes - AllowOverride None - Order allow,deny - Allow from all - - <Files *.html> - SetHandler type-map - </Files> - - SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1 - RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2 -</Directory> - -ScriptAlias /cgi-bin/ "REPLACED_RUBBOS_APP_TOOLS/apache2/cgi-bin/" - -<IfModule mod_cgid.c> -</IfModule> - -<Directory "REPLACED_RUBBOS_APP_TOOLS/apache2/cgi-bin"> - AllowOverride None - Options None - Order allow,deny - Allow from all -</Directory> - -IndexOptions FancyIndexing VersionSort -AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip - -AddIconByType (TXT,/icons/text.gif) text/* -AddIconByType (IMG,/icons/image2.gif) image/* -AddIconByType (SND,/icons/sound2.gif) audio/* -AddIconByType (VID,/icons/movie.gif) video/* - -AddIcon /icons/binary.gif .bin .exe -AddIcon /icons/binhex.gif .hqx -AddIcon /icons/tar.gif .tar -AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv -AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip -AddIcon /icons/a.gif .ps .ai .eps -AddIcon /icons/layout.gif .html .shtml .htm .pdf -AddIcon /icons/text.gif .txt -AddIcon /icons/c.gif .c -AddIcon /icons/p.gif .pl .py -AddIcon /icons/f.gif .for -AddIcon /icons/dvi.gif .dvi -AddIcon /icons/uuencoded.gif .uu -AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl -AddIcon /icons/tex.gif .tex -AddIcon /icons/bomb.gif core - -AddIcon /icons/back.gif .. -AddIcon /icons/hand.right.gif README -AddIcon /icons/folder.gif ^^DIRECTORY^^ -AddIcon /icons/blank.gif ^^BLANKICON^^ - -DefaultIcon /icons/unknown.gif - -ReadmeName README.html -HeaderName HEADER.html - -IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t -AddLanguage ca .ca -AddLanguage cs .cz .cs -AddLanguage da .dk -AddLanguage de .de -AddLanguage el .el -AddLanguage en .en -AddLanguage eo .eo -AddLanguage es .es -AddLanguage et .et -AddLanguage fr .fr -AddLanguage he .he -AddLanguage hr .hr -AddLanguage it .it -AddLanguage ja .ja -AddLanguage ko .ko -AddLanguage ltz .ltz -AddLanguage nl .nl -AddLanguage nn .nn -AddLanguage no .no -AddLanguage pl .po -AddLanguage pt .pt -AddLanguage pt-BR .pt-br -AddLanguage ru .ru -AddLanguage sv .sv -AddLanguage zh-CN .zh-cn -AddLanguage zh-TW .zh-tw - -LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW -ForceLanguagePriority Prefer Fallback -AddCharset ISO-8859-1 .iso8859-1 .latin1 -AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen -AddCharset ISO-8859-3 .iso8859-3 .latin3 -AddCharset ISO-8859-4 .iso8859-4 .latin4 -AddCharset ISO-8859-5 .iso8859-5 .latin5 .cyr .iso-ru -AddCharset ISO-8859-6 .iso8859-6 .latin6 .arb -AddCharset ISO-8859-7 .iso8859-7 .latin7 .grk -AddCharset ISO-8859-8 .iso8859-8 .latin8 .heb -AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk -AddCharset ISO-2022-JP .iso2022-jp .jis -AddCharset ISO-2022-KR .iso2022-kr .kis -AddCharset ISO-2022-CN .iso2022-cn .cis -AddCharset Big5 .Big5 .big5 -# For russian, more than one charset is used (depends on client, mostly): -AddCharset WINDOWS-1251 .cp-1251 .win-1251 -AddCharset CP866 .cp866 -AddCharset KOI8-r .koi8-r .koi8-ru -AddCharset KOI8-ru .koi8-uk .ua -AddCharset ISO-10646-UCS-2 .ucs2 -AddCharset ISO-10646-UCS-4 .ucs4 -AddCharset UTF-8 .utf8 -AddCharset GB2312 .gb2312 .gb -AddCharset utf-7 .utf7 -AddCharset utf-8 .utf8 -AddCharset big5 .big5 .b5 -AddCharset EUC-TW .euc-tw -AddCharset EUC-JP .euc-jp -AddCharset EUC-KR .euc-kr -AddCharset shift_jis .sjis - -AddType application/x-compress .Z -AddType application/x-gzip .gz .tgz -AddHandler type-map var - -BrowserMatch "Mozilla/2" nokeepalive -BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 -BrowserMatch "RealPlayer 4\.0" force-response-1.0 -BrowserMatch "Java/1\.0" force-response-1.0 -BrowserMatch "JDK/1\.0" force-response-1.0 - -BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully -BrowserMatch "^WebDrive" redirect-carefully -BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully -BrowserMatch "^gnome-vfs" redirect-carefully -<IfModule mod_ssl.c> - Include conf/ssl.conf -</IfModule> - - -LoadModule jk_module "REPLACED_RUBBOS_APP_TOOLS/apache2/modules/mod_jk.so" - -# Where to find workers.properties -JkWorkersFile REPLACED_RUBBOS_APP_TOOLS/apache2/conf/workers.properties - -# Where to put jk logs -JkLogFile REPLACED_RUBBOS_APP_TOOLS/apache2/logs/mod_jk.log - -# Set the jk log level [debug/error/info] -JkLogLevel info - -# Select the log format -JkLogStampFormat "[%a %b %d %H:%M:%S %Y] " - -# JkOptions indicate to send SSL KEY SIZE, -JkOptions +ForwardKeySize +ForwardURICompat -ForwardDirectories - -# JkRequestLogFormat set the request format -JkRequestLogFormat "%w %V %T" - -# Globally deny access to the WEB-INF directory -<LocationMatch '.*WEB-INF.*'> - AllowOverride None - deny from all -</LocationMatch> - -#Important: which requrests will be reouted to app server -JkMount /*/servlet/* worker1 -JkMount /*.jsp worker1 - -ServerName localhost diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/files/apache_conf/workers.properties b/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/files/apache_conf/workers.properties deleted file mode 100644 index cdf0a783..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/files/apache_conf/workers.properties +++ /dev/null @@ -1,64 +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 -############################################################################## - - -# workers.properties -# -# This file provides jk derived plugins with the needed information to -# connect to the different tomcat workers. Note that the distributed -# version of this file requires modification before it is usable by a -# plugin. -# - -# workers.tomcat_home should point to the location where you -# installed tomcat. This is where you have your conf, webapps and lib -# directories. -workers.tomcat_home=REPLACED_RUBBOS_APP_TOOLS/apache-tomcat-5.5.17 - -# workers.java_home should point to your Java installation. Normally -# you should have a bin and lib directories beneath it. -workers.java_home=REPLACED_RUBBOS_APP_TOOLS/jdk1.6.0_27 - -# You should configure your environment slash... ps=\ on NT and / on UNIX -# and maybe something different elsewhere. -ps=/ - - -# The workers that your plugins should create and work with -worker.list=worker1 - -# Here, it can be declared multiple session handlers, such as s1, s2 -REPLACED_HANDLERS_DETAILS -# examples: -#worker.s1.port=8009 -#worker.s1.host=btnks-2 -#worker.s1.type=ajp13 -#worker.s1.lbfactor=1 - -worker.worker1.type=lb -worker.worker1.balance_workers=REPLACED_HANDLERS -# example: -#worker.worker1.balance_workers=s1 -worker.worker1.sticky_session=True -worker.worker1.method=Session - -# Defining a worker named inprocess and of type jni -# Note that the name and the type do not have to match. -worker.inprocess.type=jni - -# Additional class path components. -worker.inprocess.class_path=$(workers.tomcat_home)$(ps)lib$(ps)tomcat.jar - -# Setting the command line for tomcat. -# Note: The cmd_line string may not contain spaces. -worker.inprocess.cmd_line=start - -worker.inprocess.jvm_lib=$(workers.java_home)$(ps)jre$(ps)lib$(ps)i386$(ps)server$(ps)libjvm.so -worker.inprocess.stdout=$(workers.tomcat_home)$(ps)logs$(ps)inprocess.stdout -worker.inprocess.stderr=$(workers.tomcat_home)$(ps)logs$(ps)inprocess.stderr diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_off.pp deleted file mode 100644 index 5d5f3839..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_off.pp +++ /dev/null @@ -1,85 +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_httpd::rubbos_httpd_off { - - include params::rubbos_params - - # Declare some variables - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - - # Ensure apache2 service is stopped - service {'stop apache http server': - ensure => stopped, - hasstatus => false, - status => "ps aux | grep 'bin/httpd.*start$'", - start => "${rubbos_app_tools}/apache2/bin/apachectl -f ${rubbos_app_tools}/apache2/conf/httpd.conf -k start", - stop => "${rubbos_app_tools}/apache2/bin/apachectl -f ${rubbos_app_tools}/apache2/conf/httpd.conf -k stop", - } - - # delete directory - file {'${rubbos_app_tools}/httpd-2.0.64.tar.gz': - ensure => absent, - path => "${rubbos_app_tools}/httpd-2.0.64.tar.gz", - force => true, - backup => false, - } - - file {'${rubbos_app_tools}/httpd-2.0.64': - ensure => absent, - path => "${rubbos_app_tools}/httpd-2.0.64", - force => true, - recurse => true, - backup => false, - require => Service['stop apache http server'], - } - - file {'${rubbos_app_tools}/tomcat-connectors-1.2.32-src.tar.gz': - ensure => absent, - path => "${rubbos_app_tools}/tomcat-connectors-1.2.32-src.tar.gz", - force => true, - backup => false, - } - - file {'${rubbos_app_tools}/tomcat-connectors-1.2.32-src': - ensure => absent, - path => "${rubbos_app_tools}/tomcat-connectors-1.2.32-src", - force => true, - recurse => true, - backup => false, - require => Service['stop apache http server'], - } - - # Delete apache2 directory - exec {'rm -rf ${rubbos_app_tools}/apache2': - cwd => "${rubbos_app_tools}/", - command => "rm -rf ${rubbos_app_tools}/apache2", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - onlyif => "test -d ${rubbos_app_tools}/apache2", - } - - # delete user and group - user {'apache': - name => "apache", - ensure => absent, - groups => "apache", - password => "apache", - require => [ - File['${rubbos_app_tools}/httpd-2.0.64'], - File['${rubbos_app_tools}/tomcat-connectors-1.2.32-src'], - Exec['rm -rf ${rubbos_app_tools}/apache2']], - } - group {'apache': - name => "apache", - ensure => absent, - require => User['apache'], - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_on.pp deleted file mode 100644 index cddbe34d..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_on.pp +++ /dev/null @@ -1,159 +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_httpd::rubbos_httpd_on { - - include params::rubbos_params - require rubbos_common::rubbos_common_on - - # Declare some variables - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - - # Prepare apache2 directory - exec {'mkdir ${rubbos_app_tools}/apache2': - command => "mkdir -p ${rubbos_app_tools}/apache2", - creates => "${rubbos_app_tools}/apache2", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - } - - # Prepare packages - file {'${rubbos_app_tools}/httpd-2.0.64.tar.gz': - ensure => present, - path => "${rubbos_app_tools}/httpd-2.0.64.tar.gz", - source => "puppet:///modules/rubbos_httpd/httpd-2.0.64.tar.gz", - } - - exec {'tar xzvf ${rubbos_app_tools}/httpd-2.0.64.tar.gz': - cwd => "${rubbos_app_tools}", - command => "tar xzvf ${rubbos_app_tools}/httpd-2.0.64.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => File['${rubbos_app_tools}/httpd-2.0.64.tar.gz'], - refreshonly => true, - } - - file {'${rubbos_app_tools}/tomcat-connectors-1.2.32-src.tar.gz': - ensure => present, - path => "${rubbos_app_tools}/tomcat-connectors-1.2.32-src.tar.gz", - source => "puppet:///modules/rubbos_httpd/tomcat-connectors-1.2.32-src.tar.gz", - } - - exec {'tar xzvf ${rubbos_app_tools}/tomcat-connectors-1.2.32-src.tar.gz': - cwd => "${rubbos_app_tools}", - command => "tar xzvf ${rubbos_app_tools}/tomcat-connectors-1.2.32-src.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => File['${rubbos_app_tools}/tomcat-connectors-1.2.32-src.tar.gz'], - refreshonly => true - } - - # Add user and group - group {'apache': - name => "apache", - ensure => present, - before => User['apache'], - } - user {'apache': - name => "apache", - ensure => present, - groups => "apache", - password => "apache", - before => Exec['${rubbos_app_tools}/httpd-2.0.64/configure'], - } - - # Install apache http server - exec {'${rubbos_app_tools}/httpd-2.0.64/configure': - cwd => "${rubbos_app_tools}/httpd-2.0.64", - command => "${rubbos_app_tools}/httpd-2.0.64/configure --prefix=${rubbos_app_tools}/apache2 --enable-module=so --enable-so --with-mpm=worker", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => Exec['tar xzvf ${rubbos_app_tools}/httpd-2.0.64.tar.gz'], - refreshonly => true, - } - - exec {'make httpd': - cwd => "${rubbos_app_tools}/httpd-2.0.64", - command => "make", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => Exec['${rubbos_app_tools}/httpd-2.0.64/configure'], - refreshonly => true, - } - - exec {'make install httpd': - cwd => "${rubbos_app_tools}/httpd-2.0.64", - command => "make install", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => Exec['make httpd'], - refreshonly => true, - } - - # Install mod jk - exec {'${rubbos_app_tools}/tomcat-connectors-1.2.32-src/native/configure': - cwd => "${rubbos_app_tools}/tomcat-connectors-1.2.32-src/native", - command => "${rubbos_app_tools}/tomcat-connectors-1.2.32-src/native/configure --with-apxs=${rubbos_app_tools}/apache2/bin/apxs --enable-jni --with-java-home=${rubbos_app_tools}/jdk1.6.0_27", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => [ - Exec['tar xzvf ${rubbos_app_tools}/tomcat-connectors-1.2.32-src.tar.gz'], - Exec['make install httpd']], - refreshonly => true, - } - - exec {'make mod jk': - cwd => "${rubbos_app_tools}/tomcat-connectors-1.2.32-src/native", - command => "make", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => Exec['${rubbos_app_tools}/tomcat-connectors-1.2.32-src/native/configure'], - refreshonly => true, - } - - exec {'make install mod jk': - cwd => "${rubbos_app_tools}/tomcat-connectors-1.2.32-src/native", - command => "make install", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => Exec['make mod jk'], - refreshonly => true, - } - - # Config apache http server - file {'${rubbos_app_tools}/apache2/conf/httpd.conf': - ensure => present, - path => "${rubbos_app_tools}/apache2/conf/httpd.conf", - source => "puppet:///modules/rubbos_httpd/apache_conf/httpd.conf", - show_diff => false, - subscribe => [Exec['make install httpd'],Exec['make install mod jk']], - } - - file {'${rubbos_app_tools}/apache2/conf/workers.properties': - ensure => present, - path => "${rubbos_app_tools}/apache2/conf/workers.properties", - source => "puppet:///modules/rubbos_httpd/apache_conf/workers.properties", - show_diff => false, - subscribe => [Exec['make install httpd'],Exec['make install mod jk']], - } - - file {'${rubbos_app_tools}/apache2/htdocs/rubbos': - ensure => present, - path => "${rubbos_app_tools}/apache2/htdocs/rubbos", - recurse => true, - source => "puppet:///modules/rubbos_httpd/apache_files/rubbos_html", - show_diff => false, - subscribe => [Exec['make install httpd'],Exec['make install mod jk']], - } - - # Ensure apache2 service is running - service {'apache http server': - ensure => running, - hasstatus => false, - status => "ps aux | grep 'bin/httpd.*start$'", - start => "${rubbos_app_tools}/apache2/bin/apachectl -f ${rubbos_app_tools}/apache2/conf/httpd.conf -k start", - stop => "${rubbos_app_tools}/apache2/bin/apachectl -f ${rubbos_app_tools}/apache2/conf/httpd.conf -k stop", - subscribe => [ - File['${rubbos_app_tools}/apache2/conf/httpd.conf'], - File['${rubbos_app_tools}/apache2/conf/workers.properties']], - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp deleted file mode 100644 index b7072311..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp +++ /dev/null @@ -1,53 +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_monitor::rubbos_monitor_off { - - include params::rubbos_params - - # Declare some variables - $rubbos_app = $params::rubbos_params::rubbos_app - $rubbos_home = $params::rubbos_params::rubbos_home - - # Make uninstall sysstat - exec {'make uninstall sysstat': - cwd => "${rubbos_app}/sysstat-9.0.6", - command => "make uninstall", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - onlyif => "test -d ${rubbos_app}/sysstat-9.0.6", - } - - # Remove sysstat-9.0.6 folder - file {'${rubbos_app}/sysstat-9.0.6': - ensure => absent, - path => "${rubbos_app}/sysstat-9.0.6", - force => true, - recurse => true, - backup => false, - require => Exec['make uninstall sysstat'], - } - - # Remove bench folder - file {'${rubbos_home}/bench.tar.gz': - ensure => absent, - path => "${rubbos_home}/bench.tar.gz", - backup => false, - } - - file {'${rubbos_home}/bench': - ensure => absent, - path => "${rubbos_home}/bench", - force => true, - recurse => true, - backup => false, - show_diff => false, - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_on.pp deleted file mode 100644 index b9dad5e1..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_on.pp +++ /dev/null @@ -1,110 +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_monitor::rubbos_monitor_on { - - include params::rubbos_params - require rubbos_common::rubbos_common_on - - # Declare some variables - $rubbos_app = $params::rubbos_params::rubbos_app - $rubbos_home = $params::rubbos_params::rubbos_home - $rubbos_os_username = $params::rubbos_params::rubbos_os_username - $rubbos_os_usergroup = $params::rubbos_params::rubbos_os_usergroup - - # Prepare the bench folder and related files - file {'${rubbos_home}/bench.tar.gz': - ensure => file, - path => "${rubbos_home}/bench.tar.gz", - source => "puppet:///modules/rubbos_monitor/bench.tar.gz", - backup => false, - } - - exec {'tar zxvf ${rubbos_home}/bench.tar.gz': - cwd => "${rubbos_home}", - command => "tar zxvf ${rubbos_home}/bench.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => File['${rubbos_home}/bench.tar.gz'], - } - - file {'flush_cache': - ensure => file, - path => "${rubbos_home}/bench/flush_cache", - source => "puppet:///modules/rubbos_monitor/flush_cache", - backup => false, - mode => 0755, - require => Exec['tar zxvf ${rubbos_home}/bench.tar.gz'], - } - - # Change owner and group for the bench folder - exec {'chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_home}/bench': - cwd => "${rubbos_home}", - command => "chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_home}/bench", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['flush_cache'], - } - - # Prepare cpu_mem.sh - file {'cpu_mem.sh': - ensure => file, - path => "${rubbos_app}/cpu_mem.sh", - source => "puppet:///modules/rubbos_monitor/cpu_mem.sh", - backup => false, - mode => 0755, - owner => "${rubbos_os_username}", - group => "${rubbos_os_usergroup}", - } - - # Prepare monitoring tool - file {'${rubbos_app}/sysstat-9.0.6.tar.gz': - ensure => file, - path => "${rubbos_app}/sysstat-9.0.6.tar.gz", - source => "puppet:///modules/rubbos_monitor/sysstat-9.0.6.tar.gz", - backup => false, - } - - exec {'tar xzvf ${rubbos_app}/sysstat-9.0.6.tar.gz': - cwd => "${rubbos_app}", - command => "tar xzvf ${rubbos_app}/sysstat-9.0.6.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_app}/sysstat-9.0.6.tar.gz'], - } - - # Build and install sysstat - exec {'configure sysstat': - cwd => "${rubbos_app}/sysstat-9.0.6", - command => "${rubbos_app}/sysstat-9.0.6/configure --prefix=${rubbos_app}/sysstat-9.0.6 --disable-nls", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['tar xzvf ${rubbos_app}/sysstat-9.0.6.tar.gz'], - } - - exec {'make sysstat': - cwd => "${rubbos_app}/sysstat-9.0.6", - command => "make", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['configure sysstat'], - } - - exec {'make install sysstat': - cwd => "${rubbos_app}/sysstat-9.0.6", - command => "make install", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['make sysstat'], - } - - # Change owner and group for the sysstat - exec {'chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_app}/sysstat-9.0.6': - cwd => "${rubbos_app}", - command => "chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_app}/sysstat-9.0.6", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['make install sysstat'], - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/files/prepare_rubbos_mysql_db.sh b/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/files/prepare_rubbos_mysql_db.sh deleted file mode 100755 index ee073684..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/files/prepare_rubbos_mysql_db.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -############################################################################# -# 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 -############################################################################## - - -## Usage: prepare_rubbos_mysql_db.sh rubbos_data_sql.tar.gz rubbos_data_sql_dir -## It is used for loading data into mysql database. -if [ ! -d '/usr/local/mysql' ] || [ $# -ne 2 ] || [ ! -f $1 ];then - echo "It requires: Mysql is installed, two arguments, and the second points to a data_sql file." - exit 1; -fi - -rubbos_mysql_db_compressed_file=$1 -rubbos_mysql_db_uncompressed_dir=$2 - -# clear database -echo "BEGIN RUBBOS DATABASE GIVE PRIVILEGES" -cat << EOF | /usr/local/mysql/bin/mysql -uroot - -DROP DATABASE IF EXISTS rubbos; - -CREATE DATABASE rubbos; - -GRANT ALL PRIVILEGES ON rubbos.* TO 'rubbos'@'%' \ - IDENTIFIED BY 'rubbos'; - flush privileges; -GRANT ALL PRIVILEGES ON rubbos.* TO 'rubbos'@'localhost' \ - IDENTIFIED BY 'rubbos'; - flush privileges; -EOF -echo "END RUBBOS DATABASE GIVE PRIVILEGES" - -# import sql data -echo "BEGIN IMPORT SQL DATA" -if [ -d '${rubbos_mysql_db_uncompressed_dir}' ]; then - rm -rf ${rubbos_mysql_db_uncompressed_dir} -fi -mkdir -p ${rubbos_mysql_db_uncompressed_dir} -tar zxvf ${rubbos_mysql_db_compressed_file} --directory ${rubbos_mysql_db_uncompressed_dir} -/usr/local/mysql/bin/mysql -uroot rubbos < ${rubbos_mysql_db_uncompressed_dir}/rubbos_data_sql -echo "END IMPORT SQL DATA" - -rm -rf ${rubbos_mysql_db_uncompressed_dir} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/manifests/rubbos_mysql_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/manifests/rubbos_mysql_off.pp deleted file mode 100644 index ec9a8717..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/manifests/rubbos_mysql_off.pp +++ /dev/null @@ -1,86 +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_mysql::rubbos_mysql_off { - - include params::rubbos_params - - # Declare some variables - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - $mysql_user_group = $params::rubbos_params::mysql_user_group - $mysql_user_name = $params::rubbos_params::mysql_user_name - $mysql_user_password = $params::rubbos_params::mysql_user_password - - file {'${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz': - path => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz", - ensure => absent, - backup => false, - } - - # Stop mysql - service {'stop mysql': - ensure => stopped, - hasstatus => false, - provider => "upstart", - status => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64/support-files/mysql.server status | grep 'MySQL running'", - start => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64/bin/mysqld_safe &", - stop => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64/bin/mysqladmin shutdown", - } - - file {'${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64': - ensure => absent, - path => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64", - force => true, - recurse => true, - backup => false, - require => Service['stop mysql'], - } - - file {'${rubbos_home}/prepare_rubbos_mysql_db.sh': - ensure => absent, - path => "${rubbos_home}/prepare_rubbos_mysql_db.sh", - backup => false, - show_diff => false, - require => Service['stop mysql'], - } - - # Remove user and group - user {'${mysql_user_name}': - name => "${mysql_user_name}", - ensure => absent, - groups => "${mysql_user_group}", - password => "${mysql_user_password}", - require => File['${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64'], - } - - group {'${mysql_user_group}': - name => "${mysql_user_group}", - ensure => absent, - require => User['${mysql_user_name}'], - } - - # Remove softlink - exec {'rm -rf /usr/local/mysql': - cwd => "/usr/local", - command => "rm -rf /usr/local/mysql", - onlyif => "test -h /usr/local/mysql", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Group['mysql'], - } - - # Remove packages - package {'libaio-dev': - ensure => absent, - } - package {'libaio1': - ensure => absent, - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/manifests/rubbos_mysql_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/manifests/rubbos_mysql_on.pp deleted file mode 100644 index 81d45427..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_mysql/manifests/rubbos_mysql_on.pp +++ /dev/null @@ -1,98 +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_mysql::rubbos_mysql_on { - - include params::rubbos_params - require rubbos_common::rubbos_common_on - - # Declare some variables - $rubbos_app = $params::rubbos_params::rubbos_app - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - $rubbos_home = $params::rubbos_params::rubbos_home - $mysql_user_group = $params::rubbos_params::mysql_user_group - $mysql_user_name = $params::rubbos_params::mysql_user_name - $mysql_user_password = $params::rubbos_params::mysql_user_password - - # Add group and user - group {'${mysql_user_group}': - name => "${mysql_user_group}", - ensure => present, - before => User['${mysql_user_name}'], - } - user {'${mysql_user_name}': - name => "${mysql_user_name}", - ensure => present, - groups => "${mysql_user_group}", - password => "${mysql_user_password}", - before => File['${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz'], - } - - # Prepare needed packages for mysql installation - package {'libaio-dev': - ensure => installed, - before => Exec['scripts/mysql_install_db --user=${mysql_user_name}'], - } - package {'libaio1': - ensure => installed, - before => Exec['scripts/mysql_install_db --user=${mysql_user_name}'], - } - - # Prepare and install mysql - file {'${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz': - path => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz", - ensure => present, - source => "puppet:///modules/rubbos_mysql/mysql-5.5.46-linux2.6-x86_64.tar.gz", - backup => false, - notify => Exec['tar -xf ${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz'], - } - - exec {'tar -xf ${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz': - cwd => "${rubbos_app_tools}", - command => "tar -xf ${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz", - creates => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64/scripts/mysql_install_db", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - } - - exec {'ln -s ${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64 mysql': - cwd => "/usr/local", - command => "ln -s ${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64 mysql", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => Exec['tar -xf ${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64.tar.gz'], - } - - exec {'scripts/mysql_install_db --user=${mysql_user_name}': - cwd => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64", - command => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64/scripts/mysql_install_db --user=${mysql_user_name}", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['ln -s ${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64 mysql'], - } - - # Prepare a script - file {'${rubbos_home}/prepare_rubbos_mysql_db.sh': - path => "${rubbos_home}/prepare_rubbos_mysql_db.sh", - ensure => present, - source => "puppet:///modules/rubbos_mysql/prepare_rubbos_mysql_db.sh", - backup => false, - show_diff => false, - } - - # Start mysql service - service {'mysql': - ensure => running, - hasstatus => false, - provider => upstart, - status => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64/support-files/mysql.server status | grep 'MySQL running'", - start => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64/bin/mysqld_safe &", - stop => "${rubbos_app_tools}/mysql-5.5.46-linux2.6-x86_64/bin/mysqladmin shutdown", - require => Exec['scripts/mysql_install_db --user=${mysql_user_name}'], - } - -} 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 "<b>RUBBoS (C)2001 Rice University/INRIA</b><br>" 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']], - } - -} |