hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viraj...@apache.org
Subject [03/29] hadoop git commit: HADOOP-14375. Remove tomcat support from hadoop-functions.sh. Contributed by John Zhuge.
Date Wed, 17 May 2017 20:15:26 GMT
HADOOP-14375. Remove tomcat support from hadoop-functions.sh. Contributed by John Zhuge.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a9e24a13
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a9e24a13
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a9e24a13

Branch: refs/heads/HDFS-9806
Commit: a9e24a13b7e3cdd92898d39ec5bf03382336e597
Parents: 1411612
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Fri May 12 08:48:51 2017 -0500
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Fri May 12 08:48:51 2017 -0500

----------------------------------------------------------------------
 .../src/main/bin/hadoop-functions.sh            | 24 ---------
 .../scripts/hadoop_finalize_catalina_opts.bats  | 56 --------------------
 2 files changed, 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9e24a13/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
index fb8e961..8ac1b0c 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
@@ -1457,30 +1457,6 @@ function hadoop_finalize_classpath
   hadoop_translate_cygwin_path CLASSPATH true
 }
 
-## @description  Finish Catalina configuration prior to execution
-## @audience     private
-## @stability    evolving
-## @replaceable  yes
-function hadoop_finalize_catalina_opts
-{
-
-  local prefix=${HADOOP_CATALINA_PREFIX}
-
-  hadoop_add_param CATALINA_OPTS hadoop.home.dir "-Dhadoop.home.dir=${HADOOP_HOME}"
-  if [[ -n "${JAVA_LIBRARY_PATH}" ]]; then
-    hadoop_add_param CATALINA_OPTS java.library.path "-Djava.library.path=${JAVA_LIBRARY_PATH}"
-  fi
-  hadoop_add_param CATALINA_OPTS "${prefix}.home.dir" "-D${prefix}.home.dir=${HADOOP_HOME}"
-  hadoop_add_param CATALINA_OPTS "${prefix}.config.dir" "-D${prefix}.config.dir=${HADOOP_CATALINA_CONFIG}"
-  hadoop_add_param CATALINA_OPTS "${prefix}.log.dir" "-D${prefix}.log.dir=${HADOOP_CATALINA_LOG}"
-  hadoop_add_param CATALINA_OPTS "${prefix}.temp.dir" "-D${prefix}.temp.dir=${HADOOP_CATALINA_TEMP}"
-  hadoop_add_param CATALINA_OPTS "${prefix}.admin.port" "-D${prefix}.admin.port=${HADOOP_CATALINA_ADMIN_PORT}"
-  hadoop_add_param CATALINA_OPTS "${prefix}.http.port" "-D${prefix}.http.port=${HADOOP_CATALINA_HTTP_PORT}"
-  hadoop_add_param CATALINA_OPTS "${prefix}.max.threads" "-D${prefix}.max.threads=${HADOOP_CATALINA_MAX_THREADS}"
-  hadoop_add_param CATALINA_OPTS "${prefix}.max.http.header.size" "-D${prefix}.max.http.header.size=${HADOOP_CATALINA_MAX_HTTP_HEADER_SIZE}"
-  hadoop_add_param CATALINA_OPTS "${prefix}.ssl.keystore.file" "-D${prefix}.ssl.keystore.file=${HADOOP_CATALINA_SSL_KEYSTORE_FILE}"
-}
-
 ## @description  Finish all the remaining environment settings prior
 ## @description  to executing Java.  This is a wrapper that calls
 ## @description  the other `finalize` routines.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9e24a13/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_finalize_catalina_opts.bats
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_finalize_catalina_opts.bats
b/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_finalize_catalina_opts.bats
deleted file mode 100644
index d91223e..0000000
--- a/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_finalize_catalina_opts.bats
+++ /dev/null
@@ -1,56 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load hadoop-functions_test_helper
-
-@test "hadoop_finalize_catalina_opts (raw)" {
-  local j
-
-  HADOOP_IS_CYGWIN=false
-  HADOOP_CATALINA_PREFIX=test
-  CATALINA_OPTS=""
-  hadoop_finalize_catalina_opts
-  for j in test.home.dir \
-        test.config.dir \
-        test.log.dir \
-        test.admin.port \
-        test.http.port \
-        test.max.threads \
-        test.ssl.keystore.file; do
-    [ "${CATALINA_OPTS#*${j}}" != "${CATALINA_OPTS}" ]
-  done
-}
-
-@test "hadoop_finalize_catalina_opts (cygwin)" {
-  local j
-
-  skip "catalina commands not supported under cygwin yet"
-
-  HADOOP_IS_CYGWIN=true
-  HADOOP_CATALINA_PREFIX=test
-  CATALINA_OPTS=""
-
-  catalina_translate_cygwin_path () {
-    eval ${1}="foobarbaz"
-  }
-
-  hadoop_finalize_catalina_opts
-  for j in test.home.dir \
-        test.config.dir \
-        test.log.dir \
-        test.ssl.keystore.file; do
-    [ "${CATALINA_OPTS#*${j}=foobarbaz}" != "${CATALINA_OPTS}" ]
-  done
-}
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message