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/features/org.eclipse.objectteams.otdt.core.patch/feature.properties b/features/org.eclipse.objectteams.otdt.core.patch/feature.properties
index bed23f6..071c7e6 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.properties
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.properties
@@ -16,6 +16,9 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file should be translated.
 
+featureName=Object Teams Patch for JDT/Core (Incubation)
+provider=Eclipse.org - Object Teams
+
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index f41ec18..3e08a63 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.objectteams.otdt.core.patch"
-      label="OTDT Core Patch Feature"
-      version="1.4.0.qualifier"
-      provider-name="Eclipse Object Teams Project"
+      label="%featureName"
+      version="0.7.0.qualifier"
+      provider-name="%providerName"
       plugin="org.eclipse.jdt.core">
 
    <description url="http://www.eclipse.org/objectteams">
@@ -55,7 +55,7 @@
    </license>
 
    <url>
-      <update label="Object Teams Updates" url="http://www.eclipse.org/downloads/download.php?file=/objectteams/otdt-updates-0.7"/>
+      <update label="Object Teams Updates" url="http://www.eclipse.org/downloads/objectteams/otdt-updates-0.7"/>
    </url>
 
    <requires>
@@ -64,9 +64,9 @@
 
    <plugin
          id="org.eclipse.jdt.core"
-         download-size="5380"
-         install-size="5380"
-         version="3.6.0.v_OTDT_r140_qualifier"
+         download-size="5614"
+         install-size="5614"
+         version="3.6.0.v_OTDT_r070_qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/features/org.eclipse.objectteams.otdt.feature/feature.properties b/features/org.eclipse.objectteams.otdt.feature/feature.properties
index bed23f6..45b8d98 100644
--- a/features/org.eclipse.objectteams.otdt.feature/feature.properties
+++ b/features/org.eclipse.objectteams.otdt.feature/feature.properties
@@ -16,6 +16,9 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file should be translated.
 
+featureName=Object Teams Development Tooling (Incubation)
+provider=Eclipse.org - Object Teams
+
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
diff --git a/features/org.eclipse.objectteams.otdt.feature/feature.xml b/features/org.eclipse.objectteams.otdt.feature/feature.xml
index 31099d1..a622405 100644
--- a/features/org.eclipse.objectteams.otdt.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.objectteams.otdt"
-      label="Object Teams Development Tooling"
-      version="1.4.0.qualifier"
-      provider-name="Eclipse Object Teams Project"
+      label="%featureName"
+      version="0.7.0.qualifier"
+      provider-name="%providerName"
       plugin="org.eclipse.objectteams.otdt"
       image="OTDT-110.png">
 
@@ -58,17 +58,17 @@
    </license>
 
    <url>
-      <update label="Object Teams Updates" url="http://www.eclipse.org/downloads/download.php?file=/objectteams/otdt-updates-0.7"/>
-      <discovery label="Object Teams Updates" url="http://www.eclipse.org/downloads/download.php?file=/objectteams/otdt-updates-0.7"/>
+      <update label="Object Teams Updates" url="http://www.eclipse.org/downloads/objectteams/otdt-updates-0.7"/>
+      <discovery label="Object Teams Updates" url="http://www.eclipse.org/downloads/objectteams/otdt-updates-0.7"/>
    </url>
 
    <includes
          id="org.eclipse.objectteams.otdt.core.patch"
-         version="1.4.0.qualifier"/>
+         version="0.7.0.qualifier"/>
 
    <requires>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.text"/>
       <import plugin="org.eclipse.jdt.launching"/>
@@ -80,88 +80,88 @@
          id="org.eclipse.objectteams.otdt"
          download-size="189"
          install-size="228"
-         version="1.4.0.qualifier"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.debug"
          download-size="39"
          install-size="39"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.debug.ui"
          download-size="84"
          install-size="84"
-         version="1.3.2.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.ui"
          download-size="285"
          install-size="285"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.ui.help"
          download-size="778"
          install-size="3180"
-         version="1.4.0.qualifier"/>
+         version="0.0.0"/>
 
-   <plugin
+   <!--plugin
          id="org.eclipse.objectteams.otdt.metrics"
          download-size="123"
          install-size="123"
-         version="1.3.2.qualifier"
-         unpack="false"/>
+         version="0.0.0.qualifier"
+         unpack="false"/-->
          
    <plugin
-         id="org.eclipse.objectteams.jdt.ui.adaptor"
+         id="org.eclipse.objectteams.otdt.jdt.ui"
          download-size="427"
          install-size="427"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.compiler.adaptor"
          download-size="146"
          install-size="146"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.debug.adaptor"
          download-size="10"
          install-size="10"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.pde.ui"
          download-size="16"
          install-size="16"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.objectteams.otdt.refactoring.adaptor"
+         id="org.eclipse.objectteams.otdt.refactoring"
          download-size="77"
          install-size="77"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.samples"
          download-size="398"
          install-size="752"
-         version="1.4.0.qualifier"/>
+         version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.objectteams.otdt.apt.adaptor"
+         id="org.eclipse.objectteams.otdt.apt"
          download-size="15"
          install-size="15"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/features/org.eclipse.objectteams.otequinox.feature/feature.properties b/features/org.eclipse.objectteams.otequinox.feature/feature.properties
index bed23f6..46cf651 100644
--- a/features/org.eclipse.objectteams.otequinox.feature/feature.properties
+++ b/features/org.eclipse.objectteams.otequinox.feature/feature.properties
@@ -16,6 +16,9 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file should be translated.
 
+featureName=Object Teams Equinox Integration (Incubation)
+provider=Eclipse.org - Object Teams
+
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
 licenseURL=license.html
diff --git a/features/org.eclipse.objectteams.otequinox.feature/feature.xml b/features/org.eclipse.objectteams.otequinox.feature/feature.xml
index 1ee4dfd..96b6120 100644
--- a/features/org.eclipse.objectteams.otequinox.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otequinox.feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.objectteams.otequinox"
-      label="OT/Equinox Feature"
-      version="1.4.0.qualifier"
-      provider-name="Eclipse Object Teams Project"
+      label="%featureName"
+      version="0.7.0.qualifier"
+      provider-name="%providerName"
       plugin="org.eclipse.objectteams.otequinox"
       colocation-affinity="org.eclipse.rcp">
 
@@ -21,23 +21,23 @@
    </license>
 
    <url>
-      <update label="Object Teams Updates" url="http://www.eclipse.org/downloads/download.php?file=/objectteams/otdt-updates-0.7"/>
-      <discovery label="Object Teams Updates" url="http://www.eclipse.org/downloads/download.php?file=/objectteams/otdt-updates-0.7"/>
+      <update label="Object Teams Updates" url="http://www.eclipse.org/downloads/objectteams/otdt-updates-0.7"/>
+      <discovery label="Object Teams Updates" url="http://www.eclipse.org/downloads/objectteams/otdt-updates-0.7"/>
    </url>
 
    <plugin
          id="org.eclipse.objectteams.otequinox.hook"
          download-size="0"
          install-size="0"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.objectteams.otequinox.runtime"
+         id="org.eclipse.objectteams.runtime"
          download-size="0"
          install-size="0"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -45,7 +45,7 @@
          id="org.eclipse.objectteams.otequinox"
          download-size="0"
          install-size="0"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
@@ -53,7 +53,7 @@
          os="linux"
          download-size="1"
          install-size="1"
-         version="1.3.0.qualifier"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -62,7 +62,7 @@
          os="solaris"
          download-size="1"
          install-size="1"
-         version="1.3.0.qualifier"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -71,7 +71,7 @@
          os="win32"
          download-size="1"
          install-size="1"
-         version="1.3.0.qualifier"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -79,14 +79,14 @@
          id="org.eclipse.objectteams.otequinox.branding"
          download-size="10"
          install-size="10"
-         version="1.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.eclipse.monitor"
          download-size="14"
          install-size="14"
-         version="1.3.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>