#969: Use new CTPG Parser in Java VM

doc/changes/changes_8.4.0.md

@@ -26,6 +26,7 @@ This release uses version 1.0.0 of the container tool.
   - #967: Added ctpg script options parser
   - #972: Refactor exception handling for Script Options parser
   - #973: Support new lines and white spaces at the beginning in script options values
+  - #969: Use new CTPG Parser in Java VM
 
 ## Bugs
   - #977: Fixed Trivy update cache workflow

exaudfclient/BUILD

@@ -90,7 +90,7 @@ cc_binary(
     srcs = ["exaudfclient.cc", "//base:load_dynamic"],
     linkopts = ["-ldl"], # needed for dynamicly loading libexaudflib_complete.so into another linker namespace
     deps = ["//base/exaudflib:header", "//base/utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
-            ["//base/exaudflib:exaudflib-deps", "//base/swig_factory:swig_factory"],
+            ["//base/exaudflib:exaudflib-deps"],
     defines = VM_ENABLED_DEFINES,
     data = ["//base:libexaudflib_complete.so"]
 )
@@ -113,7 +113,7 @@ cc_binary(
     srcs = ["exaudfclient.cc",  "//base:load_dynamic"],
     linkopts = ["-ldl"], # needed for dynamicly loading libexaudflib_complete.so into another linker namespace
     deps = ["//base/exaudflib:header", "//base/utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
-            ["//base/exaudflib:exaudflib-deps", "//base/swig_factory:swig_factory"] + [ "@zmq//:zmq", "@protobuf//:protobuf"],
+            ["//base/exaudflib:exaudflib-deps"] + [ "@zmq//:zmq", "@protobuf//:protobuf"],
     defines = VM_ENABLED_DEFINES,
     data = ["//base:libexaudflib_complete.so"],
 )

exaudfclient/exaudfclient.cc

@@ -38,7 +38,7 @@
 #include <inttypes.h>
 
 #ifdef ENABLE_JAVA_VM
-#include "base/javacontainer/javacontainer.h"
+#include "base/javacontainer/javacontainer_builder.h"
 #endif //ENABLE_JAVA_VM
 
 #ifdef ENABLE_PYTHON_VM
@@ -170,7 +170,7 @@ int main(int argc, char **argv) {
     } else if (strcmp(argv[2], "lang=java")==0)
     {
 #ifdef ENABLE_JAVA_VM
-        vmMaker = [&](){return new SWIGVMContainers::JavaVMach(false, swigFactory);};
+        vmMaker = [&](){return SWIGVMContainers::JavaContainerBuilder().build();};
 #else
         throw SWIGVM::exception("this exaudfclient has been compilied without Java support");
 #endif