[OPENJDK-4025] Revert "Merge pull request #559 from jmtd/ubi10-test-artifacts"

This reverts commit f127de2, reversing
changes made to df45466.

Author: jmtd

modules/jdk/21/artifacts/jvm-options renamed to modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

@@ -2,6 +2,17 @@
 # Configure module
 set -e
 
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+chown -R $USER:root $SCRIPT_DIR
+chmod -R ug+rwX $SCRIPT_DIR
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd
+
 # Update securerandom.source for quicker starts (must be done after removing jdk 8, or it will hit the wrong files)
 JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security
 SECURERANDOM=securerandom.source

modules/jdk/21/configure.sh

@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jdk

modules/jdk/21/module.yaml

@@ -0,0 +1,16 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+echo $SCRIPT_DIR
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+echo $ARTIFACTS_DIR
+
+chown -R $USER:root $SCRIPT_DIR
+chmod -R ug+rwX $SCRIPT_DIR
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd

modules/jre/21/artifacts/jvm-options renamed to modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options

@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jre

modules/jre/21/configure.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+chown -R $USER:root $SCRIPT_DIR
+chmod -R ug+rwX $SCRIPT_DIR
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/jvm/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd

modules/jre/21/module.yaml

@@ -5,9 +5,8 @@ description: ^
   Provides support for configuring Java JVM, e.g. GC settings, etc.  Basic usage
   is opts=$($JBOSS_CONTAINER_JAVA_JVM_MODULE/java-default-options)
 
-artifacts:
-  - path: artifacts/jvm
-    dest: /opt/jboss/container/java/jvm
+execute:
+- script: configure.sh
 
 modules:
   install: