Prepare for building on build.eclipse.org:
* Change all version numbers to 0.7.0
* Update / cleanup names (bundle & provider)
* Fix some configuration warnings (build.properties)
* Remove Java-Builder from ot.runtime (not needed)
diff --git a/plugins/org.eclipse.objectteams.eclipse.monitor/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.eclipse.monitor/META-INF/MANIFEST.MF
index b9b7c48..4e81c54 100644
--- a/plugins/org.eclipse.objectteams.eclipse.monitor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.eclipse.monitor/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OT/Equinox Monitor Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.eclipse.monitor;singleton:=true
-Bundle-Version: 1.3.0.qualifier
-Bundle-Vendor: objectteams.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.objectteams.eclipse.monitor.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/plugins/org.eclipse.objectteams.eclipse.monitor/build.properties b/plugins/org.eclipse.objectteams.eclipse.monitor/build.properties
index 0d3d3a7..c88359b 100644
--- a/plugins/org.eclipse.objectteams.eclipse.monitor/build.properties
+++ b/plugins/org.eclipse.objectteams.eclipse.monitor/build.properties
@@ -3,4 +3,5 @@
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               icons/
+               icons/,\
+               plugin.properties
diff --git a/plugins/org.eclipse.objectteams.eclipse.monitor/plugin.properties b/plugins/org.eclipse.objectteams.eclipse.monitor/plugin.properties
new file mode 100644
index 0000000..84167a0
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.eclipse.monitor/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=OT/Equinox Runtime Monitor (Incubation)
+providerName=Eclipse.org - Object Teams
\ No newline at end of file
diff --git a/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF
index 9679f6b..18dbcfe 100644
--- a/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Adaptor for the JDT/APT
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.apt;singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Vendor: objectteams.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.objectteams.otequinox;bundle-version="[1.2.6,2.0.0)",
+Require-Bundle: org.eclipse.objectteams.otequinox;bundle-version="[0.7.0,0.8.0)",
  org.eclipse.osgi;bundle-version="[3.4.2,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.5.0.v_OTDT_r130,4.0.0)"
+ org.eclipse.jdt.core;bundle-version="[3.6.0.v_OTDT_r070,3.6.0.v_OTDT_r080)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.objectteams.otdt.apt/plugin.properties b/plugins/org.eclipse.objectteams.otdt.apt/plugin.properties
new file mode 100644
index 0000000..4b70fbb
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otdt.apt/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=OT/J APT Integration (Incubation)
+providerName=Eclipse.org - Object Teams
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
index b43819b..46f99dd 100644
--- a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OT/J Compiler Adaptor Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.compiler.adaptor;singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Vendor: objectteams.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.4.2.vOTDT_r124,4.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.6.0.v_OTDT_r070,3.6.0.v_OTDT_r080)",
  org.eclipse.objectteams.otequinox,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.properties b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.properties
new file mode 100644
index 0000000..9036851
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=OT/J Builder Integration (Incubation)
+providerName=Eclipse.org - Object Teams
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
index 199ef5f..bf0f63a 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: DebugAdaptor Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.debug.adaptor;singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Vendor: objectteams.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.objectteams.otequinox,
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/plugin.properties b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/plugin.properties
index 29c17aa..12f4a40 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/plugin.properties
@@ -1,3 +1,6 @@
+pluginName=OT/J Debug Integration (Incubation)

+providerName=Eclipse.org - Object Teams

+

 OtGeneratedCodeColorDescription.label=OT/J generated code

 OtGeneratedCodeColorDescription.description=The color by which the debug view marks stack frames that do not correspond to source code\n(generated by compiler or runtime-environment) 

 OtSpecialCodeColorDescription.label=OT/J special source code

diff --git a/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF
index ab56ecd..4012811 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OTDebugUI Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.debug.ui;singleton:=true
-Bundle-Version: 1.3.2.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.debug.ui.OTDebugUIPlugin
-Bundle-Vendor: Fraunhofer FIRST
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.jdt.core,
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.ui/plugin.properties b/plugins/org.eclipse.objectteams.otdt.debug.ui/plugin.properties
new file mode 100644
index 0000000..300fdb0
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otdt.debug.ui/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=OT/J Debug UI (Incubation)

+providerName=Eclipse.org - Object Teams

diff --git a/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF
index 37af2cb..0765699 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OTDebug Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.debug;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.debug.OTDebugPlugin
-Bundle-Vendor: Fraunhofer FIRST
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.jdt.debug,
diff --git a/plugins/org.eclipse.objectteams.otdt.debug/plugin.properties b/plugins/org.eclipse.objectteams.otdt.debug/plugin.properties
new file mode 100644
index 0000000..400a285
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otdt.debug/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=OT/J Debug (Incubation)
+providerName=Eclipse.org - Object Teams
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
index 6cdfb0b..1ec6f9a 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OT-Adaptor for the JDT-UI
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.jdt.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Require-Bundle: org.eclipse.objectteams.otequinox,
  org.eclipse.jdt.ui,
- org.eclipse.jdt.core;bundle-version="[3.5.0.v_OTDT_r131,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.6.0.v_OTDT_r070,3.6.0.v_OTDT_r080)",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.jface.text,
@@ -21,7 +21,7 @@
  org.eclipse.compare,
  org.eclipse.ui.views,
  org.eclipse.core.filesystem
-Bundle-Vendor: TU Berlin
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.properties b/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.properties
index 830aad2..eb25576 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.properties
@@ -1,2 +1,5 @@
+pluginName=OT/J Development UI Integration for JDT (Incubation)
+providerName=Eclipse.org - Object Teams
+
 BoundRoleDecorator_description=Decorates bound role classes with an indicator
 OverridingRoleDecorator_description=Decorates overriding role classes with an indicator
\ No newline at end of file
diff --git a/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
index 51c2222..2939c85 100644
--- a/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OTPDEUI Plug-in
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.pde.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.internal.pde.ui.OTPDEUIPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -22,6 +23,5 @@
  org.eclipse.pde.api.tools.ui;bundle-version="1.0.200"
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Bundle-Vendor: The TOPPrax consortium
 Export-Package: org.eclipse.objectteams.otdt.internal.pde.ui
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.objectteams.otdt.pde.ui/plugin.properties b/plugins/org.eclipse.objectteams.otdt.pde.ui/plugin.properties
index b3162b8..63dcec8 100644
--- a/plugins/org.eclipse.objectteams.otdt.pde.ui/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt.pde.ui/plugin.properties
@@ -1,3 +1,6 @@
+pluginName=OT/Equinox Development UI Integration for PDE (Incubation)
+providerName=Eclipse.org - Object Teams
+
 # wizard:
 new.OTPluginProject.description=Create an Object Teams Plug-in Project
 
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
index 6f87195..53dafb0 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OT/J Refactoring Adaptor Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.refactoring;singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Vendor: The TOPPrax consortium
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.jdt.ui,
  org.eclipse.jdt.core,
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.properties b/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.properties
index 28e30bf..5938540 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.properties
@@ -1,3 +1,6 @@
+pluginName=OT/J Refactoring (Incubation)
+providerName=Eclipse.org - Object Teams
+
 Refactoring.menu.label=Refac&tor
 
 Inline.callin.label=Inline Callin...
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
index 0770ae5..94f2c5e 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OTSamples2 Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.samples;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.internal.samples.OTSamplesPlugin
-Bundle-Vendor: The TOPPrax consortium
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/plugin.properties b/plugins/org.eclipse.objectteams.otdt.samples/plugin.properties
index c99bb88..0e4c75d 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt.samples/plugin.properties
@@ -1,3 +1,6 @@
+pluginName=OT/J Examples (Incubation)
+providerName=Eclipse.org - Object Teams
+
 category.objectteams = Object Teams
 
 sample.stopwatch.name = Stop Watch Example
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
index 0a5c23d..c702817 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OTHelp Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.ui.help;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.ui.help.OTHelpPlugin
-Bundle-Vendor: The TOPPrax consortium
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/build.properties b/plugins/org.eclipse.objectteams.otdt.ui.help/build.properties
index 0bfc345..be190a2 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/build.properties
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/build.properties
@@ -36,9 +36,6 @@
                reference/,\
                book.css,\
                schema.css
-src.includes = .classpath,\
-               .project,\
-               build.properties
 jars.compile.order = otdtuihelp.jar
 source.otdtuihelp.jar = src/
 output.otdtuihelp.jar = bin/
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.properties b/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.properties
index 3500684..a2fc6c6 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.properties
@@ -1,3 +1,6 @@
+pluginName=Object Teams Development Tooling Help (Incubation)
+providerName=Eclipse.org - Object Teams
+
 cheatsheet.SimpleOTApplication.name = Object Teams Application
 cheatsheet.SimpleOTApplication.desc = This tutorial will show you how to use Eclipse to create an Object Teams program.
 simple Object Teams application.
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF
index 22a0a2f..cf5b6ba 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OTDTUI Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.ui.OTDTUIPlugin
-Bundle-Vendor: Fraunhofer FIRST
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.views,
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/plugin.properties b/plugins/org.eclipse.objectteams.otdt.ui/plugin.properties
index 302800f..0c79350 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt.ui/plugin.properties
@@ -1,5 +1,5 @@
-pluginName= Object Teams Development Tools UI
-providerName= Fraunhofer FIRST
+pluginName=Object Teams Development Tooling UI (Incubation)
+providerName=Eclipse.org - Object Teams
 
 # New OT project wizard
 ObjectTeams = Object Teams
diff --git a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
index 3480eb3..f1a6e6f 100644
--- a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Object Teams Development Tooling
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.core.ext.OTDTPlugin
-Bundle-Vendor: The TOPPrax consortium
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources,
- org.eclipse.jdt.core;bundle-version="[3.6.0.v_OTDT_r070,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.6.0.v_OTDT_r070,3.6.0.v_OTDT_r080)",
  org.eclipse.jdt.launching,
  org.eclipse.debug.core,
  org.eclipse.osgi,
diff --git a/plugins/org.eclipse.objectteams.otdt/about.ini b/plugins/org.eclipse.objectteams.otdt/about.ini
index 970677f..1adc939 100644
--- a/plugins/org.eclipse.objectteams.otdt/about.ini
+++ b/plugins/org.eclipse.objectteams.otdt/about.ini
@@ -1,11 +1,12 @@
-aboutText=Object Teams Development Tooling\n\
+aboutText=Object Teams Development Tooling (Incubation)\n\
 \n\
-OTDT Version: 1.4.0 Milestone 2\n\
+OTDT (Eclipse.org) Version: 0.7.0 Milestone 1\n\
+(This version supersedes version 1.4.0 from objectteams.org)\n\
 \n\
-Based on Eclipse version 3.6.0 M4\n\
+Based on Eclipse version 3.6.0 M6\n\
 \n\
-(c) Copyright The TOPPrax consortium, 2005, 2009\n\
-Visit http://www.objectteams.org
+(c) Copyright TU Berlin, Fraunhofer FIRST and others, 2005, 2010\n\
+Visit http://www.eclipe.org/objectteams
 
 featureImage=OTDT_32x32.png
 
diff --git a/plugins/org.eclipse.objectteams.otdt/build.properties b/plugins/org.eclipse.objectteams.otdt/build.properties
index 026e501..557bfbe 100644
--- a/plugins/org.eclipse.objectteams.otdt/build.properties
+++ b/plugins/org.eclipse.objectteams.otdt/build.properties
@@ -6,9 +6,6 @@
                otdtcoreext.jar,\
                plugin.properties,\
                splash.bmp
-src.includes = build.properties,\
-               .classpath,\
-               .project
 jars.compile.order = otdtcoreext.jar
 output.otdtcoreext.jar = bin/
 source.otdtcoreext.jar = src/
diff --git a/plugins/org.eclipse.objectteams.otdt/plugin.properties b/plugins/org.eclipse.objectteams.otdt/plugin.properties
index a0c9178..c1e56e9 100644
--- a/plugins/org.eclipse.objectteams.otdt/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt/plugin.properties
@@ -1,2 +1,5 @@
+pluginName=Object Teams Development Tooling (Incubation)
+providerName=Eclipse.org - Object Teams
+
 otNatureName=Object Teams
 otjBuilderName=OT/J Builder
\ No newline at end of file
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 538e1ee..1597cbd 100644
--- a/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Example Plug-in for the Equinox-OTRE integration
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otequinox.branding;singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Vendor: objectteams.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.objectteams.otequinox,
diff --git a/plugins/org.eclipse.objectteams.otequinox.branding/plugin.properties b/plugins/org.eclipse.objectteams.otequinox.branding/plugin.properties
new file mode 100644
index 0000000..0acf693
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox.branding/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=OT/Equinox Branding Integration (Incubation)
+providerName=Eclipse.org - Object Teams
diff --git a/plugins/org.eclipse.objectteams.otequinox.hook/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox.hook/META-INF/MANIFEST.MF
index 79a0607..c01bf6e 100644
--- a/plugins/org.eclipse.objectteams.otequinox.hook/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox.hook/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Transformer Hook Fragment
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otequinox.hook
-Bundle-Version: 1.4.0.qualifier
-Bundle-Vendor: objectteams.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
 Fragment-Host: org.eclipse.osgi;bundle-version="[3.6.0.v20090928,4.0.0)"
 Export-Package: org.eclipse.objectteams.otequinox.hook
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.objectteams.otequinox.hook/build.properties b/plugins/org.eclipse.objectteams.otequinox.hook/build.properties
index 61c53ff..eed81b1 100644
--- a/plugins/org.eclipse.objectteams.otequinox.hook/build.properties
+++ b/plugins/org.eclipse.objectteams.otequinox.hook/build.properties
@@ -1,10 +1,5 @@
 output.. = bin/
 bin.includes = .,\
                META-INF/
-src.includes = .classpath,\
-               .project,\
-               build.properties,\
-               documentation/
 jars.compile.order = .
 source.. = src/
-jars.extra.classpath = lib/otre.jar
diff --git a/plugins/org.eclipse.objectteams.otequinox.hook/plugin.properties b/plugins/org.eclipse.objectteams.otequinox.hook/plugin.properties
new file mode 100644
index 0000000..855055d
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox.hook/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=Object Teams Equinox Framework Extension (Incubation)
+providerName=Eclipse.org - Object Teams
diff --git a/plugins/org.eclipse.objectteams.otequinox.runtime/.project b/plugins/org.eclipse.objectteams.otequinox.runtime/.project
index 2b6494e..65fd915 100644
--- a/plugins/org.eclipse.objectteams.otequinox.runtime/.project
+++ b/plugins/org.eclipse.objectteams.otequinox.runtime/.project
@@ -6,11 +6,6 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
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 df79772..dca7e48 100644
--- a/plugins/org.eclipse.objectteams.otequinox.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox.runtime/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OTRE OSGI Extension Bundle
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.runtime
 Bundle-Version: 0.7.0.qualifier
-Bundle-Vendor: Eclipse Object Teams Project
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
 Export-Package: org.objectteams,
  org.eclipse.objectteams.otre,
  org.eclipse.objectteams.otre.jplis,
diff --git a/plugins/org.eclipse.objectteams.otequinox.runtime/build.properties b/plugins/org.eclipse.objectteams.otequinox.runtime/build.properties
index 1772bf4..84fdc52 100644
--- a/plugins/org.eclipse.objectteams.otequinox.runtime/build.properties
+++ b/plugins/org.eclipse.objectteams.otequinox.runtime/build.properties
@@ -1,6 +1,3 @@
 bin.includes = META-INF/,\
-               lib/otre.jar
-src.includes = build.properties,\
-               README.txt,\
-               .project,\
-               .classpath
\ No newline at end of file
+               lib/otre.jar,\
+               plugin.properties
diff --git a/plugins/org.eclipse.objectteams.otequinox.runtime/plugin.properties b/plugins/org.eclipse.objectteams.otequinox.runtime/plugin.properties
new file mode 100644
index 0000000..ac0f97a
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox.runtime/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=Object Teams Runtime (Incubation)
+providerName=Eclipse.org - Object Teams
diff --git a/plugins/org.eclipse.objectteams.otequinox.sunjvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox.sunjvm/META-INF/MANIFEST.MF
index c793ab4..028918a 100644
--- a/plugins/org.eclipse.objectteams.otequinox.sunjvm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox.sunjvm/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OT/Equinox SunJVM  Fragment
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otequinox.sunjvm
 Bundle-Version: 1.3.0.qualifier
-Bundle-Vendor: objectteams.org
-Fragment-Host: org.eclipse.objectteams.otequinox;bundle-version="[1.3.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.objectteams.otequinox;bundle-version="[0.7.0,0.8.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Eclipse-PlatformFilter: (|(osgi.os=linux) (osgi.os=win32) (ogsi.os=solaris))
diff --git a/plugins/org.eclipse.objectteams.otequinox.sunjvm/plugin.properties b/plugins/org.eclipse.objectteams.otequinox.sunjvm/plugin.properties
new file mode 100644
index 0000000..1ba094c
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox.sunjvm/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=OT/Equinox SunJVM Fragment (Incubation)
+providerName=Eclipse.org - Object Teams
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
index fbcbac9..6f25c17 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: ObjectTeams/Equinox Integration
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otequinox;singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Vendor: objectteams.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.equinox.common,
  org.eclipse.equinox.registry,
  org.eclipse.osgi;bundle-version="[3.6.0.v20090928,4.0.0)",
  org.objectweb.asm;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.objectteams.runtime;bundle-version="[0.7.0,1.0.0)";visibility:=reexport
+ org.eclipse.objectteams.runtime;bundle-version="[0.7.0,0.8.0)";visibility:=reexport
 Import-Package: org.eclipse.core.internal.runtime;resolution:=optional,
  org.eclipse.objectteams.otequinox.hook
 Bundle-Activator: org.eclipse.objectteams.otequinox.TransformerPlugin
diff --git a/plugins/org.eclipse.objectteams.otequinox/about.ini b/plugins/org.eclipse.objectteams.otequinox/about.ini
index 8b89ca6..c340fc6 100644
--- a/plugins/org.eclipse.objectteams.otequinox/about.ini
+++ b/plugins/org.eclipse.objectteams.otequinox/about.ini
@@ -1,6 +1,9 @@
 aboutText=Object Teams -- Equinox integration (OT/Equinox)\n\
 \n\
-OTDT Version: 1.4.0M2 - developed for Eclipse version 3.6.0M4\n\
+OT/Equinox (Eclipse.org) Version: 0.7.0 Milestone 1\n\
+(This version supersedes version 1.4.0 from objectteams.org)\n\
+\n\
+Developed for Eclipse version 3.6.0 M6\n\
 \n\
 (c) Copyright Technical University Berlin and others, 2005, 2010\n\
 Visit http://www.eclipse.org/objectteams\n\
diff --git a/plugins/org.eclipse.objectteams.otequinox/build.properties b/plugins/org.eclipse.objectteams.otequinox/build.properties
index 8e8d1f7..5a0ea8c 100644
--- a/plugins/org.eclipse.objectteams.otequinox/build.properties
+++ b/plugins/org.eclipse.objectteams.otequinox/build.properties
@@ -5,9 +5,6 @@
                about.ini,\
                ote_32n.png
 jars.compile.order = .
-src.includes = build.properties,\
-               META-INF/,\
-               .classpath,\
-               .project,\
-               schema/
+src.includes = schema/,\
+               about.ini
 source.. = src/
diff --git a/plugins/org.eclipse.objectteams.otequinox/plugin.properties b/plugins/org.eclipse.objectteams.otequinox/plugin.properties
new file mode 100644
index 0000000..a978427
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otequinox/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=Object Teams Equinox Integration (Incubation)
+providerName=Eclipse.org - Object Teams