network/wildfly: Updated for version 30.0.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 43 insertions, 30 deletions

diff --git a/network/wildfly/README b/network/wildfly/README
index 4b8fa66f96..c7f40c6ac5 100644
--- a/network/wildfly/README
+++ b/network/wildfly/README
@@ -1,7 +1,7 @@
 WildFly is a free, open source, Java EE certified platform
 for developing and deploying enterprise Java applications, Web
 applications, and Portals, WildFly Application Server provides the
-full range of Java EE 7 features as well as extended enterprise
+full range of Jakarta EE 10 features as well as extended enterprise
 services including clustering, caching, and persistence.
 
 WildFly requires a "wildfly" user and group; create these before
@@ -10,3 +10,12 @@ running the SlackBuild script. Examples:
 # groupadd -g 282 -r wildfly
 # useradd -u 282 -M -r -s /bin/bash -d /usr/share/wildfly \
     -c "WildFly Application Server" -g wildfly wildfly
+
+Read the documentation https://docs.wildfly.org
+
+This script created a default installation so the application
+is available at http://localhost:8080 and the administration
+console at http://localhost:9990/console.
+To connect to the console, you need to create an admin user with
+
+# /sbin/add-user.sh -m -u wildfly -p **secret**
diff --git a/network/wildfly/rc.wildfly b/network/wildfly/rc.wildfly
index 4ca3936bb6..4c13f4e2fe 100644
--- a/network/wildfly/rc.wildfly
+++ b/network/wildfly/rc.wildfly
@@ -2,7 +2,7 @@
 
 # Start/stop/restart wildfly.
 
-# Copyright 2017 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2023 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -36,20 +36,22 @@ export LAUNCH_WILDFLY_IN_BACKGROUND=yes
 
 # define the script to use to start standalone wildfly
 WILDFLY_START_STANDALONE=${WILDFLY_START_STANDALONE:-"$WILDFLY_HOME/bin/standalone.sh "}
+WILDFLY_START_DOMAIN=${WILDFLY_START_DOMAIN:-"$WILDFLY_HOME/bin/domain.sh "}
 
 # define the script to use to shutdown wildfly
 # change host and port as need
 WILDFLY_STOP_STANDALONE=${WILDFLY_STOP_STANDALONE:-"$WILDFLY_HOME/bin/jboss-cli.sh --connect controller=127.0.0.1:9990 command=:shutdown"}
+WILDFLY_STOP_DOMAIN=${WILDFLY_STOP_DOMAIN:-"$WILDFLY_HOME/bin/jboss-cli.sh --connect controller=127.0.0.1:9990 command=/host=primary:shutdown"}
 
 # define log file
-WILDFLY_CONSOLE="/var/log/wildfly/wildfly.log"
-WILDFLY_DOMAIN_CONSOLE="/var/log/wildfly/wildfly_domain.log"
+WILDFLY_CONSOLE="/var/log/wildfly/standalone/console.log"
+WILDFLY_DOMAIN_CONSOLE="/var/log/wildfly/domain/console.log"
 
 if [ -n "$WILDFLY_CONSOLE" -a ! -d "$WILDFLY_CONSOLE" ]; then
   # ensure the file exists
   touch $WILDFLY_CONSOLE
   if [ "$WILDFLYUS" != "RUNASIS" ]; then
-    chown -R $WILDFLYUS.$WILDFLYUS $WILDFLY_CONSOLE
+    chown -R $WILDFLYUS:$WILDFLYUS $WILDFLY_CONSOLE
   fi
 fi
 
@@ -66,7 +68,7 @@ if [ -n "$WILDFLY_DOMAIN_CONSOLE" -a ! -d "$WILDFLY_DOMAIN_CONSOLE" ]; then
   # ensure the file exists
   touch $WILDFLY_DOMAIN_CONSOLE
   if [ "$WILDFLYUS" != "RUNASIS" ]; then
-    chown -R $WILDFLYUS.$WILDFLYUS $WILDFLY_DOMAIN_CONSOLE
+    chown -R $WILDFLYUS:$WILDFLYUS $WILDFLY_DOMAIN_CONSOLE
   fi
 fi
 
@@ -82,6 +84,9 @@ WILDFLY_DOMAIN_CONSOLE=${WILDFLY_DOMAIN_CONSOLE:-"/dev/null"}
 CMD_START_STANDALONE="cd $WILDFLY_HOME/bin; $WILDFLY_START_STANDALONE" 
 CMD_STOP_STANDALONE="cd $WILDFLY_HOME/bin; $WILDFLY_STOP_STANDALONE"
 
+CMD_START_DOMAIN="cd $WILDFLY_HOME/bin; $WILDFLY_START_DOMAIN" 
+CMD_STOP_DOMAIN="cd $WILDFLY_HOME/bin; $WILDFLY_STOP_DOMAIN"
+
 if [ "$WILDFLYUS" = "RUNASIS" ]; then
   SUBIT=""
 else
diff --git a/network/wildfly/slack-desc b/network/wildfly/slack-desc
index 1bdf5cf2eb..aefdbb391d 100644
--- a/network/wildfly/slack-desc
+++ b/network/wildfly/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-wildfly: wildfly (Application Runtime)
+wildfly: wildfly (Application Server)
 wildfly:
-wildfly: WildFly is a free, open source, Java EE 7 platform for
+wildfly: WildFly is a free, open source, Jakarta EE 10 platform for
 wildfly: developing and deploying enterprise Java applications, Web
-wildfly: applications, and Portals, Wildfly provides the full
-wildfly: range of Java EE 7 features as well as extended enterprise services
+wildfly: applications, and Portals, Wildfly provides the full range of
+wildfly: Jakarta EE 10 features as well as extended enterprise services
 wildfly: including clustering, caching, and persistence.
 wildfly:
 wildfly:
diff --git a/network/wildfly/wildfly.SlackBuild b/network/wildfly/wildfly.SlackBuild
index bdf7dfaac6..1d12665839 100644
--- a/network/wildfly/wildfly.SlackBuild
+++ b/network/wildfly/wildfly.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Slackware build script for WildFly
 
-# Copyright 2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2023 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wildfly
-VERSION=${VERSION:-18.0.0}
+VERSION=${VERSION:-30.0.1}
 MINORVER=${MINORVER:-.Final}
 
 BUILD=${BUILD:-1}
@@ -64,7 +64,7 @@ tar xvzf $CWD/$PRGNAM-$VERSION$MINORVER.tar.gz
 mkdir -p $PKG/usr/share/$PRGNAM
 mv $TMP/$PRGNAM-$VERSION$MINORVER/* $PKG/usr/share/$PRGNAM
 cd $PKG/usr/share/$PRGNAM
-chown -R root:root .
+chown -R wildfly:wildfly .
 
 # Move the docs to our standard location first
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -91,8 +91,16 @@ cd $PKG/var/lib/$PRGNAM/domain
 ln -sf ../../../../etc/$PRGNAM/domain/configuration configuration
 mkdir -p $PKG/var/{log,tmp}/$PRGNAM/standalone
 cd $PKG/var/lib/$PRGNAM/standalone
+mv $PKG/var/lib/$PRGNAM/standalone/tmp/* $PKG/var/tmp/$PRGNAM/standalone/
+rm -rf $PKG/var/lib/$PRGNAM/standalone/tmp
 ln -sf ../../../log/$PRGNAM/standalone log
 ln -sf ../../../tmp/$PRGNAM/standalone tmp
+mkdir -p $PKG/var/{log,tmp}/$PRGNAM/domain
+cd $PKG/var/lib/$PRGNAM/domain
+mv $PKG/var/lib/$PRGNAM/domain/tmp/* $PKG/var/tmp/$PRGNAM/domain/
+rm -rf $PKG/var/lib/$PRGNAM/domain/tmp
+ln -sf ../../../log/$PRGNAM/domain log
+ln -sf ../../../tmp/$PRGNAM/domain tmp
 
 mv $PKG/usr/share/$PRGNAM/bin/standalone.conf $PKG/etc/$PRGNAM/standalone/
 mv $PKG/usr/share/$PRGNAM/bin/domain.conf $PKG/etc/$PRGNAM/domain/
@@ -132,19 +140,10 @@ chmod 0755 $PKG/usr/share/$PRGNAM/bin/*.sh
 
 mkdir -p $PKG/sbin
 cd $PKG/sbin
-ln -sf ../usr/share/$PRGNAM/bin/add-user.sh
-ln -sf ../usr/share/$PRGNAM/bin/appclient.sh
-ln -sf ../usr/share/$PRGNAM/bin/common.sh
-ln -sf ../usr/share/$PRGNAM/bin/domain.sh
-ln -sf ../usr/share/$PRGNAM/bin/elytron-tool.sh
-ln -sf ../usr/share/$PRGNAM/bin/jboss-cli.sh
-ln -sf ../usr/share/$PRGNAM/bin/jconsole.sh
-ln -sf ../usr/share/$PRGNAM/bin/jdr.sh
-ln -sf ../usr/share/$PRGNAM/bin/standalone.sh
-ln -sf ../usr/share/$PRGNAM/bin/vault.sh
-ln -sf ../usr/share/$PRGNAM/bin/wsconsume.sh
-ln -sf ../usr/share/$PRGNAM/bin/wsprovide.sh
-
+for filename in ../usr/share/$PRGNAM/bin/*.sh; do
+  echo $filename
+  ln -sf $filename
+done
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/network/wildfly/wildfly.info b/network/wildfly/wildfly.info
index da2ff1fd92..dbc73de7e2 100644
--- a/network/wildfly/wildfly.info
+++ b/network/wildfly/wildfly.info
@@ -1,10 +1,10 @@
 PRGNAM="wildfly"
-VERSION="18.0.0"
+VERSION="30.0.1"
 HOMEPAGE="https://wildfly.org"
-DOWNLOAD="http://download.jboss.org/wildfly/18.0.0.Final/wildfly-18.0.0.Final.tar.gz"
-MD5SUM="b63ad9031786eb70b473a72bac49e952"
+DOWNLOAD="https://github.com/wildfly/wildfly/releases/download/30.0.1.Final/wildfly-30.0.1.Final.tar.gz"
+MD5SUM="c6d6ac6d8adfd41ec88cb0cc45adf4d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="zulu-openjdk8"
+REQUIRES="zulu-openjdk17"
 MAINTAINER="Giorgio Peron"
 EMAIL="giorgio.peron@gmail.com"