From bb2cd387a6a64ae79fd5951024bfc97012b9445c Mon Sep 17 00:00:00 2001 From: Ralf Wisser Date: Thu, 13 Feb 2020 07:45:09 +0100 Subject: [PATCH] added TODOs --- admin/j14pack.bat | 5 +- admin/j14pack.sh | 44 ++++++++++++++++++ admin/jailer.png | Bin 0 -> 2916 bytes .../gui/net/sf/jailer/ui/Environment.java | 27 ++++++++++- .../gui/net/sf/jailer/ui/util/HttpUtil.java | 1 + 5 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 admin/j14pack.sh create mode 100644 admin/jailer.png diff --git a/admin/j14pack.bat b/admin/j14pack.bat index 2cfc58286..0ae5cf528 100644 --- a/admin/j14pack.bat +++ b/admin/j14pack.bat @@ -1,6 +1,7 @@ set PATH=d:\jdk-14\bin;%PATH% rm -r c:\tmp\_ +rm -r c:\tmp\myjre mkdir c:\tmp\_ cd .. @@ -39,7 +40,9 @@ cp admin\databrowserlauncher.properties c:\tmp\_ cd c:\tmp\_ -jpackage --name myapp --input . --main-jar jailer.jar --type msi --icon jailer.ico --win-menu --win-menu-group JailerJ14 --vendor Wisser --app-version 2.6 --win-upgrade-uuid d636b4ee-6f10-451e-bf57-c89656780e22 --add-launcher "Jailer Data Browser"=databrowserlauncher.properties +jlink --add-modules java.base,java.datatransfer,java.desktop,java.logging,java.management,java.scripting,java.sql,java.xml,java.rmi,java.scripting,java.xml.crypto --output myjre + +jpackage --name myapp --input . --main-jar jailer.jar --type msi --icon jailer.ico --win-menu --win-menu-group JailerJ14 --vendor Wisser --app-version 2.9 --win-upgrade-uuid d636b4ee-6f10-451e-bf57-c89656780e22 --add-launcher "Jailer Data Browser"=databrowserlauncher.properties --runtime-image myjre pause diff --git a/admin/j14pack.sh b/admin/j14pack.sh new file mode 100644 index 000000000..f1fb17837 --- /dev/null +++ b/admin/j14pack.sh @@ -0,0 +1,44 @@ + +rm -r ~/tmp/_ +mkdir ~/tmp/_ +rm -r ~/tmp/myjre +cd .. + +cp -r bookmark ~/tmp/_ +cp -r build.xml ~/tmp/_ +cp -r config ~/tmp/_ +cp -r datamodel ~/tmp/_ +cp -r dbeauty.bat ~/tmp/_ +cp -r dbeauty.exe ~/tmp/_ +cp -r dbeauty.sh ~/tmp/_ +cp -r demo-sakila-1.4.mv.db ~/tmp/_ +cp -r demo-scott-1.4.mv.db ~/tmp/_ +cp -r demo-scott-subset-1.4.mv.db ~/tmp/_ +cp -r driverlist.csv ~/tmp/_ +cp -r extractionmodel ~/tmp/_ +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 jailerDataBrowser.bat ~/tmp/_ +cp -r JailerDataBrowser.exe ~/tmp/_ +cp -r jailerDataBrowser.sh ~/tmp/_ +cp -r jailerGUI.bat ~/tmp/_ +cp -r jailerGUI.sh ~/tmp/_ +cp -r layout ~/tmp/_ +cp -r lib ~/tmp/_ +cp -r license-prefuse.txt ~/tmp/_ +cp -r license.txt ~/tmp/_ +cp -r manifest.mf ~/tmp/_ +cp -r README.md ~/tmp/_ +cp -r releasenotes.txt ~/tmp/_ +cp -r render ~/tmp/_ +cp admin/jailer.png ~/tmp/_ +cp admin/databrowserlauncher.properties ~/tmp/_ + +cd ~/tmp/_ + +~/jdk-14/bin/jlink --add-modules java.base,java.datatransfer,java.desktop,java.logging,java.management,java.scripting,java.sql,java.xml,java.rmi,java.scripting,java.xml.crypto --output myjre + +~/jdk-14/bin/jpackage --name Jailer --input . --main-jar jailer.jar --type deb --icon jailer.png --vendor Wisser --app-version 2.8 --add-launcher "Jailer Data Browser"=databrowserlauncher.properties --runtime-image myjre diff --git a/admin/jailer.png b/admin/jailer.png new file mode 100644 index 0000000000000000000000000000000000000000..9e2ada84fbd32e938e6fd481199ff4b58618db81 GIT binary patch literal 2916 zcmV-q3!C(bP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGj5C8xU!~weVTb2L-3i(MyK~#8N?OR!M z6xS90x@Xg%U7#8^gKcbK9Ah99#$mBUDg;6(s%+)Ksmk_Xc**vVzmN)rlV_fiRI1`~ zB{r(K659cT%pL?@*jzCo4u~Z}fJV|tqgi@-`sSS5-I7MrGt)ilK@ahVuWsMlx6eK2 zyXTzlzCBii5O9M72M&l+r%s`>vlCaZUd7FuHxY})(9_eSSVKI4<()iv5?x(gvz9j- z-BhdozlA3P+!_$jYiS#$0Iev|4Ib54MwRFy(}!cI zXVnk}#&fvRAICc%^obk&cf4EX5;gY#HsIDs23jxzwZ0x&C~Tc6jigW^B2lPyQ4FQ? zICH5Vr~58docNJ>fSZXfUin1GkI%-2`5=2H0EI{hqz`y z4~CF}f@^n%@xjTDeJ7!2A@DC!ctiv8(J10M0|_?9aH*VOz{m@vvUvwAa9^(!bD!d&4GkD z&(9x8P6A)Z38JShYS%gJdwkPM6?_{1Lbscg0CTP zl$45-t7a+TvHnxAjF-zud96JqOjc52uz|dF* zDMLYy;+9A8Umh=wkQQ-~L(4;6L)OkPUT`kS=aD4>;)yKIoWEQkZB7ZuYMK~IYLw|o zB*i{*bi3m^&ziFVrV(xkFkPMpPF*LAyjk)(^jr>ODGkGklzD-LM?yd;e0upBl9Z^R zkVsNm=;Xd!hzOxkVM27OsZ58X(qt&dJh3TPT9Q>{U12)+ED_gpeUKFp~rx!v-6)(t?cURhNYDFzFelD@|nPfPj)Az)Dj+X*?4l z$MP{()aIl{gxKKob}0Z8Mk_B3l_6jkHk=DxOKpvwF{Y!GZskyw2RKc{J+hk(BIV36 zRO~)(vk{g7HXLQy*YbFI$hFnSkZtCpP!_{UUO9LofQ8#-CW5L8g}bGZRIG~FkSjmA zdfYb+&I(hXZM>}cfXnnY5DHGIUrx7j@GS)9)rIMmg%TDk%0swfm!EC`SCXJ9ILe!D zycO?en+ddz=}%oa$On_~YCOX?0@~Xe5N2t%!SYeoI%bWf18^T7m|$5Y39vneAw|&f zw4uD0T0bvjwM@(@0joMzD6OQB!nZ9pOs*ak9?y1IkF?T5DnZU+jpO4P#*?cd8VR7K zF=};~s5t@BuriY@Xsn~RfIJjwJS)x0Q?Wxq5+a8dpjf8W=4+%3vuQ(B6*SjJu ztR7QF%?YT4Mf2;?98!n`YsJ_AUUjJ$AJbn+#1tHr=B`r42ULWE3Kq9FV8Q&>S$|Zh zihxo~Z(P4xSu#J0h-x4}s!5lZMo^Jqz{h+r1wLOSPr7{Z94ZM71%Q@@2p(VDX7v`L zly0TqTMn?X>WLWI>Qn@Ujvy&34dF|u<_!+BQ2`D^OygB53YITy#=7TM6|KHk;~7;E zP;MelhAS4gpn;4JDF#A311CV+csC(10|7ET5(M ze^q(ru~sxvKHytpgdSKpB+R%r$1qq~r>8j^3MIQR`Fw;*fS$6JQrz#^zR^1C532G2 zH~41P2Ibl1ZD@`t2-2M)8V=BdOF+hOCCC-0hn)JlASFDNvc7?*m$l;i-P@E%I9xLE zd0l-*O+3KH*SD-!)^^0ei7~7S3JH383l=`TIbj|fPTs>0JIxItJh!49uY7BBNyDAI zC@){8D#P_pWM+#G&wL{8+#kbeGK-)8aHsOC{jZA?$B$v{+O_EK@5jKv0Ah=mqUWtY zDZlycd!iv4qFY@f)~|jNOBTgS8b4cjCg6>pqhfe0i;SK}8$I~E_UaB#%ALJ%S!{k` zjq=N19~7sKz9R|X-}KzOcMl!UZ^G{nzOFD?n_pN>VNlxLoluQ#t_b+^-%g72*YD%j zNEQj5Vl+%IK7j!AtcF-n$Ern5*!b*1Z0~f=&Q9PTHXS=Q1GpV(!u4Db5Ba+uZ&Pu$r6ON;h-pf-Ff<*ROb$1OGPtXU zaj5SW{_yq(H6_7M-5d$vxH@q+MH8q<u0^>*h$n@y`cwSA_Y+R!(5=?ARYBB*QsNIB!?Wn)<2l!DtpAeUZSS z!{;n%<>7hteb%jrfa7N_i1Yp9NM(u0tS&D$g_EK@fi;mq{RY*7C*v_Z32$X*vKV|g zhL8R^U`g~3wa~4Ifc}9|+#b;&Xaa-osrk_ij0BY=m9$0^=P0&VI4Qt2x9OH+q|(rn zNg6YO9JR0Aidzy(!wvzrUQi3&iU=4SO+oPEDznP&#V*7`=m{=Ao<=?~K_y9(lfW^m z$H(a$3r_(WDMxH`B8rcuEs5pfB?M}rTM+@746)0vukt$_#gjp8PA2S9GO6TFRzd}nv3@^ovMk_j`)43Yq5ee#(4$@O?8CWUj&3R%X4Ln_uh6_dx6;3WyxLN`Z0 z-Li54q9SLy5D8%6l3{W)Lq23M!zSa*zRj+UMQu@Rcy6)Psthk);J0p$1az%^3@clM z2-6FNj5#Tk*tLXmTQW-%6Xo(6o| z%h4Xpp*}=o*{xV036>Mtg&1eB`uw4?xgm_FmNsGc)(+Y4240M3_^q2G0gNC2V3+dR zj+KZ-@@RPGDPM(ORVnea*g!%y8x z62SP`k9I3Rd3g;sJkf-OjR7>*sc51Jo1!5!QfY38(5)$qCGAn{+_W6O_}(VGvg;++ z#xtrRfZ>;JWj91@WU^WD=3h?W;`KrN=k5rS6B;y%HQui7T>m)Mt&HL2UG8Gu25*QQ zIdTLY9UT}P9K_JjP*poZv(?QN0kr@VaQN`yNdn^Wc-8;k;A~Jf1g2yE{{5n>t4r+L zw@>WZvqx;%vPE=vch8DFCf_cz0h76P>sGOM?_STkxh6nWRbP~y4nO5ptDkEEZ1|}( z!*6+B;h6xPpTK-n*iU)Y$g0W%{DhzKs*&|20aooAJc-{*`z6o2EZ~2N^^)6@?sTO9 O0000 f =~ /lib/f) + // TODO default dir for *.jar in FileCh. is ~/lib + + // TODO config: test, does this work in DBrowser? -> LogUtil.class.getResourceAsStream("/log4j.properties") + + // TODO no bat/exe/sh in app/ + + public static File newWorkingFolderFile(String name) { + if (applicationBase == null || new File(name).isAbsolute()) { + return new File(name); + } + return new File(applicationBase, name); + } + private static boolean isJPacked() { - // TODO - return false; + return applicationBase != null; } private static void initUI() { diff --git a/src/main/gui/net/sf/jailer/ui/util/HttpUtil.java b/src/main/gui/net/sf/jailer/ui/util/HttpUtil.java index 60ba3ce3e..34772c031 100644 --- a/src/main/gui/net/sf/jailer/ui/util/HttpUtil.java +++ b/src/main/gui/net/sf/jailer/ui/util/HttpUtil.java @@ -35,6 +35,7 @@ public class HttpUtil { // fall through } try { + // TODO in jpack mode app/jailer.jar Process p = Runtime.getRuntime().exec("java -classpath jailer.jar -Djava.net.useSystemProxies=true " + HttpUtil.class.getName() + " " + url); BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream())); String line;