From 12e20be511cba3987eedf0f3e6cf44426e63d9b5 Mon Sep 17 00:00:00 2001
From: thomas <kreitler@molgen.mpg.de>
Date: Wed, 11 Dec 2024 12:35:55 +0100
Subject: [PATCH] usrlocalpkg/admin/config: java use openjdk-21

- Adjust config defaults, use some of the more basic java tools
- Remove the old package wrapper that uses /usr/local/java/bin
  from the bee package
---
 usrlocalpkg/admin/config           |  4 +++
 usrlocalpkg/admin/lib/java.profile | 44 ------------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 usrlocalpkg/admin/lib/java.profile

diff --git a/usrlocalpkg/admin/config b/usrlocalpkg/admin/config
index 4de628c7..8857e836 100644
--- a/usrlocalpkg/admin/config
+++ b/usrlocalpkg/admin/config
@@ -1258,6 +1258,10 @@ jdk-17=openjdk-17.0.2.8-0
 
 openjdk-21.0.0.35-0
 jdk-21=openjdk-21.0.0.35-0
+  jar
+  java
+  javac
+  javadoc
   java21=java
   javac21=javac
 
diff --git a/usrlocalpkg/admin/lib/java.profile b/usrlocalpkg/admin/lib/java.profile
deleted file mode 100644
index 25d3a86b..00000000
--- a/usrlocalpkg/admin/lib/java.profile
+++ /dev/null
@@ -1,44 +0,0 @@
-if [ "$JAVAVERSION" != "" ]; then
-   JRE="$JAVAVERSION"
-   JDK="$JAVAVERSION"
-else
-   case "`uname`" in
-      Linux* )
-         JRE="1.5.0"
-         JDK="1.5.0"
-      ;;
-      OSF1 )
-         JRE="1.4.0"
-         JDK="1.4.0"
-      ;;
-   esac
-fi
-
-set -a
-case "`uname`" in
-  Linux* )
-     case "`/bin/arch`" in
-     altermuell64bit )
-       VERSION=1.6.0_07
-       PATH=/package/java/jdk-${VERSION}/x86_64/bin:/package/java/jre-${VERSION}/x86_64/bin${PATH:+:$PATH}
-       LD_LIBRARY_PATH=/package/java/jdk-${VERSION}/x86_64/jre/lib/amd64/server${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-       export PATH LD_LIBRARY_PATH
-       ;;
-     i686|x86_64 )
-       PATH=/usr/local/java/bin${PATH:+:$PATH}
-       export PATH
-       ;;
-     * )
-       echo "unknown architecture.."
-       ;;
-     esac
-     ;;
-  OSF1* )
-     PATH=/package/java/alpha/jre${JRE}/bin:/package/java/alpha/jdk${JDK}/bin:$PATH
-     ;;
-  * )
-     echo "user_local_package_bin_wrapper-error: $1 no known OS!"
-     echo "tuetenpfurz."
-     ;;
-esac
-