Bug 406518 - migrate OT/Equinox to the standard OSGi WeavingHook
- export the aspect package until we know how to do this dynamically
- re-add legal files, restore build.properties
- unlock relevant bundle versions
diff --git a/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
index de1184c..44d34d0 100644
--- a/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otequinox.branding;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
@@ -12,3 +12,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.objectteams.otequinox.branding.Activator
+Export-Package: org.eclipse.objectteams.otequinox.internal.branding;x-friends:="org.eclipse.ui.workbench"
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
index b41be2e..54a8cde 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: OT/J Weaving for OSGi
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otequinox;singleton:=true
Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.eclipse.objectteams.otequinox.TransformerPlugin
-Bundle-Vendor: Eclipse.org - Object Teams
+Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.objectteams.runtime;bundle-version="2.3.0";visibility:="reexport",
org.eclipse.osgi;bundle-version="3.10.0",
diff --git a/plugins/org.eclipse.objectteams.otequinox/Status.txt b/plugins/org.eclipse.objectteams.otequinox/Status.txt
index 3083ceb..6107204 100644
--- a/plugins/org.eclipse.objectteams.otequinox/Status.txt
+++ b/plugins/org.eclipse.objectteams.otequinox/Status.txt
@@ -3,14 +3,12 @@
(0) Register our WeavingHook as early as possible during start-up.
Done, but need re-thinking. TJ said on equinox-dev: use start level 1
-(3) Scan each registered team class
-Done but should try to improve using BundleWiring.getClassLoader()
-
NOTYET:
-------
(5) Add dependencies so that each bound base bundle can see:
- the OT runtime (package org.objectteams)
- the aspect bundle(s) into which the woven code may call
+Pending: dynamically export the aspect package if not statically declared
(8) Subclasses of Thread (and ideally: implementors of Runnable, the latter
has not yet been realized) need to be woven to insert a trigger into OT's
diff --git a/plugins/org.eclipse.objectteams.otequinox/about.html b/plugins/org.eclipse.objectteams.otequinox/about.html
new file mode 100644
index 0000000..66ef6f6
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 15, 2010</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.objectteams.otequinox/about.ini b/plugins/org.eclipse.objectteams.otequinox/about.ini
new file mode 100644
index 0000000..5229b10
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox/about.ini
@@ -0,0 +1,13 @@
+aboutText=Object Teams -- Equinox integration (OT/Equinox)\n\
+\n\
+Version: 2.3.0\n\
+\n\
+Part of the Eclipse Luna Simultaneous Release\n\
+\n\
+(c) Copyright Technical University Berlin and others, 2005, 2013\n\
+Visit http://www.eclipse.org/objectteams\n\
+\n\
+
+
+featureImage=ote_32n.png
+
diff --git a/plugins/org.eclipse.objectteams.otequinox/build.properties b/plugins/org.eclipse.objectteams.otequinox/build.properties
index 653e2a9..6e8c97f 100644
--- a/plugins/org.eclipse.objectteams.otequinox/build.properties
+++ b/plugins/org.eclipse.objectteams.otequinox/build.properties
@@ -1,7 +1,15 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
plugin.xml,\
+ .,\
+ schema/,\
+ about.ini,\
+ ote_32n.png,\
+ plugin.properties,\
+ about.html,\
OSGI-INF/
additional.bundles=org.eclipse.jdt.annotation
+src.includes = schema/,\
+ about.ini
+javacProjectSettings=true
diff --git a/plugins/org.eclipse.objectteams.otequinox/ote_32n.png b/plugins/org.eclipse.objectteams.otequinox/ote_32n.png
new file mode 100644
index 0000000..490ac03
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox/ote_32n.png
Binary files differ
diff --git a/plugins/org.eclipse.objectteams.otequinox/plugin.properties b/plugins/org.eclipse.objectteams.otequinox/plugin.properties
new file mode 100644
index 0000000..dafa5d9
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=Object Teams Equinox Integration
+providerName=Eclipse.org - Object Teams
diff --git a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/otequinox/TransformerPlugin.java b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/otequinox/TransformerPlugin.java
index fe1001b..e2e112c 100644
--- a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/otequinox/TransformerPlugin.java
+++ b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/otequinox/TransformerPlugin.java
@@ -156,6 +156,10 @@
// TODO Auto-generated method stub
return false;
}
+
+ public static boolean useDynamicWeaving() {
+ return false;
+ }
@Override
public boolean isAdaptedBasePlugin(String baseBundleName) {
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index dd44751..6092274 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -21,7 +21,7 @@
plugin@org.eclipse.objectteams.runtime=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.runtime
fragment@org.eclipse.objectteams.otequinox.sunjvm,2.0.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.sunjvm,tag=builds/201109201811
!the following is also referenced in otdt.doc/buildDoc.xml (plugin-name without version):
-plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox,tag=builds/201305210612
+plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox
plugin@org.eclipse.objectteams.eclipse.monitor,2.0.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.eclipse.monitor,tag=builds/201305210612
!not currently maintained:
@@ -29,7 +29,7 @@
!plugin@org.eclipse.objectteams.otdt.metrics.export=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.metrics.export
!** OT/J Plugins **!
-plugin@org.eclipse.objectteams.otequinox.branding,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding,tag=builds/201305210612
+plugin@org.eclipse.objectteams.otequinox.branding,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding
plugin@org.eclipse.objectteams.otdt.jdt.ui,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui,tag=builds/201306081430
plugin@org.eclipse.objectteams.otdt.ui.help,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui.help,tag=builds/201306040500
plugin@org.eclipse.objectteams.otdt.apt,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.apt,tag=builds/201305210612