diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java index b25418c..6a3c161 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java @@ -67,9 +67,10 @@ // String bundlePath = Activator.getDefault().getBundle().getLocation(); try { String bundlePath = FileLocator.resolve(Activator.getDefault().getBundle().getEntry("/")).getPath(); + String tracerClassPath = FileLocator.resolve(this.getClass().getClassLoader().getResource(Tracer.TRACER_CLASS_PATH)).getPath(); classpath = new String[configClasspath.length + 2]; System.arraycopy(configClasspath, 0, classpath, 0, configClasspath.length); - classpath[configClasspath.length] = bundlePath.substring(1) + "bin/"; + classpath[configClasspath.length] = tracerClassPath.substring(1, tracerClassPath.length() - Tracer.TRACER_CLASS_PATH.length()); classpath[configClasspath.length + 1] = bundlePath.substring(1) + Tracer.JAVASSIST_LIBRARY; } catch (IOException e) { classpath = configClasspath; diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java index b7c1cc3..ba3dc45 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java @@ -42,7 +42,8 @@ // String bundlePath = Activator.getDefault().getBundle().getLocation(); try { String bundlePath = FileLocator.resolve(Activator.getDefault().getBundle().getEntry("/")).getPath(); - cp.appendClassPath(bundlePath.substring(1) + "bin/"); + String tracerClassPath = FileLocator.resolve(this.getClass().getClassLoader().getResource(Tracer.TRACER_CLASS_PATH)).getPath(); + cp.appendClassPath(tracerClassPath.substring(1, tracerClassPath.length() - Tracer.TRACER_CLASS_PATH.length())); cp.appendClassPath(bundlePath.substring(1) + Tracer.JAVASSIST_LIBRARY); } catch (IOException e) { e.printStackTrace(); diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java index 7693af3..03f8812 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java @@ -35,6 +35,7 @@ public class Tracer { public static int lineNo = 1; public static final String TRACER = "org.ntlab.traceCollector.tracer."; + public static final String TRACER_CLASS_PATH = "org/ntlab/traceCollector/tracer/Tracer.class"; public static final String JAVASSIST_LIBRARY = "javassist.jar"; private static final String STANDARD_CLASSES = "java.util.ListIterator|java.util.Iterator|java.util.List|java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.Map|java.util.HashMap|java.util.Set|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread"; private static final String CONCRETE_STANDARD_CLASSES = "java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.HashMap|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread";