Move tests to 'jau.test' to not violate potentially sealed org.jar or jau. packages. Also ..

.. adding example in cmake to merge jar files -> test/java/CMakeLists.txt,
i.e. a big fat test jar file.

64 files changed, 534 insertions, 341 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d90c4ad..2a92a5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ IF(BUILDJAVA)
     configure_file (${CMAKE_CURRENT_SOURCE_DIR}/java_net/manifest.txt.in ${CMAKE_CURRENT_BINARY_DIR}/java_net/manifest.txt)
     configure_file (${CMAKE_CURRENT_SOURCE_DIR}/java_pkg/manifest.txt.in ${CMAKE_CURRENT_BINARY_DIR}/java_pkg/manifest.txt)
     configure_file (${CMAKE_CURRENT_SOURCE_DIR}/java_fat/manifest.txt.in ${CMAKE_CURRENT_BINARY_DIR}/java_fat/manifest.txt)
+    configure_file (${CMAKE_CURRENT_SOURCE_DIR}/java_fat/manifest-fat.txt.in ${CMAKE_CURRENT_BINARY_DIR}/java_fat/manifest-fat.txt)
     add_subdirectory (java_base)
     add_subdirectory (java_jni)
     add_subdirectory (java_net)
@@ -72,6 +73,7 @@ if (BUILD_TESTING)
   add_subdirectory (test)
   if (BUILDJAVA)
       configure_file (${CMAKE_CURRENT_SOURCE_DIR}/test/java/manifest.txt.in ${CMAKE_CURRENT_BINARY_DIR}/test/java/manifest.txt)
+      configure_file (${CMAKE_CURRENT_SOURCE_DIR}/test/java/manifest-fat.txt.in ${CMAKE_CURRENT_BINARY_DIR}/test/java/manifest-fat.txt)
       add_subdirectory (test/java)
   endif(BUILDJAVA)
 endif(BUILD_TESTING)
diff --git a/cmake/modules/ExtractArchiveList.cmake b/cmake/modules/ExtractArchiveList.cmake
new file mode 100644
index 0000000..c6d4e44
--- /dev/null
+++ b/cmake/modules/ExtractArchiveList.cmake
@@ -0,0 +1,20 @@
+message(STATUS "rm -rf ${_dstdir}")
+file(REMOVE_RECURSE ${_dstdir})
+
+# list(LENGTH _archives len)
+# message(STATUS "X1: <${_archives}>, len ${len}")
+
+string(REPLACE "\"" "" l1 ${_archives})
+string(REPLACE " " ";" l2 ${l1})
+
+# list(LENGTH l2 len)
+# message(STATUS "X2: <${l2}>, len ${len}")
+
+foreach(item ${l2})
+    message(STATUS "unzip ${item} -> ${_dstdir}")
+    file(ARCHIVE_EXTRACT INPUT ${item} DESTINATION ${_dstdir})
+endforeach()
+
+unset(l1)
+unset(l2)
+unset(item)
diff --git a/java_base/org/jau/util/ArrayHashMap.java b/java_base/org/jau/util/ArrayHashMap.java
index 8e4dd19..9a85b48 100644
--- a/java_base/org/jau/util/ArrayHashMap.java
+++ b/java_base/org/jau/util/ArrayHashMap.java
@@ -56,7 +56,7 @@ import java.util.Set;
  * </ul>
  *
  * For thread safety, the application shall decorate access to instances via
- * {@link org.jau.util.parallel.locks.RecursiveLock}.
+ * {@link jau.test.util.parallel.locks.RecursiveLock}.
  *
 */
 public class ArrayHashMap<K, V>
diff --git a/java_base/org/jau/util/ArrayHashSet.java b/java_base/org/jau/util/ArrayHashSet.java
index a7ec77a..6bba7dc 100644
--- a/java_base/org/jau/util/ArrayHashSet.java
+++ b/java_base/org/jau/util/ArrayHashSet.java
@@ -60,7 +60,7 @@ import java.util.ListIterator;
  * </ul>
  *
  * For thread safety, the application shall decorate access to instances via
- * {@link org.jau.util.parallel.locks.RecursiveLock}.
+ * {@link jau.test.util.parallel.locks.RecursiveLock}.
  *
 */
 public class ArrayHashSet<E>
diff --git a/java_fat/CMakeLists.txt b/java_fat/CMakeLists.txt
index da11ddc..fcffc5f 100644
--- a/java_fat/CMakeLists.txt
+++ b/java_fat/CMakeLists.txt
@@ -39,7 +39,7 @@ add_custom_command (OUTPUT ${jaulib_jar_file} ${jaulib_fat_jar_file} ${jaulib_ja
                        -C ${CMAKE_CURRENT_BINARY_DIR}/../java_pkg/${CMAKE_FILES_DIRECTORY}/jaulib_pkg_jar.dir/ org
                     COMMAND ${JAR}
                        --create --file ${jaulib_fat_jar_file}
-                       --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest.txt
+                       --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest-fat.txt
                        -C ${CMAKE_CURRENT_BINARY_DIR}/../java_base/${CMAKE_FILES_DIRECTORY}/jaulib_base_jar.dir/ jau
                        -C ${CMAKE_CURRENT_BINARY_DIR}/../java_base/${CMAKE_FILES_DIRECTORY}/jaulib_base_jar.dir/ org
                        -C ${CMAKE_CURRENT_BINARY_DIR}/../java_jni/${CMAKE_FILES_DIRECTORY}/jaulib_jni_jar.dir/ jau
diff --git a/java_fat/manifest-fat.txt.in b/java_fat/manifest-fat.txt.in
new file mode 100644
index 0000000..50f0a68
--- /dev/null
+++ b/java_fat/manifest-fat.txt.in
@@ -0,0 +1,37 @@
+Manifest-Version: 1.0
+Bundle-Date: @BUILD_TSTAMP@
+Bundle-ManifestVersion: 2
+Bundle-Name: org.jau
+Bundle-SymbolicName: org.jau
+Bundle-Version: @VERSION_SHORT@
+Export-Package: org.jau
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.9))"
+Package-Title: org.jau
+Package-Vendor: Gothel Software
+Package-Version: @VERSION_SHORT@
+Specification-Title: Jaulib Fat
+Specification-Vendor: Gothel Software
+Specification-Version: @VERSION_API@
+Implementation-Title: Jaulib Fat
+Implementation-Vendor: Gothel Software
+Implementation-Version: @VERSION@
+Implementation-Commit: @VERSION_SHA1@
+Implementation-URL: http://www.jausoft.com/
+Extension-Name: org.jau
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+Main-Class: org.jau.base.JaulibVersion
+
+Name: org/jau
+Sealed: true
+
+Name: jau/util
+Sealed: true
+
+Name: jau/sys
+Sealed: true
+
+Name: jau/pkg
+Sealed: true
+
diff --git a/java_fat/manifest.txt.in b/java_fat/manifest.txt.in
index 7132ad9..e163ae6 100644
--- a/java_fat/manifest.txt.in
+++ b/java_fat/manifest.txt.in
@@ -9,10 +9,10 @@ Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.9))"
 Package-Title: org.jau
 Package-Vendor: Gothel Software
 Package-Version: @VERSION_SHORT@
-Specification-Title: Jaulib Fat
+Specification-Title: Jaulib Whole
 Specification-Vendor: Gothel Software
 Specification-Version: @VERSION_API@
-Implementation-Title: Jaulib Fat
+Implementation-Title: Jaulib Whole
 Implementation-Vendor: Gothel Software
 Implementation-Version: @VERSION@
 Implementation-Commit: @VERSION_SHA1@
@@ -24,5 +24,14 @@ Application-Library-Allowable-Codebase: *
 Main-Class: org.jau.base.JaulibVersion
 
 Name: org/jau
-Sealed: false
+Sealed: true
+
+Name: jau/util
+Sealed: true
+
+Name: jau/sys
+Sealed: true
+
+Name: jau/pkg
+Sealed: true
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9c51a50..276d23e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,15 +36,11 @@ set( TARGETS_IDIOMATIC_EXAMPLES ${BASENAMES_IDIOMATIC_EXAMPLES} )
 
 foreach( name ${TARGETS_IDIOMATIC_EXAMPLES} )
     add_executable(${name} ${name}.cpp)
-endforeach()
-
-set(ALL_EXAMPLE_TARGETS
-  ${TARGETS_IDIOMATIC_EXAMPLES}
-)
-
-foreach(name ${ALL_EXAMPLE_TARGETS})
     target_link_libraries(${name} jaulib catch2)
     add_dependencies(${name} jaulib catch2)
+endforeach()
+
+foreach(name ${TARGETS_IDIOMATIC_EXAMPLES})
     add_test (NAME ${name} COMMAND ${name})
 endforeach()
 
diff --git a/test/java/CMakeLists.txt b/test/java/CMakeLists.txt
index 9550ba4..e063cf5 100644
--- a/test/java/CMakeLists.txt
+++ b/test/java/CMakeLists.txt
@@ -12,32 +12,56 @@ file(GLOB_RECURSE TEST_JAVA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "Test*.ja
 
 add_jar(jaulib_test
         ${TEST_JAVA_SOURCES}
-        jau/info.txt
-        org/jau/net/data2/RelativeData2.txt
-        org/jau/net/data/AssetURLConnectionTest.txt
-        org/jau/net/data/RelativeData.txt
+        jau/test/info.txt
+        jau/test/net/data/AssetURLConnectionTest.txt
+        jau/test/net/data/RelativeData.txt
+        jau/test/net/data2/RelativeData2.txt
         jau-test/info.txt
         INCLUDE_JARS ${jaulib_fat_jar_file} ${JUNIT_JAR}
         MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/manifest.txt
         OUTPUT_NAME jaulib-test
 )
 add_dependencies(jaulib_test jaulib_fat_jar)
-
 install (FILES ${jaulib_test_jar_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java)
 
+# set(ENABLE_jaulib_fat_test_jar_file ON)
+
+#
+# jaulib_fat_test_jar_file only demos how to merge jars into one fat jar with cmake
+#
+if(ENABLE_jaulib_fat_test_jar_file)
+    set(jaulib_fat_test_jar_file ${CMAKE_CURRENT_BINARY_DIR}/jaulib-fat-test.jar CACHE FILEPATH "jaulib fat test jar file" FORCE)
+
+    add_custom_command (OUTPUT ${jaulib_fat_test_jar_file}
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                        COMMAND ${CMAKE_COMMAND}
+                                -D _dstdir:PATH='${CMAKE_CURRENT_BINARY_DIR}/temp'
+                                -D _archives:FILEPATH="${jaulib_fat_jar_file} ${jaulib_test_jar_file}"
+                                -P ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/ExtractArchiveList.cmake
+                        COMMAND ${JAR}
+                           --create --file ${jaulib_fat_test_jar_file}
+                           --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest-fat.txt
+                           -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ jau
+                           -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ org
+                           -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ natives
+                           -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ jau-test
+                        DEPENDS jaulib_fat_jar jaulib_test
+                        COMMENT "producing jaulib-fat-test.jar"
+                        VERBATIM
+                       )
+    add_custom_target (jaulib_fat_test ALL DEPENDS ${jaulib_fat_test_jar_file})
+    add_dependencies(jaulib_fat_test jaulib_fat_jar jaulib_test)
+    install (FILES ${jaulib_fat_test_jar_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java)
+endif(ENABLE_jaulib_fat_test_jar_file)
+
+
 string( REPLACE ".java" "" TEST_JAVA_FILES2 "${TEST_JAVA_FILES}" )
 string( REPLACE "/" "." BASENAMES_IDIOMATIC_EXAMPLES "${TEST_JAVA_FILES2}" )
 set( TARGETS_IDIOMATIC_EXAMPLES ${BASENAMES_IDIOMATIC_EXAMPLES} )
 
-set(ALL_EXAMPLE_TARGETS
-  ${TARGETS_IDIOMATIC_EXAMPLES}
-)
-
-foreach(name ${ALL_EXAMPLE_TARGETS})
+foreach(name ${TARGETS_IDIOMATIC_EXAMPLES})
     add_test (NAME ${name} COMMAND ${JAVA_RUNTIME} 
                            -cp ${JUNIT_JAR}:${jaulib_fat_jar_file}:${jaulib_test_jar_file}
                            org.junit.runner.JUnitCore ${name})
 endforeach()
 
-
-
diff --git a/test/java/jau/test/VersionInfo.java b/test/java/jau/test/VersionInfo.java
new file mode 100644
index 0000000..b23b93c
--- /dev/null
+++ b/test/java/jau/test/VersionInfo.java
@@ -0,0 +1,18 @@
+package jau.test;
+
+import java.io.IOException;
+
+import org.jau.base.JaulibVersion;
+import org.jau.util.VersionUtil;
+
+public class VersionInfo {
+    public static void main(final String args[]) throws IOException {
+        System.err.println(VersionUtil.getPlatformInfo());
+        System.err.println("Version Info:");
+        System.err.println(JaulibVersion.getInstance());
+        System.err.println("");
+        System.err.println("Full Manifest:");
+        System.err.println(JaulibVersion.getInstance().getFullManifestInfo(null));
+    }
+
+}
diff --git a/test/java/jau/info.txt b/test/java/jau/test/info.txt
index 5968e53..5968e53 100644
--- a/test/java/jau/info.txt
+++ b/test/java/jau/test/info.txt
diff --git a/test/java/org/jau/io/TestIOUtil01.java b/test/java/jau/test/io/TestIOUtil01.java
index c8888ea..434bb8c 100644
--- a/test/java/org/jau/io/TestIOUtil01.java
+++ b/test/java/jau/test/io/TestIOUtil01.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.io;
+package jau.test.io;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -37,7 +37,7 @@ import java.net.URLConnection;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.jau.junit.util.JunitTracer;
+import org.jau.io.IOUtil;
 import org.jau.lang.ExceptionUtils;
 import org.jau.sys.MachineDataInfo;
 import org.jau.sys.PlatformProps;
@@ -48,6 +48,8 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestIOUtil01 extends JunitTracer {
 
diff --git a/test/java/org/jau/junit/util/JunitTracer.java b/test/java/jau/test/junit/util/JunitTracer.java
index 6ea52dc..6cf42fe 100644
--- a/test/java/org/jau/junit/util/JunitTracer.java
+++ b/test/java/jau/test/junit/util/JunitTracer.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.junit.util;
+package jau.test.junit.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/test/java/org/jau/junit/util/MiscUtils.java b/test/java/jau/test/junit/util/MiscUtils.java
index f489cc3..6a9d9c6 100644
--- a/test/java/org/jau/junit/util/MiscUtils.java
+++ b/test/java/jau/test/junit/util/MiscUtils.java
@@ -23,7 +23,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package org.jau.junit.util;
+package jau.test.junit.util;
 
 import java.io.BufferedInputStream;
 import java.io.File;
diff --git a/test/java/org/jau/junit/util/SingletonJunitCase.java b/test/java/jau/test/junit/util/SingletonJunitCase.java
index 264db04..558fc71 100644
--- a/test/java/org/jau/junit/util/SingletonJunitCase.java
+++ b/test/java/jau/test/junit/util/SingletonJunitCase.java
@@ -24,14 +24,15 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.junit.util;
+package jau.test.junit.util;
 
 import org.junit.BeforeClass;
-import org.jau.util.parallel.locks.SingletonInstance;
 import org.junit.AfterClass;
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
+import jau.test.util.parallel.locks.SingletonInstance;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public abstract class SingletonJunitCase extends JunitTracer {
     public static final String SINGLE_INSTANCE_LOCK_FILE = "SingletonTestCase.lock";
diff --git a/test/java/org/jau/net/AssetURLConnectionBase.java b/test/java/jau/test/net/AssetURLConnectionBase.java
index 26815c7..94e886d 100644
--- a/test/java/org/jau/net/AssetURLConnectionBase.java
+++ b/test/java/jau/test/net/AssetURLConnectionBase.java
@@ -1,4 +1,4 @@
-package org.jau.net;
+package jau.test.net;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -7,10 +7,13 @@ import java.net.JarURLConnection;
 import java.net.URLConnection;
 
 import org.jau.io.IOUtil;
-import org.jau.junit.util.JunitTracer;
+import org.jau.net.AssetURLConnection;
+import org.jau.net.Uri;
 import org.jau.sys.AndroidVersion;
 import org.junit.Assert;
 
+import jau.test.junit.util.JunitTracer;
+
 public abstract class AssetURLConnectionBase extends JunitTracer {
 
     /** In jaulib_base.jar */
@@ -23,17 +26,17 @@ public abstract class AssetURLConnectionBase extends JunitTracer {
     protected static final String test_asset_test1_url   = "asset:jau-test/info.txt";
     protected static final String test_asset_test1_entry = "jau-test/info.txt";
     protected static final Uri.Encoded test_asset_test2_rel   = Uri.Encoded.cast("data/AssetURLConnectionTest.txt");
-    protected static final String test_asset_test2a_url  = "asset:org/jau/net/data/AssetURLConnectionTest.txt";
-    protected static final String test_asset_test2b_url  = "asset:/org/jau/net/data/AssetURLConnectionTest.txt";
-    protected static final String test_asset_test2_entry = "org/jau/net/data/AssetURLConnectionTest.txt";
+    protected static final String test_asset_test2a_url  = "asset:jau/test/net/data/AssetURLConnectionTest.txt";
+    protected static final String test_asset_test2b_url  = "asset:/jau/test/net/data/AssetURLConnectionTest.txt";
+    protected static final String test_asset_test2_entry = "jau/test/net/data/AssetURLConnectionTest.txt";
     protected static final Uri.Encoded test_asset_test3_rel   = Uri.Encoded.cast("RelativeData.txt");
-    protected static final String test_asset_test3a_url  = "asset:org/jau/net/data/RelativeData.txt";
-    protected static final String test_asset_test3b_url  = "asset:/org/jau/net/data/RelativeData.txt";
-    protected static final String test_asset_test3_entry = "org/jau/net/data/RelativeData.txt";
+    protected static final String test_asset_test3a_url  = "asset:jau/test/net/data/RelativeData.txt";
+    protected static final String test_asset_test3b_url  = "asset:/jau/test/net/data/RelativeData.txt";
+    protected static final String test_asset_test3_entry = "jau/test/net/data/RelativeData.txt";
     protected static final Uri.Encoded test_asset_test4_rel   = Uri.Encoded.cast("../data2/RelativeData2.txt");
-    protected static final String test_asset_test4a_url  = "asset:org/jau/net/data2/RelativeData2.txt";
-    protected static final String test_asset_test4b_url  = "asset:/org/jau/net/data2/RelativeData2.txt";
-    protected static final String test_asset_test4_entry = "org/jau/net/data2/RelativeData2.txt";
+    protected static final String test_asset_test4a_url  = "asset:jau/test/net/data2/RelativeData2.txt";
+    protected static final String test_asset_test4b_url  = "asset:/jau/test/net/data2/RelativeData2.txt";
+    protected static final String test_asset_test4_entry = "jau/test/net/data2/RelativeData2.txt";
 
     protected static void testAssetConnection(final URLConnection c, final String entry_name) throws IOException {
         Assert.assertNotNull(c);
diff --git a/test/java/org/jau/net/TestAssetURLConnectionRegistered.java b/test/java/jau/test/net/TestAssetURLConnectionRegistered.java
index 1871982..d6df823 100644
--- a/test/java/org/jau/net/TestAssetURLConnectionRegistered.java
+++ b/test/java/jau/test/net/TestAssetURLConnectionRegistered.java
@@ -1,4 +1,4 @@
-package org.jau.net;
+package jau.test.net;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -6,6 +6,8 @@ import java.net.URL;
 import java.net.URLConnection;
 
 import org.jau.io.IOUtil;
+import org.jau.net.AssetURLContext;
+import org.jau.net.Uri;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
diff --git a/test/java/org/jau/net/TestAssetURLConnectionUnregistered.java b/test/java/jau/test/net/TestAssetURLConnectionUnregistered.java
index 805e167..d1fe176 100644
--- a/test/java/org/jau/net/TestAssetURLConnectionUnregistered.java
+++ b/test/java/jau/test/net/TestAssetURLConnectionUnregistered.java
@@ -1,4 +1,4 @@
-package org.jau.net;
+package jau.test.net;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -6,6 +6,8 @@ import java.net.URL;
 import java.net.URLConnection;
 
 import org.jau.io.IOUtil;
+import org.jau.net.AssetURLContext;
+import org.jau.net.Uri;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
diff --git a/test/java/org/jau/net/TestUri01.java b/test/java/jau/test/net/TestUri01.java
index 7d3e326..7d513ac 100644
--- a/test/java/org/jau/net/TestUri01.java
+++ b/test/java/jau/test/net/TestUri01.java
@@ -1,4 +1,4 @@
-package org.jau.net;
+package jau.test.net;
 
 import java.io.File;
 import java.io.IOException;
@@ -6,12 +6,14 @@ import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.jau.io.IOUtil;
-import org.jau.junit.util.JunitTracer;
+import org.jau.net.Uri;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestUri01 extends JunitTracer {
 
diff --git a/test/java/org/jau/net/TestUri02Composing.java b/test/java/jau/test/net/TestUri02Composing.java
index c400a21..240c1a1 100644
--- a/test/java/org/jau/net/TestUri02Composing.java
+++ b/test/java/jau/test/net/TestUri02Composing.java
@@ -1,17 +1,20 @@
-package org.jau.net;
+package jau.test.net;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.jau.junit.util.JunitTracer;
+import org.jau.net.AssetURLContext;
+import org.jau.net.Uri;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestUri02Composing extends JunitTracer {
 
diff --git a/test/java/org/jau/net/TestUri03Resolving.java b/test/java/jau/test/net/TestUri03Resolving.java
index a37f96c..12ce8d1 100644
--- a/test/java/org/jau/net/TestUri03Resolving.java
+++ b/test/java/jau/test/net/TestUri03Resolving.java
@@ -1,4 +1,4 @@
-package org.jau.net;
+package jau.test.net;
 
 import java.io.File;
 import java.io.IOException;
@@ -7,7 +7,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.jau.junit.util.JunitTracer;
+import org.jau.net.Uri;
 import org.jau.sys.PlatformProps;
 import org.jau.sys.PlatformTypes;
 import org.junit.Assert;
@@ -15,6 +15,8 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestUri03Resolving extends JunitTracer {
 
diff --git a/test/java/org/jau/net/TestUri99LaunchOnReservedCharPathBug908.java b/test/java/jau/test/net/TestUri99LaunchOnReservedCharPathBug908.java
index bb97013..cc4c8a0 100644
--- a/test/java/org/jau/net/TestUri99LaunchOnReservedCharPathBug908.java
+++ b/test/java/jau/test/net/TestUri99LaunchOnReservedCharPathBug908.java
@@ -23,7 +23,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.net;
+package jau.test.net;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,9 +32,8 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 
-import org.jau.junit.util.MiscUtils;
-import org.jau.junit.util.JunitTracer;
 import org.jau.lang.ReflectionUtil;
+import org.jau.net.Uri;
 import org.jau.pkg.JarUtil;
 import org.jau.sys.AndroidVersion;
 import org.jau.sys.PlatformProps;
@@ -43,6 +42,9 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+import jau.test.junit.util.MiscUtils;
+
 /**
  * Bug 908: Automated test, launching GlueGen jar file from an <i>odd pathname</i>.
  * <p>
diff --git a/test/java/org/jau/net/TestUriQueryProps.java b/test/java/jau/test/net/TestUriQueryProps.java
index 8f63cc9..9df1ccd 100644
--- a/test/java/org/jau/net/TestUriQueryProps.java
+++ b/test/java/jau/test/net/TestUriQueryProps.java
@@ -1,16 +1,19 @@
-package org.jau.net;
+package jau.test.net;
 
-import static org.jau.net.URIDumpUtil.showUri;
+import static jau.test.net.URIDumpUtil.showUri;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-import org.jau.junit.util.JunitTracer;
+import org.jau.net.Uri;
+import org.jau.net.UriQueryProps;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestUriQueryProps extends JunitTracer {
 
diff --git a/test/java/org/jau/net/TestUrisWithAssetHandler.java b/test/java/jau/test/net/TestUrisWithAssetHandler.java
index b3f90db..f359284 100644
--- a/test/java/org/jau/net/TestUrisWithAssetHandler.java
+++ b/test/java/jau/test/net/TestUrisWithAssetHandler.java
@@ -1,17 +1,19 @@
-package org.jau.net;
+package jau.test.net;
 
-import static org.jau.net.URIDumpUtil.showURX;
+import static jau.test.net.URIDumpUtil.showURX;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-import org.jau.junit.util.JunitTracer;
+import org.jau.net.AssetURLContext;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestUrisWithAssetHandler extends JunitTracer {
 
diff --git a/test/java/org/jau/net/URIDumpUtil.java b/test/java/jau/test/net/URIDumpUtil.java
index 46e16e1..22dd672 100644
--- a/test/java/org/jau/net/URIDumpUtil.java
+++ b/test/java/jau/test/net/URIDumpUtil.java
@@ -1,10 +1,12 @@
-package org.jau.net;
+package jau.test.net;
 
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import org.jau.net.Uri;
+
 public class URIDumpUtil {
     public static void showURX(final String urx) throws MalformedURLException, URISyntaxException {
         System.err.println("WWWWWW "+urx);
diff --git a/test/java/org/jau/net/data/AssetURLConnectionTest.txt b/test/java/jau/test/net/data/AssetURLConnectionTest.txt
index 97d70a7..97d70a7 100644
--- a/test/java/org/jau/net/data/AssetURLConnectionTest.txt
+++ b/test/java/jau/test/net/data/AssetURLConnectionTest.txt
diff --git a/test/java/org/jau/net/data/RelativeData.txt b/test/java/jau/test/net/data/RelativeData.txt
index 02be06f..02be06f 100644
--- a/test/java/org/jau/net/data/RelativeData.txt
+++ b/test/java/jau/test/net/data/RelativeData.txt
diff --git a/test/java/org/jau/net/data2/RelativeData2.txt b/test/java/jau/test/net/data2/RelativeData2.txt
index adf3d6e..adf3d6e 100644
--- a/test/java/org/jau/net/data2/RelativeData2.txt
+++ b/test/java/jau/test/net/data2/RelativeData2.txt
diff --git a/test/java/org/jau/pkg/TestJarUtil.java b/test/java/jau/test/pkg/TestJarUtil.java
index aaccbe0..1c0c08b 100644
--- a/test/java/org/jau/pkg/TestJarUtil.java
+++ b/test/java/jau/test/pkg/TestJarUtil.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.pkg;
+package jau.test.pkg;
 
 import java.io.IOException;
 import java.net.JarURLConnection;
@@ -38,8 +38,6 @@ import java.util.Enumeration;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.jau.junit.util.JunitTracer;
-import org.jau.net.URIDumpUtil;
 import org.jau.net.Uri;
 import org.jau.pkg.JarUtil;
 import org.jau.pkg.cache.TempCacheReg;
@@ -53,6 +51,9 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+import jau.test.net.URIDumpUtil;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestJarUtil extends JunitTracer {
     static TempFileCache fileCache;
diff --git a/test/java/org/jau/pkg/cache/TestTempJarCache.java b/test/java/jau/test/pkg/cache/TestTempJarCache.java
index da5b0a2..ca9ccc3 100644
--- a/test/java/org/jau/pkg/cache/TestTempJarCache.java
+++ b/test/java/jau/test/pkg/cache/TestTempJarCache.java
@@ -1,32 +1,30 @@
 /**
- * Copyright 2011 JogAmp Community. All rights reserved.
+ * Author: Sven Gothel <[email protected]>
+ * Copyright (c) 2021 Gothel Software e.K.
+ * Copyright (c) 2011 Gothel Software e.K.
+ * Copyright (c) 2011 JogAmp Community.
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.pkg.cache;
+package jau.test.pkg.cache;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,9 +35,7 @@ import java.net.URLClassLoader;
 import java.util.jar.JarFile;
 
 import org.jau.io.IOUtil;
-import org.jau.junit.util.JunitTracer;
 import org.jau.lang.ReflectionUtil;
-import org.jau.net.URIDumpUtil;
 import org.jau.net.Uri;
 import org.jau.pkg.JarUtil;
 import org.jau.pkg.cache.TempCacheReg;
@@ -54,6 +50,9 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+import jau.test.net.URIDumpUtil;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestTempJarCache extends JunitTracer {
     static TempFileCache fileCache;
diff --git a/test/java/org/jau/sys/TestPlatform01.java b/test/java/jau/test/sys/TestPlatform01.java
index fc08fa4..2b370de 100644
--- a/test/java/org/jau/sys/TestPlatform01.java
+++ b/test/java/jau/test/sys/TestPlatform01.java
@@ -1,34 +1,31 @@
 /**
- * Copyright 2010 JogAmp Community. All rights reserved.
+ * Author: Sven Gothel <[email protected]>
+ * Copyright (c) 2021 Gothel Software e.K.
+ * Copyright (c) 2010 Gothel Software e.K.
+ * Copyright (c) 2010 JogAmp Community.
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.sys;
+package jau.test.sys;
 
-import org.jau.junit.util.JunitTracer;
 import org.jau.sys.MachineDataInfo;
 import org.jau.sys.PlatformProps;
 import org.junit.Assert;
@@ -36,6 +33,8 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestPlatform01 extends JunitTracer {
 
diff --git a/test/java/org/jau/sys/TestSystemPropsAndEnvs.java b/test/java/jau/test/sys/TestSystemPropsAndEnvs.java
index 7a173c9..ef1fa58 100644
--- a/test/java/org/jau/sys/TestSystemPropsAndEnvs.java
+++ b/test/java/jau/test/sys/TestSystemPropsAndEnvs.java
@@ -1,43 +1,42 @@
 /**
- * Copyright 2012 JogAmp Community. All rights reserved.
+ * Author: Sven Gothel <[email protected]>
+ * Copyright (c) 2021 Gothel Software e.K.
+ * Copyright (c) 2012 Gothel Software e.K.
+ * Copyright (c) 2012 JogAmp Community.
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.sys;
+package jau.test.sys;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
-import org.jau.junit.util.JunitTracer;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestSystemPropsAndEnvs extends JunitTracer {
 
diff --git a/test/java/org/jau/sys/elf/TestElfReader01.java b/test/java/jau/test/sys/elf/TestElfReader01.java
index 1891b58..0eec49a 100644
--- a/test/java/org/jau/sys/elf/TestElfReader01.java
+++ b/test/java/jau/test/sys/elf/TestElfReader01.java
@@ -23,7 +23,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package org.jau.sys.elf;
+package jau.test.sys.elf;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -33,14 +33,20 @@ import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.util.List;
 
-import org.jau.junit.util.JunitTracer;
 import org.jau.sys.JNILibrary;
 import org.jau.sys.PlatformProps;
 import org.jau.sys.PlatformTypes.OSType;
+import org.jau.sys.elf.ElfHeaderPart1;
+import org.jau.sys.elf.ElfHeaderPart2;
+import org.jau.sys.elf.Section;
+import org.jau.sys.elf.SectionArmAttributes;
+import org.jau.sys.elf.SectionHeader;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestElfReader01 extends JunitTracer {
     public static String GNU_LINUX_SELF_EXE = "/proc/self/exe";
diff --git a/test/java/org/jau/util/BitDemoData.java b/test/java/jau/test/util/BitDemoData.java
index f8b6de1..e7f2656 100644
--- a/test/java/org/jau/util/BitDemoData.java
+++ b/test/java/jau/test/util/BitDemoData.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
 import java.nio.ByteBuffer;
 import java.util.Locale;
diff --git a/test/java/org/jau/util/RingBuffer01Base.java b/test/java/jau/test/util/RingBuffer01Base.java
index 5b04aa3..36660f8 100644
--- a/test/java/org/jau/util/RingBuffer01Base.java
+++ b/test/java/jau/test/util/RingBuffer01Base.java
@@ -24,9 +24,10 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
 
+import org.jau.util.Ringbuffer;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/test/java/org/jau/util/TestArrayHashMap01.java b/test/java/jau/test/util/TestArrayHashMap01.java
index dbcd405..da0e93f 100644
--- a/test/java/org/jau/util/TestArrayHashMap01.java
+++ b/test/java/jau/test/util/TestArrayHashMap01.java
@@ -24,18 +24,21 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import org.jau.junit.util.JunitTracer;
+import org.jau.util.ArrayHashMap;
+import org.jau.util.ArrayHashSet;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestArrayHashMap01 extends JunitTracer {
 
diff --git a/test/java/org/jau/util/TestArrayHashSet01.java b/test/java/jau/test/util/TestArrayHashSet01.java
index b343f25..2f6b9dd 100644
--- a/test/java/org/jau/util/TestArrayHashSet01.java
+++ b/test/java/jau/test/util/TestArrayHashSet01.java
@@ -24,17 +24,19 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.jau.junit.util.JunitTracer;
+import org.jau.util.ArrayHashSet;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestArrayHashSet01 extends JunitTracer {
 
diff --git a/test/java/org/jau/util/TestBitfield00.java b/test/java/jau/test/util/TestBitfield00.java
index b0dbac6..8ca71a5 100644
--- a/test/java/org/jau/util/TestBitfield00.java
+++ b/test/java/jau/test/util/TestBitfield00.java
@@ -24,17 +24,20 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
 import java.io.IOException;
 
 import org.junit.Test;
-import org.jau.junit.util.JunitTracer;
+import org.jau.util.BitMath;
+import org.jau.util.Bitfield;
 import org.junit.Assert;
 
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 /**
  * Test basic bitfield operations for {@link Bitfield}
  */
diff --git a/test/java/org/jau/util/TestBitstream00.java b/test/java/jau/test/util/TestBitstream00.java
index bc28d8f..db19372 100644
--- a/test/java/org/jau/util/TestBitstream00.java
+++ b/test/java/jau/test/util/TestBitstream00.java
@@ -24,7 +24,9 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
+
+import static jau.test.util.BitDemoData.*;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -33,7 +35,6 @@ import java.nio.IntBuffer;
 import java.nio.LongBuffer;
 
 import org.jau.io.Bitstream;
-import org.jau.junit.util.JunitTracer;
 import org.jau.lang.NioUtil;
 import org.jau.sys.PlatformProps;
 import org.junit.Assert;
@@ -41,7 +42,7 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
-import static org.jau.util.BitDemoData.*;
+import jau.test.junit.util.JunitTracer;
 
 /**
  * Test basic bit operations for {@link Bitstream}
diff --git a/test/java/org/jau/util/TestBitstream01.java b/test/java/jau/test/util/TestBitstream01.java
index 31ffc0c..8815cc7 100644
--- a/test/java/org/jau/util/TestBitstream01.java
+++ b/test/java/jau/test/util/TestBitstream01.java
@@ -24,21 +24,21 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
+
+import static jau.test.util.BitDemoData.*;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import org.jau.io.Bitstream;
-import org.jau.junit.util.JunitTracer;
 import org.junit.Assert;
 import org.junit.Test;
-
-import static org.jau.util.BitDemoData.*;
-
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 /**
  * Test {@link Bitstream} w/ raw linear and bulk read/write access w/o semantics:
  * <ul>
diff --git a/test/java/org/jau/util/TestBitstream02.java b/test/java/jau/test/util/TestBitstream02.java
index 8ecd76e..88864c7 100644
--- a/test/java/org/jau/util/TestBitstream02.java
+++ b/test/java/jau/test/util/TestBitstream02.java
@@ -24,22 +24,23 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
-import static org.jau.util.BitDemoData.toBinaryString;
-import static org.jau.util.BitDemoData.toHexBinaryString;
+import static jau.test.util.BitDemoData.toBinaryString;
+import static jau.test.util.BitDemoData.toHexBinaryString;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import org.jau.io.Bitstream;
-import org.jau.junit.util.JunitTracer;
 import org.jau.lang.NioUtil;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 /**
  * Test {@link Bitstream} w/ int8 read/write access w/ semantics
  * as well as with aligned and unaligned access.
diff --git a/test/java/org/jau/util/TestBitstream03.java b/test/java/jau/test/util/TestBitstream03.java
index d7ee0f8..d25d7bc 100644
--- a/test/java/org/jau/util/TestBitstream03.java
+++ b/test/java/jau/test/util/TestBitstream03.java
@@ -24,24 +24,25 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
-import static org.jau.util.BitDemoData.dumpData;
-import static org.jau.util.BitDemoData.toBinaryString;
-import static org.jau.util.BitDemoData.toHexBinaryString;
+import static jau.test.util.BitDemoData.dumpData;
+import static jau.test.util.BitDemoData.toBinaryString;
+import static jau.test.util.BitDemoData.toHexBinaryString;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 import org.jau.io.Bitstream;
-import org.jau.junit.util.JunitTracer;
 import org.jau.lang.NioUtil;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 /**
  * Test {@link Bitstream} w/ int16 read/write access w/ semantics
  * as well as with aligned and unaligned access.
diff --git a/test/java/org/jau/util/TestBitstream04.java b/test/java/jau/test/util/TestBitstream04.java
index c3b1550..4189c49 100644
--- a/test/java/org/jau/util/TestBitstream04.java
+++ b/test/java/jau/test/util/TestBitstream04.java
@@ -24,25 +24,26 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
-import static org.jau.util.BitDemoData.dumpData;
-import static org.jau.util.BitDemoData.toBinaryString;
-import static org.jau.util.BitDemoData.toHexBinaryString;
-import static org.jau.util.BitDemoData.toHexString;
+import static jau.test.util.BitDemoData.dumpData;
+import static jau.test.util.BitDemoData.toBinaryString;
+import static jau.test.util.BitDemoData.toHexBinaryString;
+import static jau.test.util.BitDemoData.toHexString;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 import org.jau.io.Bitstream;
-import org.jau.junit.util.JunitTracer;
 import org.jau.lang.NioUtil;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 /**
  * Test {@link Bitstream} w/ int32 read/write access w/ semantics
  * as well as with aligned and unaligned access.
diff --git a/test/java/jau/test/util/TestLFRingBuffer01.java b/test/java/jau/test/util/TestLFRingBuffer01.java
new file mode 100644
index 0000000..80a248f
--- /dev/null
+++ b/test/java/jau/test/util/TestLFRingBuffer01.java
@@ -0,0 +1,49 @@
+/**
+ * Author: Sven Gothel <[email protected]>
+ * Copyright (c) 2021 Gothel Software e.K.
+ * Copyright (c) 2013 Gothel Software e.K.
+ * Copyright (c) 2013 JogAmp Community.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package jau.test.util;
+
+import org.jau.util.LFRingbuffer;
+import org.jau.util.Ringbuffer;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestLFRingBuffer01 extends RingBuffer01Base {
+    @Override
+    public Ringbuffer<Integer> createEmpty(final int initialCapacity) {
+        return new LFRingbuffer<Integer>(Integer[].class, initialCapacity);
+    }
+    @Override
+    public Ringbuffer<Integer> createFull(final Integer[] source) {
+        return new LFRingbuffer<Integer>(source);
+    }
+
+    public static void main(final String args[]) {
+        org.junit.runner.JUnitCore.main(TestLFRingBuffer01.class.getName());
+    }
+
+}
diff --git a/test/java/org/jau/util/TestValueConversion.java b/test/java/jau/test/util/TestValueConversion.java
index ddcaa5f..8bf1cd9 100644
--- a/test/java/org/jau/util/TestValueConversion.java
+++ b/test/java/jau/test/util/TestValueConversion.java
@@ -1,32 +1,30 @@
 /**
- * Copyright 2012 JogAmp Community. All rights reserved.
+ * Author: Sven Gothel <[email protected]>
+ * Copyright (c) 2021 Gothel Software e.K.
+ * Copyright (c) 2012 Gothel Software e.K.
+ * Copyright (c) 2012 JogAmp Community.
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
 import static org.jau.util.ValueConv.*;
 
diff --git a/test/java/org/jau/util/TestVersionInfo.java b/test/java/jau/test/util/TestVersionInfo.java
index aa798a0..110323c 100644
--- a/test/java/org/jau/util/TestVersionInfo.java
+++ b/test/java/jau/test/util/TestVersionInfo.java
@@ -1,46 +1,46 @@
 /**
- * Copyright 2010 JogAmp Community. All rights reserved.
+ * Author: Sven Gothel <[email protected]>
+ * Copyright (c) 2021 Gothel Software e.K.
+ * Copyright (c) 2010 Gothel Software e.K.
+ * Copyright (c) 2010 JogAmp Community.
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;
 
 import org.jau.base.JaulibVersion;
-import org.jau.junit.util.JunitTracer;
 import org.jau.pkg.JaulibJarSHASum;
 import org.jau.sec.SHASum;
+import org.jau.util.VersionUtil;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestVersionInfo extends JunitTracer {
     static boolean VERBOSE = false;
diff --git a/test/java/org/jau/util/TestVersionNumber.java b/test/java/jau/test/util/TestVersionNumber.java
index de1978d..cd166e8 100644
--- a/test/java/org/jau/util/TestVersionNumber.java
+++ b/test/java/jau/test/util/TestVersionNumber.java
@@ -1,41 +1,41 @@
 /**
- * Copyright 2012 JogAmp Community. All rights reserved.
+ * Author: Sven Gothel <[email protected]>
+ * Copyright (c) 2021 Gothel Software e.K.
+ * Copyright (c) 2012 Gothel Software e.K.
+ * Copyright (c) 2012 JogAmp Community.
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util;
+package jau.test.util;
 
 import java.io.IOException;
 
-import org.jau.junit.util.JunitTracer;
+import org.jau.util.VersionNumber;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestVersionNumber extends JunitTracer {
 
diff --git a/test/java/org/jau/util/parallel/TestRunnableTask01.java b/test/java/jau/test/util/parallel/TestRunnableTask01.java
index 16da266..1332a7e 100644
--- a/test/java/org/jau/util/parallel/TestRunnableTask01.java
+++ b/test/java/jau/test/util/parallel/TestRunnableTask01.java
@@ -1,37 +1,34 @@
 /**
- * Copyright 2011 JogAmp Community. All rights reserved.
+ * Author: Sven Gothel <[email protected]>
+ * Copyright (c) 2021 Gothel Software e.K.
+ * Copyright (c) 2011 Gothel Software e.K.
+ * Copyright (c) 2011 JogAmp Community.
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util.parallel;
+package jau.test.util.parallel;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
-import org.jau.junit.util.JunitTracer;
 import org.jau.lang.InterruptSource;
 import org.jau.util.parallel.RunnableTask;
 import org.junit.Assert;
@@ -39,6 +36,8 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import jau.test.junit.util.JunitTracer;
+
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestRunnableTask01 extends JunitTracer {
 
diff --git a/test/java/org/jau/util/parallel/locks/Lock.java b/test/java/jau/test/util/parallel/locks/Lock.java
index a2798ab..f628022 100644
--- a/test/java/org/jau/util/parallel/locks/Lock.java
+++ b/test/java/jau/test/util/parallel/locks/Lock.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util.parallel.locks;
+package jau.test.util.parallel.locks;
 
 import org.jau.sys.Debug;
 
diff --git a/test/java/org/jau/util/parallel/locks/LockFactory.java b/test/java/jau/test/util/parallel/locks/LockFactory.java
index 7c3d491..f8db9f6 100644
--- a/test/java/org/jau/util/parallel/locks/LockFactory.java
+++ b/test/java/jau/test/util/parallel/locks/LockFactory.java
@@ -23,11 +23,11 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package org.jau.util.parallel.locks;
+package jau.test.util.parallel.locks;
 
-import jau.util.parallel.locks.RecursiveLockImpl01CompleteFair;
-import jau.util.parallel.locks.RecursiveLockImpl01Unfairish;
-import jau.util.parallel.locks.RecursiveThreadGroupLockImpl01Unfairish;
+import jau.test.util.parallel.locks.impl.RecursiveLockImpl01CompleteFair;
+import jau.test.util.parallel.locks.impl.RecursiveLockImpl01Unfairish;
+import jau.test.util.parallel.locks.impl.RecursiveThreadGroupLockImpl01Unfairish;
 
 public class LockFactory {
 
diff --git a/test/java/org/jau/util/parallel/locks/RecursiveLock.java b/test/java/jau/test/util/parallel/locks/RecursiveLock.java
index b1be1f4..d9e6382 100644
--- a/test/java/org/jau/util/parallel/locks/RecursiveLock.java
+++ b/test/java/jau/test/util/parallel/locks/RecursiveLock.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util.parallel.locks;
+package jau.test.util.parallel.locks;
 
 /**
  * Reentrance capable locking toolkit.
diff --git a/test/java/org/jau/util/parallel/locks/RecursiveThreadGroupLock.java b/test/java/jau/test/util/parallel/locks/RecursiveThreadGroupLock.java
index 238c188..d0d6087 100644
--- a/test/java/org/jau/util/parallel/locks/RecursiveThreadGroupLock.java
+++ b/test/java/jau/test/util/parallel/locks/RecursiveThreadGroupLock.java
@@ -23,7 +23,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package org.jau.util.parallel.locks;
+package jau.test.util.parallel.locks;
 
 /**
  * Reentrance capable locking toolkit, supporting multiple threads as owner.
diff --git a/test/java/org/jau/util/parallel/locks/SingletonInstance.java b/test/java/jau/test/util/parallel/locks/SingletonInstance.java
index 495d68c..251f965 100644
--- a/test/java/org/jau/util/parallel/locks/SingletonInstance.java
+++ b/test/java/jau/test/util/parallel/locks/SingletonInstance.java
@@ -24,12 +24,12 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util.parallel.locks;
+package jau.test.util.parallel.locks;
 
 import java.io.File;
 
-import jau.util.parallel.locks.SingletonInstanceFileLock;
-import jau.util.parallel.locks.SingletonInstanceServerSocket;
+import jau.test.util.parallel.locks.impl.SingletonInstanceFileLock;
+import jau.test.util.parallel.locks.impl.SingletonInstanceServerSocket;
 
 public abstract class SingletonInstance implements Lock {
 
diff --git a/test/java/org/jau/util/parallel/locks/ThreadLock.java b/test/java/jau/test/util/parallel/locks/ThreadLock.java
index 6e6de7e..76cc391 100644
--- a/test/java/org/jau/util/parallel/locks/ThreadLock.java
+++ b/test/java/jau/test/util/parallel/locks/ThreadLock.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.jau.util.parallel.locks;
+package jau.test.util.parallel.locks;
 
 /**
  * Extending the {@link Lock} features with convenient functionality.
diff --git a/test/java/jau/util/parallel/locks/LockDebugUtil.java b/test/java/jau/test/util/parallel/locks/impl/LockDebugUtil.java
index 67bae65..0dea297 100644
--- a/test/java/jau/util/parallel/locks/LockDebugUtil.java
+++ b/test/java/jau/test/util/parallel/locks/impl/LockDebugUtil.java
@@ -24,14 +24,14 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package jau.util.parallel.locks;
+package jau.test.util.parallel.locks.impl;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.jau.util.parallel.locks.Lock;
+import jau.test.util.parallel.locks.Lock;
 
 /**
  * Functionality enabled if {@link Lock#DEBUG} is <code>true</code>.
diff --git a/test/java/jau/util/parallel/locks/RecursiveLockImpl01CompleteFair.java b/test/java/jau/test/util/parallel/locks/impl/RecursiveLockImpl01CompleteFair.java
index 1f73444..109a73e 100644
--- a/test/java/jau/util/parallel/locks/RecursiveLockImpl01CompleteFair.java
+++ b/test/java/jau/test/util/parallel/locks/impl/RecursiveLockImpl01CompleteFair.java
@@ -24,14 +24,15 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package jau.util.parallel.locks;
+package jau.test.util.parallel.locks.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.locks.AbstractOwnableSynchronizer;
 
 import org.jau.lang.SourcedInterruptedException;
-import org.jau.util.parallel.locks.RecursiveLock;
+
+import jau.test.util.parallel.locks.RecursiveLock;
 
 /**
  * Reentrance locking toolkit, impl a complete fair FIFO scheduler
@@ -84,8 +85,8 @@ public class RecursiveLockImpl01CompleteFair implements RecursiveLock {
 
     /**
      * Returns the Throwable instance generated when this lock was taken the 1st time
-     * and if {@link org.jau.util.parallel.locks.Lock#DEBUG} is turned on, otherwise it returns always <code>null</code>.
-     * @see org.jau.util.parallel.locks.Lock#DEBUG
+     * and if {@link jau.test.util.parallel.locks.Lock#DEBUG} is turned on, otherwise it returns always <code>null</code>.
+     * @see jau.test.util.parallel.locks.Lock#DEBUG
      */
     public final Throwable getLockedStack() {
         synchronized(sync) {
diff --git a/test/java/jau/util/parallel/locks/RecursiveLockImpl01Unfairish.java b/test/java/jau/test/util/parallel/locks/impl/RecursiveLockImpl01Unfairish.java
index def7ad6..c14b77e 100644
--- a/test/java/jau/util/parallel/locks/RecursiveLockImpl01Unfairish.java
+++ b/test/java/jau/test/util/parallel/locks/impl/RecursiveLockImpl01Unfairish.java
@@ -24,12 +24,12 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package jau.util.parallel.locks;
+package jau.test.util.parallel.locks.impl;
 
 import java.util.List;
 import java.util.concurrent.locks.AbstractOwnableSynchronizer;
 
-import org.jau.util.parallel.locks.RecursiveLock;
+import jau.test.util.parallel.locks.RecursiveLock;
 
 /**
  * Reentrance locking toolkit, impl a non-complete fair FIFO scheduler.
@@ -125,8 +125,8 @@ public class RecursiveLockImpl01Unfairish implements RecursiveLock {
 
     /**
      * Returns the Throwable instance generated when this lock was taken the 1st time
-     * and if {@link org.jau.util.parallel.locks.Lock#DEBUG} is turned on, otherwise it returns always <code>null</code>.
-     * @see org.jau.util.parallel.locks.Lock#DEBUG
+     * and if {@link jau.test.util.parallel.locks.Lock#DEBUG} is turned on, otherwise it returns always <code>null</code>.
+     * @see jau.test.util.parallel.locks.Lock#DEBUG
      */
     public final Throwable getLockedStack() {
         synchronized(sync) {
diff --git a/test/java/jau/util/parallel/locks/RecursiveThreadGroupLockImpl01Unfairish.java b/test/java/jau/test/util/parallel/locks/impl/RecursiveThreadGroupLockImpl01Unfairish.java
index 36b62d3..7f283ef 100644
--- a/test/java/jau/util/parallel/locks/RecursiveThreadGroupLockImpl01Unfairish.java
+++ b/test/java/jau/test/util/parallel/locks/impl/RecursiveThreadGroupLockImpl01Unfairish.java
@@ -23,11 +23,11 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package jau.util.parallel.locks;
+package jau.test.util.parallel.locks.impl;
 
 import java.util.Arrays;
 
-import org.jau.util.parallel.locks.RecursiveThreadGroupLock;
+import jau.test.util.parallel.locks.RecursiveThreadGroupLock;
 
 public class RecursiveThreadGroupLockImpl01Unfairish
     extends RecursiveLockImpl01Unfairish
diff --git a/test/java/jau/util/parallel/locks/SingletonInstanceFileLock.java b/test/java/jau/test/util/parallel/locks/impl/SingletonInstanceFileLock.java
index 15ea217..7fe8588 100644
--- a/test/java/jau/util/parallel/locks/SingletonInstanceFileLock.java
+++ b/test/java/jau/test/util/parallel/locks/impl/SingletonInstanceFileLock.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package jau.util.parallel.locks;
+package jau.test.util.parallel.locks.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,7 +32,8 @@ import java.io.RandomAccessFile;
 import java.nio.channels.FileLock;
 
 import org.jau.lang.InterruptSource;
-import org.jau.util.parallel.locks.SingletonInstance;
+
+import jau.test.util.parallel.locks.SingletonInstance;
 
 public class SingletonInstanceFileLock extends SingletonInstance {
 
diff --git a/test/java/jau/util/parallel/locks/SingletonInstanceServerSocket.java b/test/java/jau/test/util/parallel/locks/impl/SingletonInstanceServerSocket.java
index 32e1ed5..8993438 100644
--- a/test/java/jau/util/parallel/locks/SingletonInstanceServerSocket.java
+++ b/test/java/jau/test/util/parallel/locks/impl/SingletonInstanceServerSocket.java
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package jau.util.parallel.locks;
+package jau.test.util.parallel.locks.impl;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -36,7 +36,8 @@ import org.jau.lang.ExceptionUtils;
 import org.jau.lang.InterruptSource;
 import org.jau.lang.InterruptedRuntimeException;
 import org.jau.lang.SourcedInterruptedException;
-import org.jau.util.parallel.locks.SingletonInstance;
+
+import jau.test.util.parallel.locks.SingletonInstance;
 
 public class SingletonInstanceServerSocket extends SingletonInstance {
 
diff --git a/test/java/org/jau/util/parallel/locks/package.html b/test/java/jau/test/util/parallel/locks/package.html
index c50570d..c50570d 100644
--- a/test/java/org/jau/util/parallel/locks/package.html
+++ b/test/java/jau/test/util/parallel/locks/package.html
diff --git a/test/java/manifest-fat.txt.in b/test/java/manifest-fat.txt.in
new file mode 100644
index 0000000..6facee3
--- /dev/null
+++ b/test/java/manifest-fat.txt.in
@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Bundle-Date: @BUILD_TSTAMP@
+Bundle-ManifestVersion: 2
+Bundle-Name: org.jau.test
+Bundle-SymbolicName: org.jau.test
+Bundle-Version: @VERSION_SHORT@
+Export-Package: org.jau.test
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.9))"
+Package-Title: org.jau.test
+Package-Vendor: Gothel Software
+Package-Version: @VERSION_SHORT@
+Specification-Title: Jaulib Fat Unit Tests
+Specification-Vendor: Gothel Software
+Specification-Version: @VERSION_API@
+Implementation-Title: Jaulib Fat Unit Tests
+Implementation-Vendor: Gothel Software
+Implementation-Version: @VERSION@
+Implementation-Commit: @VERSION_SHA1@
+Implementation-URL: http://www.jausoft.com/
+Extension-Name: org.jau.test
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+Main-Class: jau.test.VersionInfo
+
+Name: org/jau
+Sealed: true
+
+Name: jau/util
+Sealed: true
+
+Name: jau/sys
+Sealed: true
+
+Name: jau/pkg
+Sealed: true
+
+Name: jau/test
+Sealed: true
+
diff --git a/test/java/manifest.txt.in b/test/java/manifest.txt.in
index 1611a44..5e0283a 100644
--- a/test/java/manifest.txt.in
+++ b/test/java/manifest.txt.in
@@ -22,4 +22,8 @@ Trusted-Library: true
 Permissions: all-permissions
 Application-Library-Allowable-Codebase: *
 Class-Path: jaulib-fat.jar
-Main-Class: org.jau.util.TestVersionInfo
+Main-Class: jau.test.VersionInfo
+
+Name: jau/test
+Sealed: true
+
diff --git a/test/java/org/jau/util/TestLFRingBuffer01.java b/test/java/org/jau/util/TestLFRingBuffer01.java
deleted file mode 100644
index bc622e2..0000000
--- a/test/java/org/jau/util/TestLFRingBuffer01.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2013 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-
-package org.jau.util;
-
-import org.junit.FixMethodOrder;
-import org.junit.runners.MethodSorters;
-
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestLFRingBuffer01 extends RingBuffer01Base {
-    @Override
-    public Ringbuffer<Integer> createEmpty(final int initialCapacity) {
-        return new LFRingbuffer<Integer>(Integer[].class, initialCapacity);
-    }
-    @Override
-    public Ringbuffer<Integer> createFull(final Integer[] source) {
-        return new LFRingbuffer<Integer>(source);
-    }
-
-    public static void main(final String args[]) {
-        org.junit.runner.JUnitCore.main(TestLFRingBuffer01.class.getName());
-    }
-
-}