Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2013-01-22 22:17:53 +0000
committerStephan Herrmann2013-01-22 22:17:53 +0000
commit109241ab908d8552a22dd9d35093c9f200ffdb6d (patch)
treefa08b097b3d6993763767c12b5ff50179b9f8cda /testplugins
parentb30e1f630a37054f2945fc86bef64e2686e14b1b (diff)
downloadorg.eclipse.objectteams-109241ab908d8552a22dd9d35093c9f200ffdb6d.tar.gz
org.eclipse.objectteams-109241ab908d8552a22dd9d35093c9f200ffdb6d.tar.xz
org.eclipse.objectteams-109241ab908d8552a22dd9d35093c9f200ffdb6d.zip
Bug 397192 - Prepare OTDT for new (dynamic) weaver:
Generalize configuration of runtime libraries to please both weavers. Master switch currently is system property "ot.weaving"
Diffstat (limited to 'testplugins')
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/ClasspathUtil.java22
2 files changed, 7 insertions, 17 deletions
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
index c38407397..1cfbd0649 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
@@ -99,7 +99,7 @@ public class AbstractOTJLDTest extends AbstractComparableTest {
int len = defaults.length;
System.arraycopy(defaults, 0, defaults=new String[len+2], 0, len);
defaults[len] = new Path(ClasspathUtil.OTRE_PATH).toString();
- defaults[len+1] = ClasspathUtil.BCEL_JAR_PATH.toString();
+ defaults[len+1] = ClasspathUtil.BYTECODE_LIB_JAR_PATH.toString();
return defaults;
}
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/ClasspathUtil.java b/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/ClasspathUtil.java
index d06cbda4d..98edf9869 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/ClasspathUtil.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/ClasspathUtil.java
@@ -28,29 +28,19 @@ import org.eclipse.objectteams.otdt.internal.core.compiler.mappings.CallinImplem
public class ClasspathUtil {
// === OT Paths: ===
- // TODO(SH): adjust for otdyn:
- public static final String OTRE_OF_PATH = "/home/stephan/git/otredyn/otj/org.eclipse.objectteams.otredyn";
- public static final String OTRE_PATH;
- //new OTREContainer().getClasspathEntries()[0].getPath().toOSString();
+ public static final String OTRE_PATH = new OTREContainer().getClasspathEntries()[0].getPath().toOSString();
public static final String OTDT_PATH = JavaCore.getClasspathVariable(OTDTPlugin.OTDT_INSTALLDIR).toOSString();
public static final String OTRE_MIN_JAR_PATH;
public static final String OTAGENT_JAR_PATH;
- // getOTDTJarPath("otre_agent");
- // hijack this var to point to ASM instead:
- public static final IPath BCEL_JAR_PATH;
- // OTREContainer.BCEL_PATH;
+ public static final IPath BYTECODE_LIB_JAR_PATH = OTREContainer.BYTECODE_LIBRARY_PATH;
static {
if (CallinImplementorDyn.DYNAMIC_WEAVING) {
- OTRE_PATH = OTRE_OF_PATH+"/bin";
- OTRE_MIN_JAR_PATH = OTRE_OF_PATH+"/otre_min.jar";
- OTAGENT_JAR_PATH = OTRE_OF_PATH+"/otre_agent.jar";
- BCEL_JAR_PATH = JavaCore.getClasspathVariable("ECLIPSE_HOME").append("/plugins/org.objectweb.asm_3.3.1.v201105211655.jar");
+ OTRE_MIN_JAR_PATH = getOTDTJarPath("otredyn_min");
+ OTAGENT_JAR_PATH = getOTDTJarPath("otredyn_agent");
} else {
- OTRE_PATH = new OTREContainer().getClasspathEntries()[0].getPath().toOSString();
- OTRE_MIN_JAR_PATH = getOTDTJarPath("otre_min");
- OTAGENT_JAR_PATH = getOTDTJarPath("otre_agent");
- BCEL_JAR_PATH = OTREContainer.BCEL_PATH;
+ OTRE_MIN_JAR_PATH = getOTDTJarPath("otre_min");
+ OTAGENT_JAR_PATH = getOTDTJarPath("otre_agent");
}
}

Back to the top