diff --git a/java/com.sap.sailing.targetplatform/build.properties b/java/com.sap.sailing.targetplatform/build.properties
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
index 83b24e50845..6f1e583e42f 100644
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.6"?>
 
-<target name="Race Analysis Target (IDE - with local p2 repositories)" sequenceNumber="31">
+<target name="Race Analysis Target (IDE - with local p2 repositories)" sequenceNumber="34">
 <locations>
 <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
 <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
 </location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9LFp7FWmE7gTBiKg15LDD"/>
-<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110502-42DF9oB5865K5D"/>
-<repository location="http://download.eclipse.org/equinox/drops/R-3.7-201106131736/"/>
-</location>
+<location path="${project_loc:com.sap.sailing.targetplatform.base}/gen/p2" type="Directory"/>
 <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
 <unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
 <unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
 <repository location="http://nexus.wdf.sap.corp:8081/nexus/content/repositories/build.snapshots.unzip/com/sap/ui5/com.sap.ui5.updatesite/1.1.0/com.sap.ui5.updatesite-1.1.0-assembly.zip-unzip/"/>
 </location>
-<location path="${project_loc:com.sap.sailing.targetplatform}/target-test" type="Directory"/>
-<location path="${project_loc:com.sap.sailing.targetplatform}/target-base" type="Directory"/>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8h8eNV4Vrz-hz01A7SL_MhZP"/>
+<repository location="http://download.eclipse.org/releases/indigo"/>
+</location>
 </locations>
 </target>
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
index f674dbd6fd9..4d659ebfd98 100644
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
@@ -1,27 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="Race Analysis Target (Maven - central build)" sequenceNumber="22">
-<locations>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
-<repository location="file:/home/trac/p2-repositories/sap/com.sap.ui5.updatesite-1.1.0-assembly"/>
-</location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
-<repository location="file:/home/trac/p2-repositories/sailing"/>
-</location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9LFp7FWmE7gTBiKg15LDD"/>
-<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110502-42DF9oB5865K5D"/>
-<repository location="file:/home/trac/p2-repositories/eclipse/equinox-SDK-3.7/" />
-</location>
-</locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="Race Analysis Target (Maven - central build)" sequenceNumber="23">
+<locations>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
+<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
+<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
+<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
+<repository location="file:/home/trac/p2-repositories/sap/com.sap.ui5.updatesite-1.1.0-assembly"/>
+</location>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
+<repository location="file:/home/trac/p2-repositories/sailing"/>
+</location>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1"/>
+<repository location="http://download.eclipse.org/releases/indigo"/>
+</location>
+</locations>
+</target>
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target
index 7d3ee30ec91..fb794743151 100644
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target
@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="Race Analysis Target (Maven - local build)" sequenceNumber="22">
-<locations>
-<location path="${project_loc:com.sap.sailing.targetplatform}/target-test" type="Directory"/>
-<location path="${project_loc:com.sap.sailing.targetplatform}/target-base" type="Directory"/>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
-<repository location="http://nexus.wdf.sap.corp:8081/nexus/content/repositories/build.snapshots.unzip/com/sap/ui5/com.sap.ui5.updatesite/1.1.0/com.sap.ui5.updatesite-1.1.0-assembly.zip-unzip/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9LFp7FWmE7gTBiKg15LDD"/>
-<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110502-42DF9oB5865K5D"/>
-<repository location="http://download.eclipse.org/equinox/drops/R-3.7-201106131736/"/>
-</location>
-</locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="Race Analysis Target (Maven - local build)" sequenceNumber="25">
+<locations>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
+<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
+</location>
+<location path="${project_loc:com.sap.sailing.targetplatform.base}/gen/p2" type="Directory"/>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
+<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
+<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
+<repository location="http://nexus.wdf.sap.corp:8081/nexus/content/repositories/build.snapshots.unzip/com/sap/ui5/com.sap.ui5.updatesite/1.1.0/com.sap.ui5.updatesite-1.1.0-assembly.zip-unzip/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8h8eNV4Vrz-hz01A7SL_MhZP"/>
+<repository location="http://download.eclipse.org/releases/indigo"/>
+</location>
+</locations>
+</target>
diff --git a/java/pom.xml b/java/pom.xml
index 6eae345e50f..9273d5fbca3 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -151,8 +151,7 @@
 		<repository>
 			<id>equinox-sdk-3.7</id>
 			<layout>p2</layout>
-			<url>file:/home/trac/p2-repositories/eclipse/equinox-SDK-3.7/</url>
-			<!--<url>http://mirror.selfnet.de/eclipse/equinox/drops/R-3.7-201106131736/</url>-->
+			<url>http://download.eclipse.org/releases/indigo/</url>
 		</repository>
 <!--		
 		<repository>