From 0f4fa6656423a3bd9969834b38c97af06f8d25ac Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 19 Nov 2000 18:46:13 +0000 Subject: fixed the installer to version 2.0.5 (see CHANGES.txt) ! --- Installer/CHANGES.txt | 19 ++++- Installer/GL4JInst.java | 4 +- Installer/GL4JInst_cacert_ns.html | 2 +- Installer/MachineCtrl.java | 123 +++++++++++++++++++++++++++----- Installer/makeNetscapeSignedJar-Unix.sh | 6 +- Installer/versiondef.sh | 4 +- 6 files changed, 133 insertions(+), 25 deletions(-) (limited to 'Installer') diff --git a/Installer/CHANGES.txt b/Installer/CHANGES.txt index d8b68bf..39032d2 100644 --- a/Installer/CHANGES.txt +++ b/Installer/CHANGES.txt @@ -3,7 +3,7 @@ GL4Java Installer Copyright (c) 1999 Ronald B. Cemer - GL4Java Installer 2.04 + GL4Java Installer Copyright (c) 1999 Ronald B. Cemer, Sven Goethel This is the CHANGES file for the GL4Java Installer ! @@ -12,13 +12,28 @@ This CHANGES starts with version 2.00 ! GL4Java Installer 2.00 is based upon version 1.05, by Ron Cemer ! -Last Changes: 19. August 2000 (Version 2.04) +Last Changes: 18. November 2000 (Version 2.05) ----------------- TOP = new DOWN = old ----------------- +November 18, 2000 (Version 2.05): + + - Added needed privileges to the directory checking methods + in MachineCtrl.java ! + + - Added Focus-Lost Event to the both + directory input fields ! + + So the just entered path is checked, + even if you just leave the input-field with tab + or a mouse click to the nowwhere .. + + - If the path is not correct, the focus to the input-field + is requested ! + August 19, 2000 (Version 2.04): - Improved the standalone installation. diff --git a/Installer/GL4JInst.java b/Installer/GL4JInst.java index d29f16c..18cfa1e 100644 --- a/Installer/GL4JInst.java +++ b/Installer/GL4JInst.java @@ -24,7 +24,7 @@ public class GL4JInst static private final String gl4javaWWW = "http://www.jausoft.com/Files/Java/1.1.X/GL4Java/Installer"; - static private final String version = "2.04"; + static private final String version = "2.05"; static private final String cannot_install_title = "Cannot install GL4Java"; @@ -701,6 +701,8 @@ public class GL4JInst } if (e.getActionCommand().equals("Start Installation")) { + if(mctrl.checkTextFields()==false) + return; if(mctrl.dialog!=null) { mctrl.dialog.setVisible(false); diff --git a/Installer/GL4JInst_cacert_ns.html b/Installer/GL4JInst_cacert_ns.html index 8601bc6..b612f66 100644 --- a/Installer/GL4JInst_cacert_ns.html +++ b/Installer/GL4JInst_cacert_ns.html @@ -49,7 +49,7 @@ Certificate Authority" box comes up: IS AN EXTRA SECURITY PRECAUTION.

When asked for a name, enter the following name, exactly as shown: GL4Java
-

Click here to import the signing certificate. Sat Aug 19, 2000 - Sun Nov 19, 2000 +

Click here to import the signing certificate. Valid from Sat Nov 18, 2000 - Sun Feb 18, 2001

After you have imported the certificate, Click here to begin the GL4Java installation. diff --git a/Installer/MachineCtrl.java b/Installer/MachineCtrl.java index cba487a..b6a0c09 100644 --- a/Installer/MachineCtrl.java +++ b/Installer/MachineCtrl.java @@ -834,13 +834,57 @@ public class MachineCtrl { boolean ok = true; String str = null; + File f = null; + String fname=null; + boolean fexist=false, fisdir=false; + + if (isNetscapeJvm) + { + try + { + netscape.security.PrivilegeManager.enablePrivilege + ("UniversalFileAccess"); + netscape.security.PrivilegeManager.enablePrivilege + ("UniversalExecAccess"); + netscape.security.PrivilegeManager.enablePrivilege + ("UniversalConnect"); + netscape.security.PrivilegeManager.enablePrivilege + ("UniversalFdRead"); + } + catch (Exception e) + { + errstr = new String + ("Netscape denied privileges, or a failure occurred.\n"+ + "Here is the exception that was caught:\n"+e+"\n"); + return false; + } + } + else if (isMicrosoftJvm) + { + try + { + com.ms.security.PolicyEngine.assertPermission (com.ms.security.PermissionID.FILEIO); + com.ms.security.PolicyEngine.assertPermission + (com.ms.security.PermissionID.PROPERTY); + com.ms.security.PolicyEngine.assertPermission + (com.ms.security.PermissionID.SYSTEM); + } + catch (Exception e) + { + errstr = new String + ("Microsoft VM denied privileges, or a failure occurred.\n"+ + "Here is the exception that was caught:\n"+e+"\n"); + return false; + } + } try { - String fname; fname = tf_browser_classes.getText().replace('\\','/'); fname = fname.trim(); - File f = new File(fname); - if(f.exists() && f.isDirectory()) + f = new File(fname); + fexist=f.exists(); + fisdir=f.isDirectory(); + if(f!=null && fexist && fisdir ) { browser_classes = fname; System.out.println("Set Classes-Dir to: "+ @@ -848,21 +892,44 @@ public class MachineCtrl } else { str = new String ("directory <"+ tf_browser_classes.getText().trim()+ - "> is invalid"); + "> is invalid "); + if(f!=null) { + str+= "( exist="+ fexist + + ", isDir="+fisdir+ ")"; + } else { + str+= "( f is NULL )"; + } ok=false; + tf_browser_classes.requestFocus(); + tf_browser_classes.getToolkit().beep(); } } catch (Exception ex) { - str = new String ("directory <"+ + ex.printStackTrace(); + str = new String ("EXCEPTION directory <"+ tf_browser_classes.getText().trim()+ - "> is invalid\n"+ex); + "> is invalid "); + if(f!=null) { + str+= "( exist="+ fexist + + ", isDir="+fisdir+ ")"; + } else { + str+= "( f is NULL )"; + } ok=false; + tf_browser_classes.requestFocus(); + tf_browser_classes.getToolkit().beep(); } + + fname=null; + fexist=false; + fisdir=false; + try { - String fname; fname = tf_browser_natives.getText().replace('\\','/'); fname = fname.trim(); - File f = new File(fname); - if(f.exists() && f.isDirectory()) + f = new File(fname); + fexist=f.exists(); + fisdir=f.isDirectory(); + if(f!=null && fexist && fisdir ) { browser_natives = fname; System.out.println("Set Native-Dir to: "+ @@ -870,18 +937,35 @@ public class MachineCtrl } else { str = new String ("directory <"+ tf_browser_natives.getText().trim()+ - "> is invalid"); + "> is invalid "); + if(f!=null) { + str+= "( exist="+ fexist + + ", isDir="+fisdir+ ")"; + } else { + str+= "( f is NULL )"; + } ok=false; + tf_browser_natives.requestFocus(); + tf_browser_natives.getToolkit().beep(); } } catch (Exception ex) { - str = new String ("directory <"+ + ex.printStackTrace(); + str = new String ("EXCEPTION directory <"+ tf_browser_natives.getText().trim()+ - "> is invalid\n"+ex); + "> is invalid "); + if(f!=null) { + str+= "( exist="+ fexist + + ", isDir="+fisdir+ ")"; + } else { + str+= "( f is NULL )"; + } ok=false; + tf_browser_natives.requestFocus(); + tf_browser_natives.getToolkit().beep(); } if(!ok && str!=null) { - System.out.println("\007\n"+str+"\n"); + System.out.println(str); } return ok; } @@ -891,8 +975,15 @@ public class MachineCtrl Object src = e.getSource(); if (src.equals(buttonOk) || src.equals(buttonCancel)) { - if (src.equals(buttonOk) && checkTextFields()==false) + if (src.equals(buttonOk) ) + { + /* checkTextFields() is called by GL4JInst, + before the installation will begin ! + If everything is fine, GL4JInst will + dispose our dialog ! + */ return; + } if(dialog!=null) { dialog.setVisible(false); @@ -912,7 +1003,7 @@ public class MachineCtrl fd.setDirectory(tf_browser_classes.getText()); fd.show(); tf_browser_classes.setText(fd.getDirectory()); - checkTextFields(); + //checkTextFields(); } else if(src.equals(buttonFileNatives)) { FileDialog fd = @@ -920,7 +1011,7 @@ public class MachineCtrl fd.setDirectory(tf_browser_natives.getText()); fd.show(); tf_browser_natives.setText(fd.getDirectory()); - checkTextFields(); + //checkTextFields(); } else if(src.equals(goToJausoftGL4Java) && applet!=null) { try { diff --git a/Installer/makeNetscapeSignedJar-Unix.sh b/Installer/makeNetscapeSignedJar-Unix.sh index d68c907..52a584d 100755 --- a/Installer/makeNetscapeSignedJar-Unix.sh +++ b/Installer/makeNetscapeSignedJar-Unix.sh @@ -5,9 +5,9 @@ # The Netscape signing keys were created using the Netscape signtool # utility, as follows: # copy key3.db and cert7.db from one of the users directories. -# signtool -d . -G GL4JInst204 +# signtool -d . -G GL4JInst205 # Enter the following information: -# certificate common name: GL4JInst204 +# certificate common name: GL4JInst205 # organization: GL4Java Development Team # organization unit: GL4JInst # state or province: NRW @@ -27,7 +27,7 @@ javac -classpath ".:../capsapi_classes.zip" *.java . versionundef.sh rm -rf META-INF -signtool -d . -e .class -k GL4JInst204 -Z GL4JInst_ns.jar -c9 --norecurse . +signtool -d . -e .class -k GL4JInst205 -Z GL4JInst_ns.jar -c9 --norecurse . rm -rf META-INF rm -f key3.db cert7.db *.class diff --git a/Installer/versiondef.sh b/Installer/versiondef.sh index 2973f44..f487820 100644 --- a/Installer/versiondef.sh +++ b/Installer/versiondef.sh @@ -1,6 +1,6 @@ MAJV=2 -MINV=4 -BUGV=1 +MINV=5 +BUGV=0 RELV=0 echo creating installer for version $MAJV.$MINV.$BUGV.$RELV ! -- cgit v1.2.3