using json binding instead of JAXB

This commit is contained in:
Ralf Wisser
2024-01-30 12:34:34 +01:00
parent a3972c8ba9
commit a1f31d4e05
11 changed files with 31 additions and 76 deletions

Binary file not shown.

View File

@@ -21,7 +21,7 @@ xcopy jailer.bat c:\tmp\_
xcopy Jailer.exe c:\tmp\_
xcopy jailer.jar c:\tmp\_
xcopy jailer.sh c:\tmp\_
xcopy jailer.xml c:\tmp\_
xcopy jailer.json c:\tmp\_
xcopy jailerDataBrowser.bat c:\tmp\_
xcopy JailerDataBrowser.exe c:\tmp\_
xcopy jailerDataBrowser.sh c:\tmp\_
@@ -43,14 +43,9 @@ del /Q c:\tmp\_\lib\*
del /Q c:\tmp\_\*.sh
move c:\tmp\_\jdbc_lib\args4j.jar c:\tmp\_\lib\args4j.jar
move c:\tmp\_\jdbc_lib\activation-1.1.1.jar c:\tmp\_\lib\activation-1.1.1.jar
move c:\tmp\_\jdbc_lib\FastInfoset-1.2.13.jar c:\tmp\_\lib\FastInfoset-1.2.13.jar
move c:\tmp\_\jdbc_lib\istack-commons-runtime-3.0.5.jar c:\tmp\_\lib\istack-commons-runtime-3.0.5.jar
move c:\tmp\_\jdbc_lib\jaxb-api-2.3.0.jar c:\tmp\_\lib\jaxb-api-2.3.0.jar
move c:\tmp\_\jdbc_lib\jaxb-core-2.3.0.jar c:\tmp\_\lib\jaxb-core-2.3.0.jar
move c:\tmp\_\jdbc_lib\jaxb-runtime-2.3.0.jar c:\tmp\_\lib\jaxb-runtime-2.3.0.jar
move c:\tmp\_\jdbc_lib\stax-ex-1.7.8.jar c:\tmp\_\lib\stax-ex-1.7.8.jar
move c:\tmp\_\jdbc_lib\txw2-2.3.0.jar c:\tmp\_\lib\txw2-2.3.0.jar
move c:\tmp\_\jdbc_lib\jackson-core-2.16.1.jar c:\tmp\_\lib\jackson-core-2.16.1.jar
move c:\tmp\_\jdbc_lib\jackson-annotations-2.16.1.jar c:\tmp\_\lib\jackson-annotations-2.16.1.jar
move c:\tmp\_\jdbc_lib\jackson-databind-2.16.1.jar c:\tmp\_\lib\jackson-databind-2.16.1.jar
move c:\tmp\_\jdbc_lib\jsqlparser-3.2.jar c:\tmp\_\lib\jsqlparser-3.2.jar
move c:\tmp\_\jdbc_lib\log4j-api-2.17.2.jar c:\tmp\_\lib\log4j-api-2.17.2.jar
move c:\tmp\_\jdbc_lib\log4j-core-2.17.2.jar c:\tmp\_\lib\log4j-core-2.17.2.jar

View File

@@ -20,7 +20,7 @@ cp -r jailer.bat ~/tmp/_
cp -r Jailer.exe ~/tmp/_
cp -r jailer.jar ~/tmp/_
cp -r jailer.sh ~/tmp/_
cp -r jailer.xml ~/tmp/_
cp -r jailer.json ~/tmp/_
cp -r jailerDataBrowser.bat ~/tmp/_
cp -r JailerDataBrowser.exe ~/tmp/_
cp -r jailerDataBrowser.sh ~/tmp/_
@@ -46,14 +46,9 @@ rm ~/tmp/_/*.exe
chmod a+x ~/tmp/_/*.sh
mv ~/tmp/_/jdbc_lib/args4j.jar ~/tmp/_/lib/args4j.jar
mv ~/tmp/_/jdbc_lib/activation-1.1.1.jar ~/tmp/_/lib/activation-1.1.1.jar
mv ~/tmp/_/jdbc_lib/FastInfoset-1.2.13.jar ~/tmp/_/lib/FastInfoset-1.2.13.jar
mv ~/tmp/_/jdbc_lib/istack-commons-runtime-3.0.5.jar ~/tmp/_/lib/istack-commons-runtime-3.0.5.jar
mv ~/tmp/_/jdbc_lib/jaxb-api-2.3.0.jar ~/tmp/_/lib/jaxb-api-2.3.0.jar
mv ~/tmp/_/jdbc_lib/jaxb-core-2.3.0.jar ~/tmp/_/lib/jaxb-core-2.3.0.jar
mv ~/tmp/_/jdbc_lib/jaxb-runtime-2.3.0.jar ~/tmp/_/lib/jaxb-runtime-2.3.0.jar
mv ~/tmp/_/jdbc_lib/stax-ex-1.7.8.jar ~/tmp/_/lib/stax-ex-1.7.8.jar
mv ~/tmp/_/jdbc_lib/txw2-2.3.0.jar ~/tmp/_/lib/txw2-2.3.0.jar
mv ~/tmp/_/jdbc_lib/jackson-core-2.16.1.jar ~/tmp/_/lib/jackson-core-2.16.1.jar
mv ~/tmp/_/jdbc_lib/jackson-annotations-2.16.1.jar ~/tmp/_/lib/jackson-annotations-2.16.1.jar
mv ~/tmp/_/jdbc_lib/jackson-databind-2.16.1.jar ~/tmp/_/lib/jackson-databind-2.16.1.jar
mv ~/tmp/_/jdbc_lib/jsqlparser-3.2.jar ~/tmp/_/lib/jsqlparser-3.2.jar
mv ~/tmp/_/jdbc_lib/log4j-api-2.17.2.jar ~/tmp/_/lib/log4j-api-2.17.2.jar
mv ~/tmp/_/jdbc_lib/log4j-core-2.17.2.jar ~/tmp/_/lib/log4j-core-2.17.2.jar

View File

@@ -89,14 +89,10 @@ CP="$CP;$LIB/flatlaf-3.3.jar"
CP="$CP;$LIB/args4j.jar"
CP="$CP;$LIB/prefuse.jar"
CP="$CP;$LIB/sdoc-0.5.0-beta.jar"
CP="$CP;$LIB/activation-1.1.1.jar"
CP="$CP;$LIB/FastInfoset-1.2.13.jar"
CP="$CP;$LIB/istack-commons-runtime-3.0.5.jar"
CP="$CP;$LIB/axb-api-2.3.0.jar"
CP="$CP;$LIB/jaxb-core-2.3.0.jar"
CP="$CP;$LIB/jaxb-runtime-2.3.0.jar"
CP="$CP;$LIB/stax-ex-1.7.8.jar"
CP="$CP;$LIB/txw2-2.3.0.jar"
CP="$CP;$LIB/jackson-core-2.16.1.jar"
CP="$CP;$LIB/jackson-annotations-2.16.1.jar"
CP="$CP;$LIB/jackson-databind-2.16.1.jar"
CP="$CP;$LIB/jsqlparser-3.2.jar"
CP="$CP;$LIB/tablefilter-swing-5.3.1.jar"
CP="$CP;jailer.jar"

View File

@@ -16,15 +16,10 @@
<icon>C:\Users\ralfw\git\Jailer\src\main\gui\net\sf\jailer\ui\resource\jailer.ico</icon>
<classPath>
<mainClass>net.sf.jailer.ui.ExtractionModelFrame</mainClass>
<cp>lib/activation-1.1.1.jar</cp>
<cp>lib/FastInfoset-1.2.13.jar</cp>
<cp>lib/istack-commons-runtime-3.0.5.jar</cp>
<cp>lib/axb-api-2.3.0.jar</cp>
<cp>lib/jaxb-core-2.3.0.jar</cp>
<cp>lib/jaxb-impl-2.3.0.jar</cp>
<cp>lib/jaxb-runtime-2.3.0.jar</cp>
<cp>lib/stax-ex-1.7.8.jar</cp>
<cp>lib/txw2-2.3.0.jar</cp>
<cp>lib/jackson-core-2.16.1.jar</cp>
<cp>lib/jackson-annotations-2.16.1.jar</cp>
<cp>lib/jackson-databind-2.16.1.jar</cp>
<cp>lib/prefuse.jar</cp>
<cp>config/</cp>
<cp>lib/log4j-api-2.17.2.jar</cp>

View File

@@ -16,15 +16,9 @@
<icon>C:\Users\ralfw\git\Jailer\src\main\gui\net\sf\jailer\ui\resource\jailer.ico</icon>
<classPath>
<mainClass>net.sf.jailer.ui.ExtractionModelFrame</mainClass>
<cp>lib/activation-1.1.1.jar</cp>
<cp>lib/FastInfoset-1.2.13.jar</cp>
<cp>lib/istack-commons-runtime-3.0.5.jar</cp>
<cp>lib/axb-api-2.3.0.jar</cp>
<cp>lib/jaxb-core-2.3.0.jar</cp>
<cp>lib/jaxb-impl-2.3.0.jar</cp>
<cp>lib/jaxb-runtime-2.3.0.jar</cp>
<cp>lib/stax-ex-1.7.8.jar</cp>
<cp>lib/txw2-2.3.0.jar</cp>
<cp>lib/jackson-core-2.16.1.jar</cp>
<cp>lib/jackson-annotations-2.16.1.jar</cp>
<cp>lib/jackson-databind-2.16.1.jar</cp>
<cp>lib/prefuse.jar</cp>
<cp>config/</cp>
<cp>lib/log4j-api-2.17.2.jar</cp>

View File

@@ -77,7 +77,7 @@ available targets:
<jar destfile="${JAR-ENGINE}" basedir="${COMPILE_DIR}">
<manifest>
<attribute name="Main-Class" value="net.sf.jailer.Jailer" />
<attribute name="Class-Path" value="lib/activation-1.1.1.jar lib/FastInfoset-1.2.13.jar lib/istack-commons-runtime-3.0.5.jar lib/axb-api-2.3.0.jar lib/jaxb-core-2.3.0.jar lib/jaxb-impl-2.3.0.jar lib/jaxb-runtime-2.3.0.jar lib/stax-ex-1.7.8.jar lib/txw2-2.3.0.jar lib/log4j-api-2.17.2.jar lib/log4j-core-2.17.2.jar lib/log4j-slf4j-impl-2.17.2.jar lib/slf4j-api-1.7.25.jar lib/flatlaf-3.3.jar lib/args4j.jar config/" />
<attribute name="Class-Path" value="lib/axb-api-2.3.0.jar lib/jackson-core-2.16.1.jar lib/jackson-annotations-2.16.1.jar lib/jackson-databind-2.16.1.jar lib/log4j-api-2.17.2.jar lib/log4j-core-2.17.2.jar lib/log4j-slf4j-impl-2.17.2.jar lib/slf4j-api-1.7.25.jar lib/flatlaf-3.3.jar lib/args4j.jar config/" />
</manifest>
</jar>
</target>
@@ -86,7 +86,7 @@ available targets:
<jar destfile="${JAR}" basedir="${COMPILE_DIR}">
<manifest>
<attribute name="Main-Class" value="net.sf.jailer.ui.JailerUI" />
<attribute name="Class-Path" value="lib/activation-1.1.1.jar lib/FastInfoset-1.2.13.jar lib/istack-commons-runtime-3.0.5.jar lib/axb-api-2.3.0.jar lib/jaxb-core-2.3.0.jar lib/jaxb-impl-2.3.0.jar lib/jaxb-runtime-2.3.0.jar lib/stax-ex-1.7.8.jar lib/txw2-2.3.0.jar lib/prefuse.jar config/ lib/log4j-api-2.17.2.jar lib/log4j-core-2.17.2.jar lib/log4j-slf4j-impl-2.17.2.jar lib/slf4j-api-1.7.25.jar lib/flatlaf-3.3.jar lib/args4j.jar lib/sdoc-0.5.0-beta.jar lib/jsqlparser-3.2.jar lib/tablefilter-swing-5.3.1.jar" />
<attribute name="Class-Path" value="lib/axb-api-2.3.0.jar lib/jackson-core-2.16.1.jar lib/jackson-annotations-2.16.1.jar lib/jackson-databind-2.16.1.jar lib/prefuse.jar config/ lib/log4j-api-2.17.2.jar lib/log4j-core-2.17.2.jar lib/log4j-slf4j-impl-2.17.2.jar lib/slf4j-api-1.7.25.jar lib/flatlaf-3.3.jar lib/args4j.jar lib/sdoc-0.5.0-beta.jar lib/jsqlparser-3.2.jar lib/tablefilter-swing-5.3.1.jar" />
</manifest>
</jar>
<copy todir=".">

View File

@@ -16,14 +16,9 @@ set CP=%CP%;%LIB%\slf4j-api-1.7.25.jar
set CP=%CP%;%LIB%\flatlaf-3.3.jar
set CP=%CP%;%LIB%\args4j.jar
set CP=%CP%;%LIB%\sdoc-0.5.0-beta.jar
set CP=%CP%;%LIB%\activation-1.1.1.jar
set CP=%CP%;%LIB%\FastInfoset-1.2.13.jar
set CP=%CP%;%LIB%\istack-commons-runtime-3.0.5.jar
set CP=%CP%;%LIB%\jaxb-api-2.3.0.jar
set CP=%CP%;%LIB%\jaxb-core-2.3.0.jar
set CP=%CP%;%LIB%\jaxb-runtime-2.3.0.jar
set CP=%CP%;%LIB%\stax-ex-1.7.8.jar
set CP=%CP%;%LIB%\txw2-2.3.0.jar
set CP=%CP%;%LIB%\jackson-core-2.16.1.jar
set CP=%CP%;%LIB%\jackson-annotations-2.16.1.jar
set CP=%CP%;%LIB%\jackson-databind-2.16.1.jar
set CP=%CP%;jailer.jar
java -Xmx1200M -cp %CP% net.sf.jailer.Jailer %*

View File

@@ -20,14 +20,9 @@ CP=$CP:$LIB/slf4j-api-1.7.25.jar
CP=$CP:$LIB/flatlaf-3.3.jar
CP=$CP:$LIB/args4j.jar
CP=$CP:$LIB/sdoc-0.5.0-beta.jar
CP=$CP:$LIB/activation-1.1.1.jar
CP=$CP:$LIB/FastInfoset-1.2.13.jar
CP=$CP:$LIB/istack-commons-runtime-3.0.5.jar
CP=$CP:$LIB/axb-api-2.3.0.jar
CP=$CP:$LIB/jaxb-core-2.3.0.jar
CP=$CP:$LIB/jaxb-runtime-2.3.0.jar
CP=$CP:$LIB/stax-ex-1.7.8.jar
CP=$CP:$LIB/txw2-2.3.0.jar
CP=$CP:$LIB/jackson-core-2.16.1.jar
CP=$CP:$LIB/jackson-annotations-2.16.1.jar
CP=$CP:$LIB/jackson-databind-2.16.1.jar
CP=$CP:jailer.jar
java -Xmx1200M -cp $CP net.sf.jailer.Jailer "$@"

View File

@@ -14,14 +14,9 @@ set CP=%CP%;%LIB%\flatlaf-3.3.jar
set CP=%CP%;%LIB%\args4j.jar
set CP=%CP%;%LIB%\prefuse.jar
set CP=%CP%;%LIB%\sdoc-0.5.0-beta.jar
set CP=%CP%;%LIB%\activation-1.1.1.jar
set CP=%CP%;%LIB%\FastInfoset-1.2.13.jar
set CP=%CP%;%LIB%\istack-commons-runtime-3.0.5.jar
set CP=%CP%;%LIB%\axb-api-2.3.0.jar
set CP=%CP%;%LIB%\jaxb-core-2.3.0.jar
set CP=%CP%;%LIB%\jaxb-runtime-2.3.0.jar
set CP=%CP%;%LIB%\stax-ex-1.7.8.jar
set CP=%CP%;%LIB%\txw2-2.3.0.jar
set CP=%CP%;%LIB%\jackson-core-2.16.1.jar
set CP=%CP%;%LIB%\jackson-annotations-2.16.1.jar
set CP=%CP%;%LIB%\jackson-databind-2.16.1.jar
set CP=%CP%;%LIB%\jsqlparser-3.2.jar
set CP=%CP%;%LIB%\tablefilter-swing-5.3.1.jar
set CP=%CP%;jailer.jar

View File

@@ -21,14 +21,9 @@ CP=$CP:$LIB/flatlaf-3.3.jar
CP=$CP:$LIB/args4j.jar
CP=$CP:$LIB/prefuse.jar
CP=$CP:$LIB/sdoc-0.5.0-beta.jar
CP=$CP:$LIB/activation-1.1.1.jar
CP=$CP:$LIB/FastInfoset-1.2.13.jar
CP=$CP:$LIB/istack-commons-runtime-3.0.5.jar
CP=$CP:$LIB/axb-api-2.3.0.jar
CP=$CP:$LIB/jaxb-core-2.3.0.jar
CP=$CP:$LIB/jaxb-runtime-2.3.0.jar
CP=$CP:$LIB/stax-ex-1.7.8.jar
CP=$CP:$LIB/txw2-2.3.0.jar
CP=$CP:$LIB/jackson-core-2.16.1.jar
CP=$CP:$LIB/jackson-annotations-2.16.1.jar
CP=$CP:$LIB/jackson-databind-2.16.1.jar
CP=$CP:$LIB/jsqlparser-3.2.jar
CP=$CP:$LIB/tablefilter-swing-5.3.1.jar
CP=$CP:jailer.jar