Changeset 23 for src/main

Timestamp:

10/08/20 16:02:48 (4 years ago)

Author:

bart

Message:

MOPAC support for timedependentparty, boulware, conceder, hardliner, linear

Location:

src/main

Files:

• java/geniusweb/partiesserver/jarClassLoader1.java (modified) (3 diffs)
• webapp/partiesrepo (added)
• webapp/partiesrepo/agentgg-1.5.5.jar (added)
• webapp/partiesrepo/boa-1.5.5.jar (added)
• webapp/partiesrepo/boulware-1.5.5.jar (added)
• webapp/partiesrepo/comparebids-1.5.5.jar (added)
• webapp/partiesrepo/conceder-1.5.5.jar (added)
• webapp/partiesrepo/hardliner-1.5.5.jar (added)
• webapp/partiesrepo/linear-1.5.5.jar (added)
• webapp/partiesrepo/randomparty-1.5.5.jar (added)
• webapp/partiesrepo/randompyparty-1.5.5.jar (added)
• webapp/partiesrepo/simpleshaop-1.5.5.jar (added)
• webapp/partiesrepo/timedependentparty-1.5.5.jar (added)
• webapp/partiesrepo/winkyagent-1.5.5.jar (added)

src/main/java/geniusweb/partiesserver/jarClassLoader1.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.net.JarURLConnection;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -10 +12 @@
 /**
  * Classloader that ensures loaded code is kept separate from other loaded code.
- * This is to prevent dependency conflicts between parties that we  load.
+ * This is to prevent dependency conflicts between parties that we load.
  *
  */
@@ -17 +19 @@
         private URL u;
 
+        /**
+         * @param url    The URL is like
+         *               jar:file:/Web%20Servers/../partiesserver-1.4.1/partiesrepo/agentgg-1.5.5.jar!/
+         * 
+         * @param parent the parent classloader.
+         */
         public JarClassLoader1(URL url, ClassLoader parent) {
                 super(new URL[] { url }, parent);
                 this.u = url;
 
-                String filename = url.getPath();
-                if (filename.startsWith("file:")) {
-                        filename = filename.substring(5);
+                // we need to get to the actual file. This is very tricky,
+                // most solutions on the web don't work, throw, don't remove %20,etc
+                // url.toURI throws for multi-protocol URLs like "jar:file://...".
+
+                // https://docs.oracle.com/javase/7/docs/api/java/net/JarURLConnection.html
+                // the syntax of a JAR URL is: jar:<url>!/{entry}
+
+                String filename = url.getPath(); // file:/bla%20bla/file.jar!/
+                filename = filename.substring(0, filename.indexOf("!/"));
+                File jarfile;
+                try {
+                        jarfile = new File(new URL(filename).toURI());
+                } catch (MalformedURLException | URISyntaxException e) {
+                        throw new IllegalArgumentException(
+                                        "file " + filename + " seems malformed", e);
                 }
-                if (filename.endsWith("/")) {
-                        filename = filename.substring(0, filename.length() - 1);
-                }
-                if (filename.endsWith("!")) {
-                        filename = filename.substring(0, filename.length() - 1);
-                }
-
-                File jarfile = new File(filename);
 
                 if (jarfile == null || !jarfile.exists()) {