You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2019/07/08 20:26:05 UTC
[bigtop] branch bigtop-alpha updated: bigtop-tomcat not needed any
more
This is an automated email from the ASF dual-hosted git repository.
oflebbe pushed a commit to branch bigtop-alpha
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/bigtop-alpha by this push:
new 4446d90 bigtop-tomcat not needed any more
4446d90 is described below
commit 4446d9062081040837ac3e71ef8f90d8fefabe14
Author: Olaf Flebbe <of...@oflebbe.de>
AuthorDate: Mon Jul 8 22:25:27 2019 +0200
bigtop-tomcat not needed any more
---
.../src/common/bigtop-tomcat/do-component-build | 28 -------
.../src/common/bigtop-tomcat/install_tomcat.sh | 90 ----------------------
bigtop-packages/src/deb/bigtop-tomcat/changelog | 1 -
bigtop-packages/src/deb/bigtop-tomcat/compat | 1 -
bigtop-packages/src/deb/bigtop-tomcat/control | 28 -------
bigtop-packages/src/deb/bigtop-tomcat/copyright | 15 ----
bigtop-packages/src/deb/bigtop-tomcat/rules | 36 ---------
.../src/deb/bigtop-tomcat/source/format | 1 -
.../src/rpm/bigtop-tomcat/BUILD/.gitignore | 0
.../src/rpm/bigtop-tomcat/RPMS/.gitignore | 0
.../src/rpm/bigtop-tomcat/SOURCES/.gitignore | 0
.../src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec | 60 ---------------
.../src/rpm/bigtop-tomcat/SRPMS/.gitignore | 0
13 files changed, 260 deletions(-)
diff --git a/bigtop-packages/src/common/bigtop-tomcat/do-component-build b/bigtop-packages/src/common/bigtop-tomcat/do-component-build
deleted file mode 100644
index 7480f24..0000000
--- a/bigtop-packages/src/common/bigtop-tomcat/do-component-build
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# 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.
-
-set -ex
-
-# This download may fail and is unneccesary
-sed -i '/<!-- Download NSIS (Nullsoft Scriptable Install System) -->/,+5d' build.xml
-mkdir dl
-#update to supported commons pool version
-ant -Dbase.path=dl -Dcommons-pool.version=1.6 clean download
-ant -Dbase.path=dl -Dcommons-pool.version=1.6
-ant -Dbase.path=dl -Dcommons-pool.version=1.6 -Dskip.installer=true -f dist.xml dist-static package-tgz
-
-mkdir build
-tar -C build --strip-components=1 -xzf output/release/v*/bin/apache-tomcat-*[0-9].tar.gz
diff --git a/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh b/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
deleted file mode 100644
index 88ef087..0000000
--- a/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-set -e
-
-usage() {
- echo "
-usage: $0 <options>
- Required not-so-options:
- --build-dir=DIR path to Tomcat dist.dir
- --prefix=PREFIX path to install into
-
- Optional options:
- --doc-dir=DIR path to install docs into [/usr/share/doc/bigtop-tomcat]
- --lib-dir=DIR path to install Tomcat home [/usr/lib/bigtop-tomcat]
- "
- exit 1
-}
-
-OPTS=$(getopt \
- -n $0 \
- -o '' \
- -l 'prefix:' \
- -l 'doc-dir:' \
- -l 'lib-dir:' \
- -l 'build-dir:' -- "$@")
-
-if [ $? != 0 ] ; then
- usage
-fi
-
-eval set -- "$OPTS"
-while true ; do
- case "$1" in
- --prefix)
- PREFIX=$2 ; shift 2
- ;;
- --build-dir)
- BUILD_DIR=$2 ; shift 2
- ;;
- --doc-dir)
- DOC_DIR=$2 ; shift 2
- ;;
- --lib-dir)
- LIB_DIR=$2 ; shift 2
- ;;
- --)
- shift ; break
- ;;
- *)
- echo "Unknown option: $1"
- usage
- exit 1
- ;;
- esac
-done
-
-for var in PREFIX BUILD_DIR ; do
- if [ -z "$(eval "echo \$$var")" ]; then
- echo Missing param: $var
- usage
- fi
-done
-
-DOC_DIR=${DOC_DIR:-/usr/share/doc/bigtop-tomcat}
-LIB_DIR=${LIB_DIR:-/usr/lib/bigtop-tomcat}
-
-# First we'll move everything into lib
-install -d -m 0755 $PREFIX/$LIB_DIR
-(cd $BUILD_DIR && tar -cf - .) | (cd $PREFIX/$LIB_DIR && tar -xf -)
-
-rm -rf $PREFIX/$LIB_DIR/webapps
-mv -f $PREFIX/$LIB_DIR/conf $PREFIX/$LIB_DIR/conf.template
-
-install -d -m 0755 $PREFIX/$DOC_DIR
-mv $PREFIX/$LIB_DIR/{RUNNING.txt,RELEASE-NOTES,NOTICE,LICENSE} $PREFIX/$DOC_DIR
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/changelog b/bigtop-packages/src/deb/bigtop-tomcat/changelog
deleted file mode 100644
index 547ed02..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/changelog
+++ /dev/null
@@ -1 +0,0 @@
---- This is auto-generated
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/compat b/bigtop-packages/src/deb/bigtop-tomcat/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/control b/bigtop-packages/src/deb/bigtop-tomcat/control
deleted file mode 100644
index 4c255d4..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/control
+++ /dev/null
@@ -1,28 +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.
-Source: bigtop-tomcat
-Section: misc
-Priority: extra
-Maintainer: Bigtop <de...@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.0
-Homepage: http://tomcat.apache.org/
-
-Package: bigtop-tomcat
-Architecture: all
-Depends: bigtop-utils (>= 0.7)
-Description: Apache Tomcat
- Apache Tomcat is an open source software implementation of the
- Java Servlet and JavaServer Pages technologies.
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/copyright b/bigtop-packages/src/deb/bigtop-tomcat/copyright
deleted file mode 100644
index 38645ff..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: http://tomcat.apache.org/
-Upstream-Name: Apache Tomcat
-
-Files: *
-Copyright: 2010-2011, The Apache Software Foundation
-License: Apache-2.0
-
-Files debian/*
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems, the complete text of the Apache 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/rules b/bigtop-packages/src/deb/bigtop-tomcat/rules
deleted file mode 100755
index cc490f1..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/rules
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/make -f
-#
-# 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.
-#
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-%:
- dh $@
-
-override_dh_auto_build:
- bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository
-
-override_dh_auto_install:
- bash -x debian/install_tomcat.sh \
- --build-dir=build \
- --doc-dir=/usr/share/doc/bigtop-tomcat \
- --prefix=debian/bigtop-tomcat
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/source/format b/bigtop-packages/src/deb/bigtop-tomcat/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/BUILD/.gitignore b/bigtop-packages/src/rpm/bigtop-tomcat/BUILD/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/RPMS/.gitignore b/bigtop-packages/src/rpm/bigtop-tomcat/RPMS/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/SOURCES/.gitignore b/bigtop-packages/src/rpm/bigtop-tomcat/SOURCES/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec b/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
deleted file mode 100644
index 1f4392b..0000000
--- a/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
+++ /dev/null
@@ -1,60 +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.
-%define lib_tomcat %{_usr}/lib/%{name}
-
-%if %{?suse_version:1}0
- %define doc_tomcat %{_docdir}/%{name}
-%else
- %define doc_tomcat %{_docdir}/%{name}-%{version}
-%endif
-
-Name: bigtop-tomcat
-Version: %{bigtop_tomcat_version}
-Release: %{bigtop_tomcat_release}
-Summary: Apache Tomcat
-URL: http://tomcat.apache.org/
-Group: Development/Libraries
-BuildArch: noarch
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-License: ASL 2.0
-Source0: apache-tomcat-%{bigtop_tomcat_base_version}.tar.gz
-Source1: do-component-build
-Source2: install_tomcat.sh
-Requires: bigtop-utils >= 0.7
-
-%description
-Apache Tomcat is an open source software implementation of the
-Java Servlet and JavaServer Pages technologies.
-
-%prep
-%setup -n apache-tomcat-%{bigtop_tomcat_base_version}-src
-
-%build
-bash %{SOURCE1}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-bash %{SOURCE2} \
- --build-dir=build \
- --doc-dir=%{doc_tomcat} \
- --prefix=$RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%attr(0755,root,root) %{lib_tomcat}
-%doc %{doc_tomcat}
-
-%changelog
-
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/SRPMS/.gitignore b/bigtop-packages/src/rpm/bigtop-tomcat/SRPMS/.gitignore
deleted file mode 100644
index e69de29..0000000