You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2014/02/04 00:47:11 UTC
git commit: Revert "BIGTOP-1097. introduce bigtop-groovy package"
Updated Branches:
refs/heads/master 40b398553 -> 5444fd2c6
Revert "BIGTOP-1097. introduce bigtop-groovy package"
This reverts commit 553a6ca128dbb62862a0d456f765250dac7b8371.
I did it again - removing the commit from master and moving it away from
tracking branch into my own feature branch. I am sorry.
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5444fd2c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5444fd2c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5444fd2c
Branch: refs/heads/master
Commit: 5444fd2c67dc854c3c76e7bf7b1e77847182a11a
Parents: 40b3985
Author: Konstantin Boudnik <co...@apache.org>
Authored: Mon Feb 3 15:46:36 2014 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Mon Feb 3 15:46:36 2014 -0800
----------------------------------------------------------------------
.../src/common/bigtop-groovy/do-component-build | 19 ----
.../src/common/bigtop-groovy/install_groovy.sh | 108 -------------------
.../src/deb/bigtop-groovy/bigtop-groovy.install | 4 -
.../deb/bigtop-groovy/bigtop-groovy.postinst | 36 -------
bigtop-packages/src/deb/bigtop-groovy/changelog | 1 -
bigtop-packages/src/deb/bigtop-groovy/compat | 1 -
bigtop-packages/src/deb/bigtop-groovy/control | 27 -----
bigtop-packages/src/deb/bigtop-groovy/copyright | 15 ---
bigtop-packages/src/deb/bigtop-groovy/rules | 39 -------
.../src/deb/bigtop-groovy/source/format | 1 -
.../src/rpm/bigtop-groovy/SPECS/.gitignore | 0
.../rpm/bigtop-groovy/SPECS/bigtop-groovy.spec | 60 -----------
.../package/src/main/resources/package_data.xml | 12 ---
bigtop.mk | 13 ---
14 files changed, 336 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/common/bigtop-groovy/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/bigtop-groovy/do-component-build b/bigtop-packages/src/common/bigtop-groovy/do-component-build
deleted file mode 100644
index def8791..0000000
--- a/bigtop-packages/src/common/bigtop-groovy/do-component-build
+++ /dev/null
@@ -1,19 +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
-
-. `dirname ${0}`/bigtop.bom
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh b/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
deleted file mode 100755
index c5a819a..0000000
--- a/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash -x
-# 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
-
-usage() {
- echo "
-usage: $0 <options>
- Required not-so-options:
- --build-dir=DIR path to hive/build/dist
- --prefix=PREFIX path to install into
- "
- exit 1
-}
-
-OPTS=$(getopt \
- -n $0 \
- -o '' \
- -l 'prefix:' \
- -l 'version:' \
- -l 'build-dir:' \
- -l 'lib-dir:' \
- -l 'bin-dir:' \
- -l 'conf-dir:' \
- -- "$@")
-
-if [ $? != 0 ] ; then
- usage
-fi
-
-eval set -- "$OPTS"
-while true ; do
- case "$1" in
- --prefix)
- PREFIX=$2 ; shift 2
- ;;
- --version)
- VERSION=$2 ; shift 2
- ;;
- --build-dir)
- BUILD_DIR=$2 ; shift 2
- ;;
- --bin-dir)
- BIN_DIR=$2 ; shift 2
- ;;
- --lib-dir)
- LIB_DIR=$2 ; shift 2
- ;;
- --conf-dir)
- CONF_DIR=$2 ; shift 2
- ;;
- --doc-dir)
- DOC_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
-
-. `dirname ${0}`/bigtop.bom
-
-BIN_DIR=${BIN_DIR:-/usr/lib/bigtop-groovy/bin}
-CONF_DIR=${CONF_DIR:-/usr/lib/bigtop-groovy/conf}
-LIB_DIR=${LIB_DIR:-/usr/lib/bigtop-groovy/lib}
-echo ${BIGTOP_GROOVY_BASE_VERSION}
-
-#bin
-install -d -m 0755 ${PREFIX}/${BIN_DIR}
-cp ${BUILD_DIR}/bin/startGroovy ${PREFIX}/${BIN_DIR}
-cp ${BUILD_DIR}/bin/groovy ${PREFIX}/${BIN_DIR}
-
-# lib
-install -d -m 0755 ${PREFIX}/${LIB_DIR}
-cp ${BUILD_DIR}/lib/groovy-${BIGTOP_GROOVY_VERSION}.jar ${PREFIX}/${LIB_DIR}
-cp ${BUILD_DIR}/embeddable/groovy-all-${BIGTOP_GROOVY_VERSION}.jar ${PREFIX}/${LIB_DIR}
-cp ${BUILD_DIR}/lib/commons-cli-1.2.jar ${PREFIX}/${LIB_DIR}
-cp ${BUILD_DIR}/lib/asm*.jar ${PREFIX}/${LIB_DIR}
-cp ${BUILD_DIR}/lib/antlr*.jar ${PREFIX}/${LIB_DIR}
-
-#conf
-install -d -m 0755 ${PREFIX}/${CONF_DIR}
-cp ${BUILD_DIR}/conf/groovy-starter.conf ${PREFIX}/${CONF_DIR}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.install b/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.install
deleted file mode 100644
index 625ae2e..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.install
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/lib/bigtop-groovy
-/usr/lib/bigtop-groovy/bin
-/usr/lib/bigtop-groovy/conf
-/usr/lib/bigtop-groovy/lib
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst b/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
deleted file mode 100644
index 29db417..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
+++ /dev/null
@@ -1,36 +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.
-
-# postinst script for bigtop-groovy
-
-set -e
-
-case "$1" in
- configure)
- chmod 0755 /usr/lib/bigtop-groovy/bin/*
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/deb/bigtop-groovy/changelog
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/changelog b/bigtop-packages/src/deb/bigtop-groovy/changelog
deleted file mode 100755
index 547ed02..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/changelog
+++ /dev/null
@@ -1 +0,0 @@
---- This is auto-generated
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/deb/bigtop-groovy/compat
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/compat b/bigtop-packages/src/deb/bigtop-groovy/compat
deleted file mode 100755
index 7f8f011..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/deb/bigtop-groovy/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/control b/bigtop-packages/src/deb/bigtop-groovy/control
deleted file mode 100755
index fe8469c..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/control
+++ /dev/null
@@ -1,27 +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-groovy
-Section: misc
-Priority: extra
-Maintainer: Bigtop <de...@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.0
-Homepage: http://groovy.codehaus.org/
-
-Package: bigtop-groovy
-Architecture: any
-Depends: bigtop-utils (>= 0.7)
-Description: Groovy provides a JVM based runtime environment
- for function programming and scripting.Application to launch java daemon
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/deb/bigtop-groovy/copyright
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/copyright b/bigtop-packages/src/deb/bigtop-groovy/copyright
deleted file mode 100755
index 35ed5ff..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: http://commons.apache.org/daemon/
-Upstream-Name: Apache Commons Daemon
-
-Files: *
-Copyright: 2008-2012, The Apache Software Foundation
-License: Apache-2.0
-
-Files debian/*
-Copyright: 2012, 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".
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/deb/bigtop-groovy/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/rules b/bigtop-packages/src/deb/bigtop-groovy/rules
deleted file mode 100755
index f4cd744..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/rules
+++ /dev/null
@@ -1,39 +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=-s
-
-%:
- dh $@
-
-override_dh_auto_build:
- bash debian/do-component-build
-
-override_dh_auto_install:
- sh -x debian/install_groovy.sh \
- --build-dir=. \
- --prefix=debian/tmp \
- --bin-dir=usr/lib/bigtop-groovy/bin \
- --version=%{bigtop_groovy_version} \
- --lib-dir=usr/lib/bigtop-groovy/lib \
- --conf-dir=usr/lib/bigtop-groovy/conf
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/deb/bigtop-groovy/source/format
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/source/format b/bigtop-packages/src/deb/bigtop-groovy/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/bigtop-packages/src/deb/bigtop-groovy/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/rpm/bigtop-groovy/SPECS/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/bigtop-groovy/SPECS/.gitignore b/bigtop-packages/src/rpm/bigtop-groovy/SPECS/.gitignore
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-packages/src/rpm/bigtop-groovy/SPECS/bigtop-groovy.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/bigtop-groovy/SPECS/bigtop-groovy.spec b/bigtop-packages/src/rpm/bigtop-groovy/SPECS/bigtop-groovy.spec
deleted file mode 100644
index b686adb..0000000
--- a/bigtop-packages/src/rpm/bigtop-groovy/SPECS/bigtop-groovy.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 bin_groovy /usr/lib/bigtop-groovy
-
-Name: bigtop-groovy
-Version: %{bigtop_groovy_version}
-Release: %{bigtop_groovy_release}
-Summary: An agile and dynamic language for the Java Virtual Machine
-URL: http://groovy.codehaus.org/
-Group: Development/Libraries
-Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
-BuildArch: noarch
-License: ASL 2.0
-Source0: groovy-binary-%{bigtop_groovy_base_version}.zip
-Source1: do-component-build
-Source2: install_groovy.sh
-Requires: bigtop-utils >= 0.7
-
-%description
-Groovy provides a JVM based runtime environment for function programming and scripting.
-
-%prep
-%setup -n groovy-%{bigtop_groovy_base_version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%build
-bash %{SOURCE1}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-sh %{SOURCE2} \
- --build-dir=. \
- --bin-dir=%{bin_groovy}/bin \
- --version=%{bigtop_groovy_version} \
- --lib-dir=%{bin_groovy}/lib \
- --conf-dir=%{bin_groovy}/conf \
- --prefix=$RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%{bin_groovy}
-%attr(0775,root,root) %{bin_groovy}/bin/*
-
-%changelog
-
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
index 9cbbbfe..3eb24f7 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
@@ -30,18 +30,6 @@
<url>http://commons.apache.org/daemon/</url>
</metadata>
</bigtop-jsvc>
-
- <bigtop-jsvc>
- <metadata>
- <summary>An agile and dynamic language for the Java Virtual Machine</summary>
- <description>Groovy provides a JVM based runtime environment for function programming and scripting.</description>
- <url>http://groovy.codehaus.org/</url>
- </metadata>
- <deps>
- <bigtop-utils/>
- </deps>
- </bigtop-jsvc>
-
<bigtop-tomcat>
<metadata>
<summary>Apache Tomcat</summary>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5444fd2c/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 5644a75..36bd415 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -249,19 +249,6 @@ PHOENIX_SITE=https://github.com/forcedotcom/phoenix/archive
PHOENIX_ARCHIVE=$(PHOENIX_SITE)
$(eval $(call PACKAGE,phoenix,PHOENIX))
-# Groovy
-BIGTOP_GROOVY_NAME=bigtop-groovy
-BIGTOP_GROOVY_RELNOTES_NAME=Grovvy: a dynamic language for the Java platform
-BIGTOP_GROOVY_PKG_NAME=bigtop-groovy
-BIGTOP_GROOVY_BASE_VERSION=2.2.1
-BIGTOP_GROOVY_PKG_VERSION=2.2.1
-BIGTOP_GROOVY_RELEASE_VERSION=1
-BIGTOP_GROOVY_TARBALL_DST=groovy-binary-$(BIGTOP_GROOVY_BASE_VERSION).zip
-BIGTOP_GROOVY_TARBALL_SRC=$(BIGTOP_GROOVY_TARBALL_DST)
-BIGTOP_GROOVY_SITE=http://dist.groovy.codehaus.org/distributions/
-BIGTOP_GROOVY_ARCHIVE=$(BIGTOP_GROOVY_SITE)
-$(eval $(call PACKAGE,bigtop-groovy,BIGTOP_GROOVY))
-
# Bigtop-utils
BIGTOP_UTILS_NAME=bigtop-utils
BIGTOP_UTILS__RELNOTES_NAME=Bigtop-utils