adjust this test suite to new OTRE jar structure plus fixed a migration typo -> 100% pass
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/TestBase.java b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/TestBase.java
index 9622d50..7ac155f 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/TestBase.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/TestBase.java
@@ -73,26 +73,13 @@
 													+ File.separator 
 													+ "rt.jar";
     
-    public static final String OT_RUNTIME_PATH;  
-    static {
-    		OT_RUNTIME_PATH = JavaCore.getClasspathVariable(OTDTPlugin.OTDT_INSTALLDIR).toOSString();
-    }
-    	
+	public static final String OT_RUNTIME_PATH = JavaCore.getClasspathVariable(OTDTPlugin.OTRUNTIME_LIBDIR).toOSString();
+	
     
 	public static final String OTRE_JAR_PATH = OT_RUNTIME_PATH 
 													+ File.separator
-													+ "lib"
-													+ File.separator
 													+ "otre.jar";
 	
-    public static final String OT_SCRIPT_PATH = OT_RUNTIME_PATH
-													+ File.separator
-													+ "otj"
-													+ File.separator
-													+ "bin" 
-													+ File.separator
-													+ "ot";
-	         
     public static final String PROJECT_PATH = USER_HOME 
 													+ File.separator 
 													+ WORKSPACE_NAME 
@@ -133,98 +120,7 @@
     	}
     	file.delete();
     }
-    	
-    /**
-     * Executes the main() method of a given classfile.
-     * @param fname e.g. MyMainClass
-     * @param expectedResult e.g. OK
-     * @return e.g. OK
-     */
-    public boolean executeFile(String fname, String expectedResult)
-    {
-    	System.out.println(" ***** executed ***** ");     	
-    	String result = executeCommand(OT_SCRIPT_PATH + " -classpath " + PROJECT_PATH +" "+ fname);
-    	if(result.compareTo(expectedResult) != 0)
-    	{
-    		System.out.println(" Expected result: " + expectedResult);
-    		System.out.println(" Actual result:   " + result);
-    		
-    		return false;
-    	}
-    	return true;
-    }
 
-    /**
-     * execute unix shell command
-     * @param commandToExecute
-     * @return the result from output stream
-     */
-    private static String executeCommand(String commandToExecute) 
-	{	
-    	ArrayList<Exception> exceptions = new ArrayList<Exception>();
- 	
-    	Process commandExecutionProcess;
-    	
-		StringWriter output = new StringWriter();
-		StringWriter errors = new StringWriter();
-		
-		try 
-		{
-			commandExecutionProcess = Runtime.getRuntime().exec(commandToExecute);
-					 			
-			StreamRedirectThread outRedirect = 
-				new StreamRedirectThread(
-					"output_reader",
-					commandExecutionProcess.getInputStream(), 
-					output);
-			StreamRedirectThread errRedirect = new StreamRedirectThread("error_reader",
-				commandExecutionProcess.getErrorStream(), errors);
-		
-			outRedirect.start();
-			errRedirect.start();
-		
-			commandExecutionProcess.waitFor();
-		    		
-			outRedirect.join(); // wait until output (std out) of commandline tool is fully read
-			errRedirect.join(); //  wait until  standard error of commandline tool is fully read
-			if (outRedirect.getException() != null) 
-			{
-				exceptions.add(outRedirect.getException());
-			} 
-			if (errRedirect.getException() != null) 
-			{
-				exceptions.add(errRedirect.getException());
-			} 			
-			}
-		catch (Exception ex)
-		{	
-			exceptions.add(ex);
-		}
-		finally 
-		{
-			output.flush();
-			try
-			{
-				output.close();
-			}
-			catch (Exception ex)
-			{	
-				exceptions.add(ex);
-			}	
-			errors.flush();
-			try
-			{
-				errors.close();
-			}
-			catch (Exception ex)
-			{	
-				exceptions.add(ex);
-			}	    	
-		}
-		
-		return errors.toString() + output.toString();
-		
-	}
     // -- use default options: --
     public void compileFile(String fname)
     {
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/errorreporting/ExternalRoleTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/errorreporting/ExternalRoleTest.java
index 794249f..d1b113d 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/errorreporting/ExternalRoleTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/errorreporting/ExternalRoleTest.java
@@ -87,10 +87,10 @@
                         NL + "      private MyRole r = null;" +
 						NL + "}");
 		
-		compileFile("org"+File.separator+"objectteams"+File.separator+"MyTeam"+File.separator+"MyRole");
+		compileFile("org"+File.separator+"eclipse"+File.separator+"objectteams"+File.separator+"MyTeam"+File.separator+"MyRole");
         assertTrue(isCompilationSuccessful());
 
-		compileFile("org"+File.separator+"objectteams"+File.separator+"MyTeam");
+		compileFile("org"+File.separator+"eclipse"+File.separator+"objectteams"+File.separator+"MyTeam");
 		assertTrue(isCompilationSuccessful());
 	}
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/AbstractSourceMapGeneratorTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/AbstractSourceMapGeneratorTest.java
index 0442647..483cc51 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/AbstractSourceMapGeneratorTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/AbstractSourceMapGeneratorTest.java
@@ -54,6 +54,7 @@
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;

 import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;

 import org.eclipse.objectteams.otdt.core.ext.OTDTPlugin;

+import org.eclipse.objectteams.otdt.core.ext.OTREContainer;
 import org.eclipse.objectteams.otdt.debug.core.breakpoints.IOOTBreakPoints;

 import org.eclipse.objectteams.otdt.internal.core.compiler.smap.SmapStratum;

 import org.eclipse.objectteams.otdt.tests.compiler.CustomizedCompiler;

@@ -94,23 +95,8 @@
     }

 

     private String getOTRE_Path()

-    {

-        URL url = FileLocator.find(OTDTPlugin.getDefault().getBundle(), new Path("lib/otre.jar"), null);

-        URL resolved_url = null;

-        try

-        {

-            resolved_url = FileLocator.resolve(url);

-        }

-        catch (IOException e)

-        {

-            e.printStackTrace();

-        }

-

-        if (resolved_url != null)

-            return resolved_url.getPath();

-        else

-            return url.getPath();

-        

+    {
+    	return OTDTPlugin.getResolvedVariablePath(OTDTPlugin.OTRUNTIME_LIBDIR, OTREContainer.OTRE_JAR_FILENAME).toString();
     }

 

     public static Test suite()

diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/formatter/org/eclipse/objectteams/otdt/core/tests/formatter/FormatterTests.java b/testplugins/org.eclipse.objectteams.otdt.tests/formatter/org/eclipse/objectteams/otdt/core/tests/formatter/FormatterTests.java
index 85303fd..e174525 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/formatter/org/eclipse/objectteams/otdt/core/tests/formatter/FormatterTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/formatter/org/eclipse/objectteams/otdt/core/tests/formatter/FormatterTests.java
@@ -73,7 +73,7 @@
 	 */
 	protected String getPluginDirectoryPath() {
 		try {
-			URL platformURL = Platform.getBundle("org.eclispe.objectteams.otdt.tests").getEntry("/");
+			URL platformURL = Platform.getBundle("org.eclipse.objectteams.otdt.tests").getEntry("/");
 			return new File(FileLocator.toFileURL(platformURL).getFile()).getAbsolutePath();
 		} catch (IOException e) {
 			e.printStackTrace();
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/AnonymousInnerclass/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/AnonymousInnerclass/.classpath
index 356fdc7..2e8161e 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/AnonymousInnerclass/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/AnonymousInnerclass/.classpath
@@ -7,6 +7,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CallinMapping/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CallinMapping/.classpath
index 928a383..4c92b92 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CallinMapping/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CallinMapping/.classpath
@@ -5,6 +5,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CalloutMapping/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CalloutMapping/.classpath
index 928a383..4c92b92 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CalloutMapping/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CalloutMapping/.classpath
@@ -5,6 +5,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CodeSelection/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CodeSelection/.classpath
index cb163df..7f88553 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CodeSelection/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/CodeSelection/.classpath
@@ -6,6 +6,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Completion/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Completion/.classpath
index 28d8660..9c1cbf1 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Completion/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Completion/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="var" path="JCL_LIB" sourcepath="JCL_SRC" rootpath="JCL_SRCROOT"/>
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/ExternalDefinedRole/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/ExternalDefinedRole/.classpath
index 47975f5..78c3c36 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/ExternalDefinedRole/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/ExternalDefinedRole/.classpath
@@ -10,6 +10,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/.classpath
index 92df69d..fb466ad 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Hierarchy/.classpath
@@ -9,6 +9,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/InternalDefinedRole/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/InternalDefinedRole/.classpath
index 8aec6e3..1023aa5 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/InternalDefinedRole/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/InternalDefinedRole/.classpath
@@ -10,6 +10,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/OTJavaSearch/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/OTJavaSearch/.classpath
index 8986db8..140a299 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/OTJavaSearch/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/OTJavaSearch/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
     <classpathentry kind="var" path="JCL_LIB" sourcepath="JCL_SRC" rootpath="JCL_SRCROOT"/>
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/PCAnalysis/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/PCAnalysis/.classpath
index f2138f8..eca0ef6 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/PCAnalysis/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/PCAnalysis/.classpath
@@ -6,6 +6,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/ParserTest/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/ParserTest/.classpath
index cb163df..7f88553 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/ParserTest/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/ParserTest/.classpath
@@ -6,6 +6,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Team/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Team/.classpath
index f2138f8..eca0ef6 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Team/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/Team/.classpath
@@ -6,6 +6,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/TeamProject/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/TeamProject/.classpath
index f2138f8..eca0ef6 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/TeamProject/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/TeamProject/.classpath
@@ -6,6 +6,6 @@
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
 
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>
 
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/TestDataSample/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/TestDataSample/.classpath
index fee4fd7..ccc88d5 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/workspace/TestDataSample/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/workspace/TestDataSample/.classpath
@@ -5,5 +5,5 @@
 	<classpathentry kind="var" path="JCL_LIB" sourcepath="JCL_SRC" rootpath="JCL_SRCROOT"/>
     <classpathentry kind="output" path="bin"/>
     <classpathentry kind="lib" sourcepath="src" path="bins"/>
-	<classpathentry kind="var" path="OTDT_INSTALLDIR/lib/otre.jar"/>
+	<classpathentry kind="var" path="OTRUNTIME_LIBDIR/otre.jar"/>
 </classpath>