New strategy for OTRE jars:
* revert fragment otequinox.runtime to a regular plugin with nested jars (otre & BCEL) (no equinox issues any more)
- otequinox.hook accesses the OTRE now via a new service (IOTTransformer) provided by otequinox (new class TransformerServiceDelegate)
* let otequinox re-export objectteams.runtime for easy access to o.o.Team et al. (all OT-bundles depending on otequinox)
* objectteams.otdt now only hosts otre_min.jar and otre_agent.jar
* cleanup management of classpath variables and dependent paths
- OTRUNTIME_LIBDIR now directly points to the lib dir containing the jars
- all paths are now served from OTREContainer
- use only one classpath variable initializer for both variables
diff --git a/plugins/org.eclipse.objectteams.otequinox.runtime/.classpath b/plugins/org.eclipse.objectteams.otequinox.runtime/.classpath
index 7cec603..3826cef 100644
--- a/plugins/org.eclipse.objectteams.otequinox.runtime/.classpath
+++ b/plugins/org.eclipse.objectteams.otequinox.runtime/.classpath
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry exported="true" kind="lib" path="lib/BCEL.jar" sourcepath="/bcel-5.2/src/java"/>
+ <classpathentry exported="true" kind="lib" path="lib/otre.jar"/>
</classpath>
diff --git a/plugins/org.eclipse.objectteams.otequinox.runtime/.project b/plugins/org.eclipse.objectteams.otequinox.runtime/.project
index e016377..2b6494e 100644
--- a/plugins/org.eclipse.objectteams.otequinox.runtime/.project
+++ b/plugins/org.eclipse.objectteams.otequinox.runtime/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.objectteams.otequinox.runtime</name>
+ <name>org.eclipse.objectteams.runtime</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.objectteams.otequinox.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox.runtime/META-INF/MANIFEST.MF
index 7ed7141..6762f33 100644
--- a/plugins/org.eclipse.objectteams.otequinox.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox.runtime/META-INF/MANIFEST.MF
@@ -1,10 +1,17 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: OTRE OSGI Extension Bundle
-Bundle-SymbolicName: org.eclipse.objectteams.otequinox.runtime
-Bundle-Version: 1.4.0.qualifier
-Bundle-Vendor: objectteams.org
-Fragment-Host: org.eclipse.osgi;bundle-version="[3.6.0.v20090928,4.0.0)"
+Bundle-SymbolicName: org.eclipse.objectteams.runtime
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: Eclipse Object Teams Project
Export-Package: org.objectteams,
- org.eclipse.objectteams.otre
+ org.eclipse.objectteams.otre,
+ org.eclipse.objectteams.otre.jplis,
+ org.eclipse.objectteams.otre.util,
+ org.apache.bcel,
+ org.apache.bcel.classfile,
+ org.apache.bcel.generic,
+ org.apache.bcel.util
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: lib/BCEL.jar,
+ lib/otre.jar
diff --git a/plugins/org.eclipse.objectteams.otequinox.runtime/README.txt b/plugins/org.eclipse.objectteams.otequinox.runtime/README.txt
deleted file mode 100644
index 1ce681d..0000000
--- a/plugins/org.eclipse.objectteams.otequinox.runtime/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Libraries used in this transformer.hook OSGI extension bundle can not be
-packaged as inner jar files (e.g. otre.jar and BCEL.jar), as OSGI does not
-know how to deal with those.
-
-See https://bugs.eclipse.org/bugs/show_bug.cgi?id=143283
\ No newline at end of file
diff --git a/plugins/org.eclipse.objectteams.otequinox.runtime/build.properties b/plugins/org.eclipse.objectteams.otequinox.runtime/build.properties
index a647fe0..434d732 100644
--- a/plugins/org.eclipse.objectteams.otequinox.runtime/build.properties
+++ b/plugins/org.eclipse.objectteams.otequinox.runtime/build.properties
@@ -1,8 +1,7 @@
bin.includes = META-INF/,\
- de/,\
- gnu/,\
- org/
+ lib/BCEL.jar,\
+ lib/otre.jar
src.includes = build.properties,\
README.txt,\
.project,\
- .classpath
+ .classpath
\ No newline at end of file