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)

2 files changed, 17 insertions, 14 deletions

diff --git a/features/org.eclipse.objectteams.otequinox.feature/feature.properties b/features/org.eclipse.objectteams.otequinox.feature/feature.properties
index bed23f63f..46cf65102 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 1ee4dfdc6..96b6120b8 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 @@ Author: Stephan Herrmann.
    </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 @@ Author: Stephan Herrmann.
          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 @@ Author: Stephan Herrmann.
          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 @@ Author: Stephan Herrmann.
          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 @@ Author: Stephan Herrmann.
          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 @@ Author: Stephan Herrmann.
          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>