Changeset 372

Timestamp:

May 25, 2012, 4:00:54 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Port file naming related bits to OS/2.

Location:

trunk/icedtea-web/netx/net/sourceforge/jnlp

Files:

• config/BasicValueValidators.java (modified) (3 diffs)
• config/Defaults.java (modified) (1 diff)
• resources/Messages.properties (modified) (1 diff)
• util/FileUtils.java (modified) (3 diffs)

trunk/icedtea-web/netx/net/sourceforge/jnlp/config/BasicValueValidators.java

@@ -40 +40 @@
 import static net.sourceforge.jnlp.runtime.Translator.R;
 
+import java.io.File;
 import java.net.URL;
 import java.util.Arrays;
@@ -102 +103 @@
 
             String possibleFile = (String) possibleValue;
+            if (Defaults.OS_DOS_LIKE) {
+                if (!(Character.isLetter(possibleFile.charAt(0)) &&
+                      possibleFile.charAt(1) == ':' &&
+                      (possibleFile.charAt(2) == File.separatorChar ||
+                       possibleFile.charAt(2) == '/'))) {
+                    throw new IllegalArgumentException();
+                }
+            }
+            else
             if (!(possibleFile.startsWith("/"))) {
                 throw new IllegalArgumentException();
@@ -110 +120 @@
         @Override
         public String getPossibleValues() {
-            return R("VVPossibleFileValues");
+            return Defaults.OS_DOS_LIKE ? R("VVPossibleFileValuesDOS") : R("VVPossibleFileValues");
         }
 

trunk/icedtea-web/netx/net/sourceforge/jnlp/config/Defaults.java

@@ -53 +53 @@
 
     /**
+     * Whether the OS is a DOS-like (Windows, OS/2) or not.
+     */
+    public static final boolean OS_DOS_LIKE =
+        System.getProperty("os.name").startsWith("OS/2") ||
+        System.getProperty("os.name").contains("Windows");
+
+    /**
      * Get the default settings for deployment
      */

trunk/icedtea-web/netx/net/sourceforge/jnlp/resources/Messages.properties

@@ -268 +268 @@
 VVPossibleBooleanValues=are {0} or {1}
 VVPossibleFileValues=include the absolute location of a file - it must begin with a /
+VVPossibleFileValuesDOS=include the absolute location of a file - it must begin with a drive letter
 VVPossibleRangedIntegerValues=are in range {0} to {1} (inclusive)
 VVPossibleUrlValues=include any valid url (eg http://icedtea.classpath.org/hg/)

trunk/icedtea-web/netx/net/sourceforge/jnlp/util/FileUtils.java

@@ -26 +26 @@
 import java.nio.channels.FileLock;
 
+import net.sourceforge.jnlp.config.Defaults;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 
@@ -178 +179 @@
 
         // remove all permissions
-        if (!tempFile.setExecutable(false, false)) {
-            throw new IOException(R("RRemoveXPermFailed", tempFile));
-        }
-        if (!tempFile.setReadable(false, false)) {
-            throw new IOException(R("RRemoveRPermFailed", tempFile));
+        if (!Defaults.OS_DOS_LIKE) {
+            if (!tempFile.setExecutable(false, false)) {
+                throw new IOException(R("RRemoveXPermFailed", tempFile));
+            }
+            if (!tempFile.setReadable(false, false)) {
+                throw new IOException(R("RRemoveRPermFailed", tempFile));
+            }
         }
         if (!tempFile.setWritable(false, false)) {
@@ -206 +209 @@
         // opened the file right after it was created might still be able to
         // read the data.
+        if (Defaults.OS_DOS_LIKE) {
+            // On OS/2 and Windows, renameTo() fails if the target exists
+            // so delete it first
+            file.delete();
+        }
         if (!tempFile.renameTo(file)) {
             throw new IOException(R("RCantRename", tempFile, file));