[arch-commits] Commit in (10 files)
Guillaume Alaux
guillaume at archlinux.org
Thu Aug 7 19:11:10 UTC 2014
Date: Thursday, August 7, 2014 @ 21:11:09
Author: guillaume
Revision: 219476
First add of java common files package
Added:
java-common/
java-common/repos/
java-common/trunk/
java-common/trunk/PKGBUILD
java-common/trunk/bin_archlinux-java
java-common/trunk/bin_java-common-wrapper
java-common/trunk/install_java-common.sh
java-common/trunk/profile_jre.csh
java-common/trunk/profile_jre.sh
java-common/trunk/test_archlinux-java
-------------------------+
PKGBUILD | 41 ++++++
bin_archlinux-java | 184 +++++++++++++++++++++++++++++
bin_java-common-wrapper | 2
install_java-common.sh | 11 +
profile_jre.csh | 6
profile_jre.sh | 6
test_archlinux-java | 287 ++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 537 insertions(+)
Added: java-common/trunk/PKGBUILD
===================================================================
--- java-common/trunk/PKGBUILD (rev 0)
+++ java-common/trunk/PKGBUILD 2014-08-07 19:11:09 UTC (rev 219476)
@@ -0,0 +1,41 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgname=java-common
+pkgver=1
+pkgrel=2
+pkgdesc='Common files for Java Environments'
+arch=('any')
+url='www.archlinux.org'
+license=('GPL')
+checkdepends=('wget')
+backup=(etc/profile.d/jre.sh
+ etc/profile.d/jre.csh)
+# TODO remove after a while
+replaces=('java-runtime-headless-meta' 'java-runtime-meta' 'java-environment-meta')
+install=install_java-common.sh
+source=(profile_jre.csh
+ profile_jre.sh
+ bin_archlinux-java
+ test_archlinux-java
+ bin_java-common-wrapper
+ https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz)
+
+sha256sums=('06465b5c0507cb6c500c4f9cbd93e2fadaafe37b9e814b9687e1ee94fec0de73'
+ '458eced6d2846805fbc18ca2ba717bf5f0556cc93a442b485c81fe12a4f6e5b6'
+ '5f3d1ac5de7018344fc813a1a0a8b4afe15888bfdc3b8190378b463f408c2eda'
+ '0dd93c9779c617af061b25f5e3d23cacb741d8d757f533312c3af976661e8cbc'
+ '622927af9ec374140a878993936f7fdd4206fe069dddfcefc6d4e15fa6d67f39'
+ '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee')
+
+check() {
+ cd "${srcdir}"
+ ./test_archlinux-java
+}
+
+build() {
+ cd "${srcdir}"
+
+ install -D -m 644 profile_jre.sh "${pkgdir}/etc/profile.d/jre.sh"
+ install -D -m 644 profile_jre.csh "${pkgdir}/etc/profile.d/jre.csh"
+ install -D -m 755 bin_java-common-wrapper "${pkgdir}/usr/lib/java-common-wrapper"
+ install -D -m 755 bin_archlinux-java "${pkgdir}/usr/bin/archlinux-java"
+}
Property changes on: java-common/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: java-common/trunk/bin_archlinux-java
===================================================================
--- java-common/trunk/bin_archlinux-java (rev 0)
+++ java-common/trunk/bin_archlinux-java 2014-08-07 19:11:09 UTC (rev 219476)
@@ -0,0 +1,184 @@
+#! /bin/bash
+
+# Arch Linux helper script to set/unset/check/fix the enabled Java environment
+# This program may be freely redistributed under the terms of the GNU General Public License
+#
+# Author: Guillaume ALAUX <guillaume at archlinux.org>
+
+JVM_DIR=/usr/lib/jvm
+DEFAULT_NAME=java-default-runtime
+DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME}
+BIN_PATH=/usr/bin
+WRAPPER_PATH=/usr/lib/java-common-wrapper
+
+
+# Utility functions
+
+check_root() {
+ if [ $(id -u) -ne 0 ]; then
+ echo 'This script must be run as root'
+ exit 1
+ fi
+}
+
+# $1: parameter count given to this script for this option
+# $2: expected parameter count for this option
+check_param_count() {
+ if [ $1 -ne $2 ]; then
+ echo 'Wrong parameter count'
+ exit 2
+ fi
+}
+
+# Second level functions
+
+get_default_java() {
+ path=$(readlink -e ${DEFAULT_PATH})
+ echo ${path/${JVM_DIR}\/}
+}
+
+get_installed_javas() {
+ if [ -d ${JVM_DIR} ]; then
+ for dir in $(find ${JVM_DIR} -mindepth 1 -maxdepth 1 -type d | sort); do
+ if [ -x ${dir}/bin/javac ]; then
+ javas+=(${dir/${JVM_DIR}\/})
+ else
+ if [ -x ${dir}/jre/bin/java ]; then
+ javas+=(${dir/${JVM_DIR}\/}/jre)
+ fi
+ fi
+ done
+ fi
+ echo ${javas[@]}
+}
+
+# $1: Java environment name to test
+is_java_valid() {
+ test "x$1" != "x${DEFAULT_NAME}" && test -x ${JVM_DIR}/$1/bin/java
+}
+
+set_bin_links() {
+ find ${DEFAULT_PATH}/bin ! -type d -perm /a=x \
+ | while read bpath; do
+ ln -sf ${WRAPPER_PATH} ${BIN_PATH}/$(basename ${bpath}) > /dev/null 2>&1
+ done
+}
+
+unset_bin_links() {
+ find -L ${BIN_PATH} -samefile ${WRAPPER_PATH} \
+ | while read lpath; do
+ unlink ${lpath}
+ done
+}
+
+# $1: Java environment name to set as default
+set_default_link_to() {
+ unlink ${DEFAULT_PATH} 2>/dev/null
+ ln -sf $1 ${DEFAULT_PATH}
+}
+
+unset_default_link() {
+ unlink ${DEFAULT_PATH} 2>/dev/null
+}
+
+# First level functions
+
+do_status() {
+ installed_java=($(get_installed_javas))
+ if [ ${#installed_java[@]} -eq 0 ]; then
+ echo 'No compatible Java environment installed'
+ else
+ default_java=$(get_default_java)
+ echo 'Available Java environments:'
+ for java in ${installed_java[@]}; do
+ if [ ${java} = "${default_java}" ]; then
+ echo -e " ${java} (default)"
+ else
+ echo " ${java}"
+ fi
+ done
+ if [ -z ${default_java} ]; then
+ echo "No Java environment set as default"
+ fi
+ fi
+}
+
+do_get() {
+ get_default_java
+}
+
+# $1: Java environment name to set as default
+do_set() {
+ if ! is_java_valid $1; then
+ echo "'${JVM_DIR}/$1' is not a valid Java environment path"
+ exit 1
+ fi
+ default=$(get_default_java)
+ if [ "x$1" != "x${default}" ] || ! is_java_valid ${default}; then
+ unset_default_link
+ unset_bin_links
+ set_default_link_to $1
+ fi
+ set_bin_links
+
+ #parent_dir=$(dirname $1)
+ #if is_java_valid ${parent_dir}; then
+ # echo "Warning: '${parent_dir}' looks like a valid JDK whereas '$1' is set as default"
+ # echo "Fix this with 'archlinux-java set ${parent_dir}'"
+ #fi
+}
+
+# $1: Java environment name to unset
+do_unset() {
+ unset_default_link
+ unset_bin_links
+}
+
+do_fix() {
+ default=$(get_default_java)
+ if is_java_valid ${default}; then
+ if is_java_valid $(dirname ${default}); then
+ unset_default_link
+ set_default_link_to $(dirname ${default})
+ fi
+ unset_bin_links
+ set_bin_links
+ else
+ prev=$(readlink ${DEFAULT_PATH})
+ unset_default_link
+ unset_bin_links
+ prev_fix=("${prev/\/jre}" "${prev}/jre")
+ openjdk7=('java-7-openjdk' 'java-7-openjdk/jre')
+ to_check=(${prev_fix[@]} ${openjdk7[@]} $(get_installed_javas))
+ for java in ${to_check[@]}; do
+ if ! is_java_valid $(get_default_java) && is_java_valid ${java}; then
+ set_default_link_to ${java}
+ set_bin_links
+ fi
+ done
+ fi
+ if ! is_java_valid $(get_default_java); then
+ echo 'No valid Java environment found'
+ fi
+}
+
+usage() {
+ echo "$(basename $0) <COMMAND>"
+ echo -e "\nCOMMAND:"
+ echo -e '\tstatus\t\tList installed Java environments and enabled one'
+ echo -e '\tget\t\tReturns the short name of the Java environment set as default'
+ echo -e '\tset <JAVA_ENV>\tForce <JAVA_ENV> as default'
+ echo -e '\tunset\t\tUnset current default Java environment'
+ echo -e '\tfix\t\tFix an invalid/broken default Java environment configuration'
+}
+
+## Main
+case $1 in
+ 'status') do_status;;
+ 'get') do_get;;
+ 'set') check_root; check_param_count $# 2; do_set $2;;
+ 'unset') check_root; do_unset;;
+ 'fix') check_root; do_fix;;
+ 'help' | '--help' | '-h' | '') usage;;
+ *) echo "$(basename $0): unknown option '$@'"; exit 1;;
+esac
Property changes on: java-common/trunk/bin_archlinux-java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: java-common/trunk/bin_java-common-wrapper
===================================================================
--- java-common/trunk/bin_java-common-wrapper (rev 0)
+++ java-common/trunk/bin_java-common-wrapper 2014-08-07 19:11:09 UTC (rev 219476)
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec "${JAVA_HOME:-/usr/lib/jvm/java-default-runtime}/bin/${0##*/}" "$@"
Property changes on: java-common/trunk/bin_java-common-wrapper
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: java-common/trunk/install_java-common.sh
===================================================================
--- java-common/trunk/install_java-common.sh (rev 0)
+++ java-common/trunk/install_java-common.sh 2014-08-07 19:11:09 UTC (rev 219476)
@@ -0,0 +1,11 @@
+post_install() {
+ echo 'Installing multiple non-conflicting Java environments is now supported'
+ echo 'Check the following wiki section for more info:'
+ echo ' https://wiki.archlinux.org/index.php/Java#Multiple_official_Java_environments'
+ echo 'Please make sure JAVA_HOME is set to /usr/lib/jvm/java-default-runtime'
+ echo 'If not, you may have to logout and login again to set it according to /etc/profile.d/jre.sh'
+}
+
+post_upgrade() {
+ post_install "$@"
+}
Added: java-common/trunk/profile_jre.csh
===================================================================
--- java-common/trunk/profile_jre.csh (rev 0)
+++ java-common/trunk/profile_jre.csh 2014-08-07 19:11:09 UTC (rev 219476)
@@ -0,0 +1,6 @@
+# Do not change this unless you want to completely by-pass Arch Linux' way
+# of handling Java versions and vendors. Instead, please use script `archlinux-java`
+setenv JAVA_HOME "/usr/lib/jvm/java-default-runtime"
+
+# Enable this for non-reparenting window managers
+#export _JAVA_AWT_WM_NONREPARENTING=1
Added: java-common/trunk/profile_jre.sh
===================================================================
--- java-common/trunk/profile_jre.sh (rev 0)
+++ java-common/trunk/profile_jre.sh 2014-08-07 19:11:09 UTC (rev 219476)
@@ -0,0 +1,6 @@
+# Do not change this unless you want to completely by-pass Arch Linux' way
+# of handling Java versions and vendors. Instead, please use script `archlinux-java`
+export JAVA_HOME=/usr/lib/jvm/java-default-runtime
+
+# Enable this for non-reparenting window managers
+#export _JAVA_AWT_WM_NONREPARENTING=1
Added: java-common/trunk/test_archlinux-java
===================================================================
--- java-common/trunk/test_archlinux-java (rev 0)
+++ java-common/trunk/test_archlinux-java 2014-08-07 19:11:09 UTC (rev 219476)
@@ -0,0 +1,287 @@
+#! /bin/sh
+#
+# To run this script, ensure shunit2 (https://code.google.com/p/shunit2/)
+# is available on the local directory, then just run sh bin_archlinux-java_tests
+#
+# inotifywait -r -m -e MODIFY . | while read l; do sh bin_archlinux-java_tests; done
+
+declare test_dir
+
+. ./bin_archlinux-java > /dev/null
+
+INIT_JVM_DIR=${JVM_DIR}
+INIT_DEFAULT_PATH=${DEFAULT_PATH}
+INIT_BIN_PATH=${BIN_PATH}
+INIT_WRAPPER_PATH=${WRAPPER_PATH}
+
+# Redefining this so that tested script can be invoked without root privileges
+check_root() {
+ true
+}
+
+
+get_rand_str() {
+ echo $(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 10 | head -n 1)
+}
+
+setUp() {
+ test_dir=$(mktemp -d)
+ JVM_DIR=${test_dir}${INIT_JVM_DIR}
+ DEFAULT_PATH=${test_dir}${INIT_DEFAULT_PATH}
+ JAVA_NAME=$(get_rand_str)
+ BIN_PATH=${test_dir}${INIT_BIN_PATH}
+ mkdir -p ${BIN_PATH}
+ WRAPPER_PATH=${test_dir}${INIT_WRAPPER_PATH}
+ mkdir -p $(dirname ${WRAPPER_PATH})
+ touch ${WRAPPER_PATH}
+ chmod +x ${WRAPPER_PATH}
+}
+
+tearDown() {
+ rm -rf ${test_dir}
+}
+
+# $1: path of Java environment to create
+create_valid_jre_env() {
+ mkdir -p ${JVM_DIR}/$1/bin
+ for binary in java keytool orbd; do
+ touch ${JVM_DIR}/$1/bin/${binary}
+ chmod +x ${JVM_DIR}/$1/bin/${binary}
+ done
+}
+
+# $1: path of Java environment to create
+create_valid_jdk_env() {
+ create_valid_jre_env "$1"
+ for binary in javac javah jhat; do
+ touch ${JVM_DIR}/$1/bin/${binary}
+ chmod +x ${JVM_DIR}/$1/bin/${binary}
+ done
+ create_valid_jre_env "$1/jre"
+}
+
+set_default_for_test() {
+ ln -s $1 ${DEFAULT_PATH}
+ for binary in java keytool orbd; do
+ ln -s ${WRAPPER_PATH} ${BIN_PATH}/${binary}
+ done
+ if [ -d ${DEFAULT_PATH}/jre ]; then
+ for binary in javac javah jhat; do
+ ln -s ${WRAPPER_PATH} ${BIN_PATH}/${binary}
+ done
+ fi
+}
+
+assertDefaultNotSet() {
+ assertNull 'Default is set' "$(readlink ${DEFAULT_PATH})"
+ assertNull "PATH has a java binary" "$(readlink ${BIN_PATH}/java)"
+ assertNull "PATH has a javac binary" "$(readlink ${BIN_PATH}/javac)"
+}
+
+assertDefaultSetTo() {
+ new_java=$1
+ assertEquals "Default points at wrong Java env" "${new_java}" "$(readlink ${DEFAULT_PATH})"
+ # For all links in /usr/bin that point at the wrapper
+ for lpath in $(find -L ${BIN_PATH} -samefile ${WRAPPER_PATH}); do
+ # There is a binary in the JVM bin dir
+ assertTrue 'Wrong /usr/bin link' "test -x ${JVM_DIR}/${new_java}/bin/$(basename ${lpath})"
+ done
+ # For all executable binaries provided by the Java env
+ for binary in $(find ${JVM_DIR}/${new_java}/bin -type f -perm /a=x); do
+ # There is a link in /usr/bin
+ bin_link=${BIN_PATH}/$(basename ${binary})
+ assertEquals 'No link in /usr/bin' "${WRAPPER_PATH}" "$(readlink ${bin_link})"
+ done
+}
+
+# do_status
+
+test_do_status() {
+ JAVA_NAME_1="a$(get_rand_str)"
+ JAVA_NAME_2="b$(get_rand_str)"
+ create_valid_jre_env "${JAVA_NAME_1}/jre"
+ set_default_for_test "${JAVA_NAME_1}/jre"
+ create_valid_jdk_env "${JAVA_NAME_2}"
+ expected=$(echo -e "Available Java environments:\n ${JAVA_NAME_1}/jre (default)\n ${JAVA_NAME_2}")
+ assertEquals 'Wrong status output' "${expected}" "$(do_status)"
+}
+
+test_do_status_no_default() {
+ JAVA_NAME_1="a$(get_rand_str)"
+ JAVA_NAME_2="b$(get_rand_str)"
+ create_valid_jre_env "${JAVA_NAME_1}/jre"
+ create_valid_jdk_env "${JAVA_NAME_2}"
+ mess="Available Java environments:"
+ mess+="\n ${JAVA_NAME_1}/jre"
+ mess+="\n ${JAVA_NAME_2}"
+ mess+="\nNo Java environment set as default"
+ expected=$(echo -e "${mess}")
+ assertEquals 'Wrong status output' "${expected}" "$(do_status)"
+}
+
+test_do_status_no_javas() {
+ assertEquals 'Wrong status output' 'No compatible Java environment installed' "$(do_status)"
+}
+
+# do_get
+
+test_do_get_with_default() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "${JAVA_NAME}"
+ assertEquals 'Wrong result' "${JAVA_NAME}" "$(do_get)"
+ assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_get_without_default() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ assertNull 'Wrong result' "$(do_get)"
+}
+
+# do_set
+
+test_do_set_new_invalid() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "${JAVA_NAME}"
+ output=$(do_set "INVALID")
+ assertEquals 'Wrong status returned' 1 $?
+ assertEquals 'Wrong message' "'${JVM_DIR}/INVALID' is not a valid Java environment path" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_set_current_invalid() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "INVALID"
+ $(do_set "${JAVA_NAME}")
+ assertEquals 'Wrong status returned' 0 $?
+ assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_set_same_java_missing_bin_link() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "${JAVA_NAME}"
+ unlink ${BIN_PATH}/java
+ $(do_set "${JAVA_NAME}")
+ assertEquals 'Wrong status returned' 0 $?
+ assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_set_with_default_already_set() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ JAVA_NAME_2="$(get_rand_str)"
+ create_valid_jre_env "${JAVA_NAME_2}/jre"
+ $(do_set "${JAVA_NAME_2}/jre")
+ assertEquals 'Wrong status returned' 0 $?
+ assertDefaultSetTo "${JAVA_NAME_2}/jre"
+}
+
+test_do_set_no_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ $(do_set "${JAVA_NAME}/jre")
+ assertEquals 'Wrong status returned' 0 $?
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_do_set_exists_jdk() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ output=$(do_set "${JAVA_NAME}/jre")
+ assertEquals 'Wrong status returned' 0 $?
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+ #mess="Warning: '${JAVA_NAME}' looks like a valid JDK whereas you only set '${JAVA_NAME}/jre' as default"
+ #mess+="\nFix this with 'archlinux-java set ${JAVA_NAME}'"
+ #expected=$(echo -e "${mess}")
+ #assertEquals 'Wrong message' "${expected}" "${output}"
+}
+
+test_do_set_cleanup_old_java_default() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "${JAVA_NAME}"
+ output=$(do_set "${JAVA_NAME}/jre")
+ assertEquals 'Wrong status returned' 0 $?
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+# do_unset
+
+test_do_unset_default_not_target() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ do_unset
+ assertDefaultNotSet
+}
+
+test_do_unset_no_default_link() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "${JAVA_NAME}"
+ unlink ${DEFAULT_PATH}
+ do_unset
+ assertDefaultNotSet
+}
+
+# do_fix
+
+test_do_fix_default_valid() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ do_fix
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_do_fix_no_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ do_fix
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_do_fix_default_invalid_openjdk7_jdk_installed() {
+ create_valid_jdk_env "java-7-openjdk"
+ create_valid_jdk_env "${JAVA_NAME}"
+ do_fix
+ assertDefaultSetTo "java-7-openjdk"
+}
+
+test_do_fix_default_invalid_openjdk7_jre_installed() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ create_valid_jre_env "java-7-openjdk/jre"
+ do_fix
+ assertDefaultSetTo "java-7-openjdk/jre"
+}
+
+test_do_fix_default_invalid_random_java_installed() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ do_fix
+ assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_fix_default_invalid_no_java_installed() {
+ assertEquals 'Wrong message' "No valid Java environment found" "$(do_fix)"
+ assertDefaultNotSet
+}
+
+test_do_fix_jre_but_jdk_exists() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "${JAVA_NAME}/jre"
+ do_fix
+ assertDefaultSetTo "${JAVA_NAME}"
+}
+
+test_do_fix_jdk_but_jre_exists() {
+ create_valid_jdk_env "java-7-openjdk"
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}"
+ do_fix
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_do_fix_cleanup_old_java_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ # Simulate installation of a jre over a jre-headless
+ ln -s ${WRAPPER_PATH} ${BIN_PATH}/policytool
+ output=$(do_fix "${JAVA_NAME}/jre")
+ assertEquals 'Wrong status returned' 0 $?
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+# load shunit2
+. shunit2-2.1.6/src/shunit2
Property changes on: java-common/trunk/test_archlinux-java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
More information about the arch-commits
mailing list