git » java-common.git » commit e71d2de

diff --git a/PKGBUILD b/PKGBUILD
index e3ce70a..bf75cb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,22 @@
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
-pkgname=java-common
-pkgver=1
-pkgrel=8
-pkgdesc='Common files for Java Environments'
+pkgname=('java-runtime-common' 'java-environment-common')
+pkgbase=java-common
+pkgver=2
+pkgrel=1
 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=('72fa8a6d2d38f37ab51d36f383fa94bf424d494f0d3712b3af73daaf30046b2b'
-            'ffef7d042be3f20e3225780def56bcbadd75a74a3ceecc57c0af23d78e39cb54'
-            '00af7fe1894e0edc7663bfbdd626c68171cad7bc7d499f343f2eee9637d4b4c7'
-            'c28ffd3acc702e8cb02b3ec18516c0c4287614dd1f5803f9357a7a4c7c798f35'
-            '16a4fde19bd34210ff2d06480085f681b4e41e85ec89853e3cafaa8377bcedfb'
+sha256sums=('ab851cd30ee7f5c0d970163afe87f11797148fe8503dc1bd30f8a490e53f1246'
+            'e5837f87a6ab42f4f5c53ca5e5c678df67d9ea32611deea58521c144e126695c'
+            '272296ec7ca673b4f9f59fb70565328b6daef682c29cd964c988c018090c3fc2'
+            'c2c413a6b2f8b88ed170a5b19f7cb620518e09686f0d286b4b27d30f571e5050'
             '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee')
 
 check() {
@@ -31,11 +24,47 @@ check() {
   ./test_archlinux-java
 }
 
-build() {
+package_java-runtime-common() {
+  pkgdesc='Common files for Java Runtime Environments'
+  conflicts=('java-common')
+  replaces=('java-common')
+  backup=(etc/profile.d/jre.sh
+          etc/profile.d/jre.csh)
+  install=install_java-runtime-common.sh
+
   cd "${srcdir}"
 
+  install -d -m 755 "${pkgdir}/usr/lib/jvm/"
+  ln -s /dev/null "${pkgdir}/usr/lib/jvm/default"
+  ln -s /dev/null "${pkgdir}/usr/lib/jvm/default-runtime"
+
   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"
+
+  install -d -m 755 "${pkgdir}/usr/bin/"
+  # Official list of binaries that Java headless runtime packages MUST provide
+  # This list is based on Arch Linux' default Java implementation: "OpenJDK 7 Icedtea"
+  for b in \
+    java keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200;
+  do
+    ln -s /usr/lib/jvm/default-runtime/bin/${b} "${pkgdir}/usr/bin/${b}"
+  done
+}
+
+package_java-environment-common() {
+  pkgdesc='Common files for Java Development Kits'
+
+  cd "${srcdir}"
+
+  install -d -m 755 "${pkgdir}/usr/bin/"
+  # Official list of supplementary binaries that Java environment packages MUST provide
+  # This list is based on Arch Linux' default Java implementation: "OpenJDK 7 Icedtea"
+  for b in \
+    appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd \
+    jconsole jdb jhat jinfo jmap jps jrunscript jsadebugd jstack jstat \
+    jstatd native2ascii rmic schemagen serialver wsgen wsimport xjc;
+  do
+    ln -s /usr/lib/jvm/default/bin/${b} "${pkgdir}/usr/bin/${b}"
+  done
 }
diff --git a/bin_archlinux-java b/bin_archlinux-java
index a22aa49..453b0a4 100755
--- a/bin_archlinux-java
+++ b/bin_archlinux-java
@@ -10,9 +10,6 @@ DEFAULT_NAME=default
 DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME}
 DEFAULT_NAME_JRE=default-runtime
 DEFAULT_PATH_JRE=${JVM_DIR}/${DEFAULT_NAME_JRE}
-BIN_PATH=/usr/bin
-WRAPPER_PATH=/usr/lib/java-common-wrapper
-
 
 
 # Utility functions
@@ -37,7 +34,11 @@ check_param_count() {
 
 get_default_java() {
   path=$(readlink -e ${DEFAULT_PATH})
-  echo ${path/${JVM_DIR}\/}
+  if [ "x${path}" != "x/dev/null" ]; then
+    echo ${path/${JVM_DIR}\/}
+  else
+    echo ""
+  fi
 }
 
 get_installed_javas() {
@@ -60,20 +61,6 @@ 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() {
   new_default=$1
@@ -130,10 +117,8 @@ do_set() {
   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
@@ -145,7 +130,6 @@ do_set() {
 # $1: Java environment name to unset
 do_unset() {
   unset_default_link
-  unset_bin_links
 }
 
 do_fix() {
@@ -155,19 +139,15 @@ do_fix() {
       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
diff --git a/install_java-common.sh b/install_java-common.sh
deleted file mode 100644
index c9910e8..0000000
--- a/install_java-common.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-  echo 'Please make sure JAVA_HOME is set to /usr/lib/jvm/default'
-  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 "$@"
-}
diff --git a/install_java-runtime-common.sh b/install_java-runtime-common.sh
new file mode 100644
index 0000000..f91a72a
--- /dev/null
+++ b/install_java-runtime-common.sh
@@ -0,0 +1,9 @@
+post_install() {
+  echo 'For the complete set of Java binaries to be available in your PATH,'
+  echo 'you need to re-login or source /etc/profile.d/jre.sh'
+  echo 'Please note that this package does not support forcing JAVA_HOME as former package 'java-common' did'
+}
+
+post_upgrade() {
+  archlinux-java fix
+}
diff --git a/profile_jre.csh b/profile_jre.csh
index 0bd263f..cc762a2 100644
--- a/profile_jre.csh
+++ b/profile_jre.csh
@@ -1,6 +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/default"
+setenv PATH "${PATH}:/usr/lib/jvm/default/bin"
 
 # Enable this for non-reparenting window managers
 #setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/profile_jre.sh b/profile_jre.sh
index fd5db05..cea7e7e 100644
--- a/profile_jre.sh
+++ b/profile_jre.sh
@@ -1,6 +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/default
+export PATH=${PATH}:/usr/lib/jvm/default/bin
 
 # Enable this for non-reparenting window managers
 #export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/test_archlinux-java b/test_archlinux-java
index 4e55f30..867745d 100755
--- a/test_archlinux-java
+++ b/test_archlinux-java
@@ -12,8 +12,6 @@ declare test_dir
 INIT_JVM_DIR=${JVM_DIR}
 INIT_DEFAULT_PATH=${DEFAULT_PATH}
 INIT_DEFAULT_PATH_JRE=${DEFAULT_PATH_JRE}
-INIT_BIN_PATH=${BIN_PATH}
-INIT_WRAPPER_PATH=${WRAPPER_PATH}
 
 # Redefining this so that tested script can be invoked without root privileges
 check_root() {
@@ -31,12 +29,7 @@ setUp() {
   DEFAULT_PATH=${test_dir}${INIT_DEFAULT_PATH}
   DEFAULT_PATH_JRE=${test_dir}${INIT_DEFAULT_PATH_JRE}
   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}
+  mkdir -p ${JVM_DIR}
 }
 
 tearDown() {
@@ -64,13 +57,7 @@ create_valid_jdk_env() {
 
 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
     ln -s $1/jre ${DEFAULT_PATH_JRE}
   else
     ln -s $1 ${DEFAULT_PATH_JRE}
@@ -80,8 +67,6 @@ set_default_for_test() {
 assertDefaultNotSet() {
   assertNull 'Default is set' "$(readlink ${DEFAULT_PATH})"
   assertNull 'Default runtime is set' "$(readlink ${DEFAULT_PATH_JRE})"
-  assertNull "PATH has a java binary" "$(readlink ${BIN_PATH}/java)"
-  assertNull "PATH has a javac binary" "$(readlink ${BIN_PATH}/javac)"
 }
 
 assertDefaultSetTo() {
@@ -90,17 +75,6 @@ assertDefaultSetTo() {
   if [ ${new_java} == */jre ]; then
     assertEquals "Default runtime points at wrong Java env" "${new_java}/jre" "$(readlink ${DEFAULT_PATH_JRE})"
   fi
-  # 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
@@ -155,6 +129,11 @@ test_do_get_without_default() {
   assertNull 'Wrong result' "$(do_get)"
 }
 
+test_do_get_without_default() {
+  set_default_for_test "/dev/null"
+  assertNull 'Wrong result' "$(do_get)"
+}
+
 # do_set
 
 test_do_set_new_invalid() {
@@ -174,15 +153,6 @@ test_do_set_current_invalid() {
   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"
@@ -219,6 +189,14 @@ test_do_set_cleanup_old_java_default() {
   assertDefaultSetTo "${JAVA_NAME}/jre"
 }
 
+test_do_set_devnull() {
+  create_valid_jdk_env "${JAVA_NAME}"
+  set_default_for_test "/dev/null"
+  output=$(do_set "${JAVA_NAME}/jre")
+  assertEquals 'Wrong status returned' 0 $?
+  assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
 # do_unset
 
 test_do_unset_default_not_target() {
@@ -236,6 +214,12 @@ test_do_unset_no_default_link() {
   assertDefaultNotSet
 }
 
+test_do_unset_devnull() {
+  set_default_for_test "/dev/null"
+  do_unset
+  assertDefaultNotSet
+}
+
 # do_fix
 
 test_do_fix_default_valid() {
@@ -291,14 +275,11 @@ test_do_fix_jdk_but_jre_exists() {
   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"
+test_do_fix_devnull() {
+  create_valid_jdk_env "${JAVA_NAME}"
+  set_default_for_test "/dev/null"
+  do_fix
+  assertDefaultSetTo "${JAVA_NAME}"
 }
 
 # load shunit2