Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-04-02 02:11:16 +0000
committerStephan Herrmann2010-04-02 02:11:16 +0000
commitfc2176491b8b14329fb32cadad32b27fc0a308e7 (patch)
treedddfba963c3fdf9d009ff2c2442712fb9a33d277 /testplugins
parent2706b3de6e5aef6199856e50a5f6d0837889d784 (diff)
downloadorg.eclipse.objectteams-fc2176491b8b14329fb32cadad32b27fc0a308e7.tar.gz
org.eclipse.objectteams-fc2176491b8b14329fb32cadad32b27fc0a308e7.tar.xz
org.eclipse.objectteams-fc2176491b8b14329fb32cadad32b27fc0a308e7.zip
New strategy for consuming BCEL from Orbit instead of re-packaging
* OTDTPlugin finds BCEL plugin on starting * update plugin dependencies and classpaths Cleanup leftovers * No more OT-launch-configuration-types means OTRuntimeClasspathProvider can go * No more "Use JPLIS" checkbox and launch attribute * Remove traces of JMangler see https://bugs.eclipse.org/302976 * restore some callin wiring that was accidentally removed in r23531 (plus one that I forgot in the first place). (merged from r23531 and r23533 of old svn)
Diffstat (limited to 'testplugins')
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AbstractOTDTDebugTest.java8
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ClassAttributeReader.java53
4 files changed, 33 insertions, 35 deletions
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath b/testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath
index da1d7bcd5..065ac06e1 100644
--- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath
@@ -3,6 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/home/stephan/workspaces/otdt-helios/org.objectteams.runtime/otj/lib/jmangler/use/BCEL.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF
index c407dddc2..9b149add3 100644
--- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
Bundle-Name: OTDT DebugTest Plug-in
Bundle-SymbolicName: org.eclipse.objectteams.otdt.debug.tests;singleton:=true
Bundle-Version: 1.3.0
-Bundle-ClassPath: otdt-debugtests.jar,
- BCEL.jar
+Bundle-ClassPath: otdt-debugtests.jar
Bundle-Activator: org.eclipse.objectteams.otdt.debug.tests.DebugTestsPlugin
Bundle-Vendor: Fraunhofer FIRST
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.apache.bcel,
+ org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.jdt.debug.tests,
org.eclipse.jdt.debug,
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AbstractOTDTDebugTest.java b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AbstractOTDTDebugTest.java
index fb189c095..3a389e522 100644
--- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AbstractOTDTDebugTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AbstractOTDTDebugTest.java
@@ -104,8 +104,6 @@ import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Position;
import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.objectteams.otdt.core.ext.OTRuntimeClasspathProvider;
-import org.eclipse.objectteams.otdt.debug.OTDebugPlugin;
import org.eclipse.objectteams.otdt.debug.ui.internal.actions.OTToggleBreakpointAdapter;
import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.console.IHyperlink;
@@ -1397,12 +1395,6 @@ public abstract class AbstractOTDTDebugTest extends TestCase implements IEvalua
ILaunchConfigurationWorkingCopy config = type.newInstance(getJavaProject().getProject().getFolder("launchConfigurations"), mainTypeName);
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainTypeName);
config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, getJavaProject().getElementName());
-//{ObjectTeams: make it an OT/J launch:
- if (OTDebugPlugin.OT_LAUNCH_CONFIGURATION_TYPE.equals(launchType)) {
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, OTRuntimeClasspathProvider.PROVIDER_ID);
- config.setAttribute(OTDebugPlugin.OT_LAUNCH, true);
- }
-// SH}
// use 'java' instead of 'javaw' to launch tests (javaw is problematic
// on JDK1.4.2)
Map map = new HashMap(1);
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ClassAttributeReader.java b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ClassAttributeReader.java
index 9bf88d996..76d77ef8e 100644
--- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ClassAttributeReader.java
+++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ClassAttributeReader.java
@@ -29,14 +29,15 @@ import java.util.Vector;
import org.eclipse.core.runtime.IPath;
-import de.fub.bytecode.Repository;
-import de.fub.bytecode.classfile.Attribute;
-import de.fub.bytecode.classfile.ClassParser;
-import de.fub.bytecode.classfile.ConstantPool;
-import de.fub.bytecode.classfile.ConstantUtf8;
-import de.fub.bytecode.classfile.JavaClass;
-import de.fub.bytecode.classfile.Method;
-import de.fub.bytecode.classfile.Unknown;
+import org.apache.bcel.Repository;
+import org.apache.bcel.classfile.Attribute;
+import org.apache.bcel.classfile.ClassFormatException;
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.classfile.Unknown;
/**
* @author ike
@@ -59,22 +60,28 @@ public class ClassAttributeReader
public ClassAttributeReader(IPath classFilePath)
{
- if ((_javaclass = Repository.lookupClass(classFilePath.toOSString())) == null)
- try
- {
+ try {
+ if ((_javaclass = Repository.lookupClass(classFilePath.toOSString())) == null) {
_javaclass = new ClassParser(classFilePath.toOSString()).parse(); // May throw
- readAndStoreAttributes();
- }
- catch (ClassFormatError e)
- {
- _error = e.getMessage();
- e.printStackTrace();
- }
- catch (IOException e)
- {
- _error = e.getMessage();
- e.printStackTrace();
- }
+ readAndStoreAttributes();
+ }
+ }
+ catch (ClassFormatError e)
+ {
+ _error = e.getMessage();
+ e.printStackTrace();
+ }
+ catch (IOException e)
+ {
+ _error = e.getMessage();
+ e.printStackTrace();
+ } catch (ClassFormatException e) {
+ _error = e.getMessage();
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ _error = e.getMessage();
+ e.printStackTrace();
+ }
}
public String getError()

Back to the top