X-Git-Url: http://dolda2000.com/gitweb/?p=jsvc.git;a=blobdiff_plain;f=src%2Fdolda%2Fjsvc%2Futil%2FSimpleContext.java;fp=src%2Fdolda%2Fjsvc%2Futil%2FJarContext.java;h=0849101a93e430e66313c9bf71a6f58ef4363758;hp=cb16d37c187fb3b58b630ad8af43a47ba78156cc;hb=22779185ec3cd3ab6fafdbcbe675161ceae9ce7d;hpb=a13bfa2c65aa523f9981531f3db1f125fbcfc19e

diff --git a/src/dolda/jsvc/util/JarContext.java b/src/dolda/jsvc/util/SimpleContext.java
similarity index 53%
rename from src/dolda/jsvc/util/JarContext.java
rename to src/dolda/jsvc/util/SimpleContext.java
index cb16d37..0849101 100644
--- a/src/dolda/jsvc/util/JarContext.java
+++ b/src/dolda/jsvc/util/SimpleContext.java
@@ -2,25 +2,14 @@ package dolda.jsvc.util;
 
 import java.io.*;
 import java.util.*;
-import java.net.*;
 import dolda.jsvc.*;
 
-public class JarContext implements ServerContext {
+public class SimpleContext implements ServerContext {
     private final long ctime;
     private final String name;
     public final ClassLoader loader;
     protected final Properties sysconfig, libconfig;
     
-    private static String mangle(File f) {
-	String ret = f.getName();
-	int p = ret.lastIndexOf('.');
-	if(p > 0)
-	    ret = ret.substring(0, p);
-	for(f = f.getParentFile(); f != null; f = f.getParentFile())
-	    ret = f.getName() + "/" + ret;
-	return(ret);
-    }
-
     private void loadconfig() {
 	try {
 	    InputStream pi = loader.getResourceAsStream("jsvc.properties");
@@ -36,20 +25,7 @@ public class JarContext implements ServerContext {
 	}
     }
 
-    public Class<?> findboot() {
-	String clnm = libconfig("jsvc.bootstrap", null);
-	if(clnm == null)
-	    return(null);
-	Class<?> bc;
-	try {
-	    bc = loader.loadClass(clnm);
-	} catch(ClassNotFoundException e) {
-	    return(null);
-	}
-	return(bc);
-    }
-
-    public JarContext(ClassLoader cl, String name) {
+    public SimpleContext(ClassLoader cl, String name) {
 	this.ctime = System.currentTimeMillis();
 	this.name = name;
 	this.loader = cl;
@@ -59,18 +35,6 @@ public class JarContext implements ServerContext {
 	loadconfig();
     }
     
-    private static URL makingmewanttokilljavac(File jar) {
-	try {
-	    return(jar.toURI().toURL());
-	} catch(MalformedURLException e) {
-	    throw(new RuntimeException(e));
-	}
-    }
-
-    public JarContext(File jar) {
-	this(new URLClassLoader(new URL[] {makingmewanttokilljavac(jar)}, JarContext.class.getClassLoader()), mangle(jar));
-    }
-    
     public long starttime() {
 	return(ctime);
     }