jpackage configuration fixes

This commit is contained in:
Ralf Wisser
2020-10-13 12:46:43 +02:00
parent 7da72a1347
commit bbf296ffcd
6 changed files with 37 additions and 5 deletions

View File

@@ -1,2 +1,4 @@
icon=jailer.ico
main-jar=jailer.jar
main-class=net.sf.jailer.ui.databrowser.DataBrowser
arguments=JailerDataBrowser

View File

@@ -6,9 +6,8 @@ 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\
xcopy /S /E datamodel c:\tmp\_\datamodel\
xcopy demo-sakila-1.4.mv.db c:\tmp\_

View File

@@ -1,4 +1,4 @@
echo off
@echo off
set LIB=lib
rem configuration files in the config directory

View File

@@ -25,6 +25,9 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogManager;
import javax.sql.DataSource;
@@ -76,7 +79,7 @@ public class Jailer {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(Jailer.class);
private static Logger _log;
/**
* Main-method for CLI.
@@ -100,6 +103,16 @@ public class Jailer {
}
});
try {
java.util.logging.Logger rootLogger = LogManager.getLogManager().getLogger("");
rootLogger.setLevel(Level.OFF);
for (Handler h : rootLogger.getHandlers()) {
h.setLevel(Level.OFF);
}
System.setProperty("com.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize", "true");
} catch (Exception e) {
}
if (new File(".singleuser").exists() // legacy
|| new File(".multiuser").exists()) {
File home = new File(System.getProperty("user.home"), ".jailer");
@@ -108,6 +121,7 @@ public class Jailer {
Configuration configuration = Configuration.getInstance();
configuration.setTempFileFolder(new File(home, "tmp").getPath());
}
_log = Logger.getLogger(Jailer.class);
try {
System.setProperty("db2.jcc.charsetDecoderEncoder", "3");
} catch (Exception e) {

View File

@@ -29,6 +29,9 @@ import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Random;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogManager;
import javax.swing.JOptionPane;
@@ -54,6 +57,16 @@ public class Environment {
// https://bugs.openjdk.java.net/browse/JDK-8215200
System.setProperty("java.util.Arrays.useLegacyMergeSort", "true");
try {
java.util.logging.Logger rootLogger = LogManager.getLogManager().getLogger("");
rootLogger.setLevel(Level.SEVERE);
for (Handler h : rootLogger.getHandlers()) {
h.setLevel(Level.SEVERE);
}
System.setProperty("com.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize", "true");
} catch (Exception e) {
}
initUI();
try {
File app;

View File

@@ -2085,13 +2085,17 @@ public class ExtractionModelFrame extends javax.swing.JFrame {
*/
public static void main(String args[]) {
try {
if (args.length > 0 && "JailerDataBrowser".equals(args[0])) {
DataBrowser.main(new String[0]);
return;
}
start(args);
} catch (Throwable t) {
t.printStackTrace();
UIUtil.showException(null, "Error", t);
}
}
/**
* @param args the command line arguments
*/