From 1acd176aa542e1de5b147f6f9ed65c19f58d97e8 Mon Sep 17 00:00:00 2001
From: Daniel Ruthardt <daniel@dowee.com>
Date: Tue, 7 Dec 2010 21:27:28 +0100
Subject: [PATCH] Fixed deprecation issues. (cherry picking from commit
 b50bfdfd00b380061c6baa3dab1d7d5c89e616a3)

---
 launcher/src/main/java/helma/main/launcher/Main.java |  5 +++--
 src/main/java/helma/main/HelmaSecurityManager.java   |  9 ---------
 src/main/java/helma/objectmodel/db/Transactor.java   |  1 +
 src/main/java/helma/scripting/rhino/PathWrapper.java | 10 +++++-----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/launcher/src/main/java/helma/main/launcher/Main.java b/launcher/src/main/java/helma/main/launcher/Main.java
index 5413e6fa..d7060eda 100644
--- a/launcher/src/main/java/helma/main/launcher/Main.java
+++ b/launcher/src/main/java/helma/main/launcher/Main.java
@@ -19,6 +19,7 @@ package helma.main.launcher;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -135,10 +136,10 @@ public class Main {
      * @throws MalformedURLException
      */
     public static ClassLoader createClassLoader(String installDir)
-            throws MalformedURLException {
+            throws MalformedURLException, UnsupportedEncodingException {
 
         // decode installDir in case it is URL-encoded
-        installDir = URLDecoder.decode(installDir);
+        installDir = URLDecoder.decode(installDir, System.getProperty("helma.urlEncoding", "UTF-8"));
 
         // set up the class path
         File libdir = new File(installDir, "lib");
diff --git a/src/main/java/helma/main/HelmaSecurityManager.java b/src/main/java/helma/main/HelmaSecurityManager.java
index 31a32c6e..aebf5400 100644
--- a/src/main/java/helma/main/HelmaSecurityManager.java
+++ b/src/main/java/helma/main/HelmaSecurityManager.java
@@ -216,15 +216,6 @@ public class HelmaSecurityManager extends SecurityManager {
     public void checkMulticast(InetAddress addr) {
     }
 
-    /**
-     *
-     *
-     * @param addr ...
-     * @param ttl ...
-     */
-    public void checkMulticast(InetAddress addr, byte ttl) {
-    }
-
     /**
      *
      */
diff --git a/src/main/java/helma/objectmodel/db/Transactor.java b/src/main/java/helma/objectmodel/db/Transactor.java
index ee6364ea..7b366066 100644
--- a/src/main/java/helma/objectmodel/db/Transactor.java
+++ b/src/main/java/helma/objectmodel/db/Transactor.java
@@ -495,6 +495,7 @@ public class Transactor {
     /**
      * Kill this transaction thread. Used as last measure only.
      */
+    @SuppressWarnings("deprecation")
     public synchronized void kill() {
 
         killed = true;
diff --git a/src/main/java/helma/scripting/rhino/PathWrapper.java b/src/main/java/helma/scripting/rhino/PathWrapper.java
index 406c615f..3624a549 100644
--- a/src/main/java/helma/scripting/rhino/PathWrapper.java
+++ b/src/main/java/helma/scripting/rhino/PathWrapper.java
@@ -44,7 +44,7 @@ public class PathWrapper extends ScriptableObject {
         setParentScope(core.getScope());
         setPrototype(null);
         defineProperty("length", PathWrapper.class, DONTENUM | READONLY | PERMANENT);
-        defineFunctionProperties(new String[] {"href", "contains"}, 
+        defineFunctionProperties(new String[] {"href", "contains"},
                                  PathWrapper.class, DONTENUM | PERMANENT);
     }
 
@@ -127,7 +127,7 @@ public class PathWrapper extends ScriptableObject {
 
         return path.href(null);
     }
-    
+
     /**
      * Checks if the given object is contained in the request path
      *
@@ -137,7 +137,7 @@ public class PathWrapper extends ScriptableObject {
     public int contains(Object obj) {
         if (obj instanceof Wrapper)
             obj = ((Wrapper) obj).unwrap();
-        return path.contains(obj);
+        return path.indexOf(obj);
     }
 
     public String getClassName() {
@@ -147,7 +147,7 @@ public class PathWrapper extends ScriptableObject {
     public String toString() {
         return "PathWrapper["+path.toString()+"]";
     }
-    
+
     /**
      * Return a primitive representation for this object.
      * FIXME: We always return a string representation.
@@ -158,4 +158,4 @@ public class PathWrapper extends ScriptableObject {
     public Object getDefaultValue(Class hint) {
         return toString();
     }
-}
\ No newline at end of file
+}