From 2ff267f28f838fbf2f5682eb631e7412d79452dc Mon Sep 17 00:00:00 2001 From: erik Date: Sun, 3 Sep 2006 11:51:49 +0000 Subject: [PATCH] --- .../crawler/kiss/main/KissCrawler.java | 1 - .../kiss/main/KissCrawlerBootstrapper.java | 5 +- gps/pom.xml | 4 +- pom.xml | 4 +- ...sPathHacker.java => ClassLoaderUtils.java} | 46 +++++++++++++++---- .../main/java/org/wamblee/xml/DomUtils.java | 3 -- 6 files changed, 42 insertions(+), 21 deletions(-) rename support/src/main/java/org/wamblee/general/{ClassPathHacker.java => ClassLoaderUtils.java} (61%) diff --git a/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java index e8232332..c637f34c 100644 --- a/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java +++ b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java @@ -49,7 +49,6 @@ import org.wamblee.crawler.kiss.guide.TimeInterval; import org.wamblee.crawler.kiss.notification.NotificationException; import org.wamblee.crawler.kiss.notification.Notifier; import org.wamblee.general.BeanFactory; -import org.wamblee.general.ClassPathHacker; import org.wamblee.xml.ClasspathUriResolver; import org.wamblee.xml.XslTransformer; diff --git a/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawlerBootstrapper.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawlerBootstrapper.java index 9dfd32d5..0f9b52d3 100644 --- a/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawlerBootstrapper.java +++ b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawlerBootstrapper.java @@ -17,9 +17,8 @@ package org.wamblee.crawler.kiss.main; import java.io.File; -import java.io.IOException; -import org.wamblee.general.ClassPathHacker; +import org.wamblee.general.ClassLoaderUtils; /** * Bootstrapper for the kiss crawler which adds all files in the directory @@ -32,7 +31,7 @@ public class KissCrawlerBootstrapper { if ( !libdir.isDirectory() ) { throw new IllegalArgumentException("'" + aArgs[0] + "' is not a directory."); } - ClassPathHacker.addJarsInDirectory(libdir); + ClassLoaderUtils.addJarsInDirectory(libdir); String[] args = new String[2]; args[0] = aArgs[1]; args[1] = aArgs[2]; diff --git a/gps/pom.xml b/gps/pom.xml index c1617e62..18732e43 100644 --- a/gps/pom.xml +++ b/gps/pom.xml @@ -20,11 +20,11 @@ wamblee-support - jfreechart + jfree jfreechart - jcommon + jfree jcommon diff --git a/pom.xml b/pom.xml index f86e9df5..fb62e3e7 100644 --- a/pom.xml +++ b/pom.xml @@ -175,12 +175,12 @@ 1.1.2 - jfreechart + jfree jfreechart 1.0.1 - jcommon + jfree jcommon 1.0.0 diff --git a/support/src/main/java/org/wamblee/general/ClassPathHacker.java b/support/src/main/java/org/wamblee/general/ClassLoaderUtils.java similarity index 61% rename from support/src/main/java/org/wamblee/general/ClassPathHacker.java rename to support/src/main/java/org/wamblee/general/ClassLoaderUtils.java index b8d52738..5275e159 100644 --- a/support/src/main/java/org/wamblee/general/ClassPathHacker.java +++ b/support/src/main/java/org/wamblee/general/ClassLoaderUtils.java @@ -22,12 +22,23 @@ import java.net.URLClassLoader; import java.net.URL; import java.lang.reflect.Method; -public class ClassPathHacker { - - private static final Class[] PARAMETERS = new Class[] { URL.class }; +/** + * Utility for working with the class loader. Based on the ClassPathHacker + * example found on the internet. + */ +public class ClassLoaderUtils { + + // No logging in this class to keep the required class libraries + // limited to the standard java classes. This allows use of the + // utilities in an environment with a very limited classpath. private static final String JAR_SUFFIX = ".jar"; + /** + * Adds all jars in the given directory to the class path. + * @param aDirectory Directory. + * @throws IOException + */ public static void addJarsInDirectory(File aDirectory) throws IOException { System.out.println("directory '" + aDirectory + "'"); @@ -42,25 +53,40 @@ public class ClassPathHacker { } } - public static void addFile(String s) throws IOException { - File f = new File(s); + /** + * Adds a file to the classpath. + * @param aFilename Filename to add. + * @throws IOException + */ + public static void addFile(String aFilename) throws IOException { + File f = new File(aFilename); addFile(f); } - public static void addFile(File f) throws IOException { - addURL(f.toURL()); + /** + * Adds a file to the classpath. + * @param aFile File to add. + * @throws IOException + */ + public static void addFile(File aFile) throws IOException { + addURL(aFile.toURL()); } - public static void addURL(URL u) throws IOException { + /** + * Adds a url to the classpath. + * @param aUrl Url to add. + * @throws IOException + */ + public static void addURL(URL aUrl) throws IOException { URLClassLoader sysloader = (URLClassLoader) ClassLoader .getSystemClassLoader(); Class sysclass = URLClassLoader.class; try { - Method method = sysclass.getDeclaredMethod("addURL", PARAMETERS); + Method method = sysclass.getDeclaredMethod("addURL", new Class[]{ URL.class } ); method.setAccessible(true); - method.invoke(sysloader, new Object[] { u }); + method.invoke(sysloader, new Object[] { aUrl }); } catch (Throwable t) { t.printStackTrace(); throw new IOException( diff --git a/support/src/main/java/org/wamblee/xml/DomUtils.java b/support/src/main/java/org/wamblee/xml/DomUtils.java index 5651e341..e0148692 100644 --- a/support/src/main/java/org/wamblee/xml/DomUtils.java +++ b/support/src/main/java/org/wamblee/xml/DomUtils.java @@ -49,9 +49,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl; -import com.sun.org.apache.xerces.internal.jaxp.validation.xs.SchemaFactoryImpl; - /** * Some basic XML utilities for common reoccuring tasks for DOM documents. */ -- 2.31.1