From 8cc415db075d9b3fef3fb577d9c3e398003ec8bc Mon Sep 17 00:00:00 2001 From: Ralf Wisser Date: Mon, 12 Oct 2020 14:37:14 +0200 Subject: [PATCH] added jaxb jars to any jdbc classloader --- admin/j14pack.bat | 4 ++-- .../net/sf/jailer/database/BasicDataSource.java | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/admin/j14pack.bat b/admin/j14pack.bat index 990f5321b..ec2a9f327 100644 --- a/admin/j14pack.bat +++ b/admin/j14pack.bat @@ -1,4 +1,4 @@ -set version=10.1.1 +set version=10.1.1.x set PATH=C:\Program Files\Java\jdk-15\bin;%PATH% @@ -6,7 +6,7 @@ del /S /Q c:\tmp\_ del /S /Q c:\tmp\jlrjre%version% mkdir c:\tmp\_ cd .. - +cc xcopy /S /E bookmark c:\tmp\_\bookmark\ xcopy build.xml c:\tmp\_\ xcopy /S /E config c:\tmp\_\config\ diff --git a/src/main/engine/net/sf/jailer/database/BasicDataSource.java b/src/main/engine/net/sf/jailer/database/BasicDataSource.java index e12b81127..521e267ef 100644 --- a/src/main/engine/net/sf/jailer/database/BasicDataSource.java +++ b/src/main/engine/net/sf/jailer/database/BasicDataSource.java @@ -439,7 +439,19 @@ public class BasicDataSource implements DataSource { return classloaders.get(mapKey); } _log.info("added '" + mapKey + "' to classpath"); - URLClassLoader urlLoader = new URLClassLoader(jdbcDriverURL); + List withJAXB = new ArrayList(); + for (URL url: jdbcDriverURL) { + withJAXB.add(url); + } + try { + withJAXB.add(new File("lib", "activation-1.0.2.jar").toURI().toURL()); + withJAXB.add(new File("lib", "jaxb-api-2.3.0-b170201.1204.jar").toURI().toURL()); + withJAXB.add(new File("lib", "jaxb-core-2.3.0-b170127.1453.jar").toURI().toURL()); + withJAXB.add(new File("lib", "jaxb-impl-2.3.0-b170127.1453.jar").toURI().toURL()); + } catch (Exception e) { + e.printStackTrace(); + } + URLClassLoader urlLoader = new URLClassLoader(withJAXB.toArray(new URL[0])); classloaders.put(mapKey, urlLoader); return urlLoader; }