Merge branch 'master' into polar-api

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target

java/com.sap.sse.datamining.shared/.gitignore

@@ -0,0 +1,2 @@
+/bin/
+/bin/

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/Message.java

@@ -1,6 +0,0 @@
-package com.sap.sse.datamining.shared;
-
-public enum Message {
-    Average, Median, Sum, Distance, Speed, Knots, Meters, ResultSignifier, SignifierInUnit, Collecting
-
-}

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/QueryDefinition.java

@@ -6,17 +6,18 @@ import java.util.Map;
 
 import com.sap.sse.datamining.shared.components.AggregatorType;
 import com.sap.sse.datamining.shared.dto.FunctionDTO;
+import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO;
 
 public interface QueryDefinition extends Serializable {
     
     public String getLocaleInfoName();
     
+    public FunctionDTO getStatisticToCalculate();
+    public AggregatorType getAggregatorType();
+    
+    public DataRetrieverChainDefinitionDTO getDataRetrieverChainDefinition();
     public Map<FunctionDTO, Iterable<? extends Serializable>> getFilterSelection();
     
     public List<FunctionDTO> getDimensionsToGroupBy();
-    
-    public FunctionDTO getStatisticToCalculate();
-    
-    public AggregatorType getAggregatorType();
 
 }

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/Unit.java

@@ -1,7 +1,7 @@
 package com.sap.sse.datamining.shared;
 
 public enum Unit {
-	
-	None, Knots, Meters
+
+    None, Knots, Meters
 
 }

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/AggregatorType.java

@@ -1,19 +1,5 @@
 package com.sap.sse.datamining.shared.components;
 
-import com.sap.sse.datamining.shared.Message;
-
 public enum AggregatorType {
     Sum, Average, Median;
-
-    public Message getNameMessage() {
-        switch (this) {
-        case Average:
-            return Message.Average;
-        case Median:
-            return Message.Median;
-        case Sum:
-            return Message.Sum;
-        };
-        throw new IllegalArgumentException("No message available for the aggregator type '" + this + "'");
-    }
 }

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/ElementType.java

@@ -1,5 +0,0 @@
-package com.sap.sse.datamining.shared.components;
-
-public enum ElementType {
-    Integer, Double
-}

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/GrouperType.java

@@ -1,5 +0,0 @@
-package com.sap.sse.datamining.shared.components;
-
-public enum GrouperType {
-    Dimensions
-}

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/dto/FunctionDTO.java

@@ -5,15 +5,17 @@ import java.util.List;
 
 public interface FunctionDTO extends Serializable, Comparable<FunctionDTO> {
 
-    public boolean isDimension();
-
-    public String getDisplayName();
-
-    public List<String> getParameters();
+    public String getSourceTypeName();
 
     public String getReturnTypeName();
 
-    public String getSourceTypeName();
+    public String getFunctionName();
+
+    public String getDisplayName();
+
+    public List<String> getParameterTypeNames();
+
+    public boolean isDimension();
     
     public int getOrdinal();
 

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/QueryDefinitionImpl.java

@@ -9,15 +9,17 @@ import java.util.Map;
 import com.sap.sse.datamining.shared.QueryDefinition;
 import com.sap.sse.datamining.shared.components.AggregatorType;
 import com.sap.sse.datamining.shared.dto.FunctionDTO;
+import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO;
 
 public class QueryDefinitionImpl implements QueryDefinition {
     private static final long serialVersionUID = -6438771277564908352L;
     
     private String localeInfoName;
-    private Map<FunctionDTO, Iterable<? extends Serializable>> filterSelection;
-    private List<FunctionDTO> dimensionsToGroupBy;
     private FunctionDTO statisticToCalculate;
     private AggregatorType aggregatorType;
+    private List<FunctionDTO> dimensionsToGroupBy;
+    private DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition;
+    private Map<FunctionDTO, Iterable<? extends Serializable>> filterSelection;
     
     /**
      * <b>Constructor for the GWT-Serialization. Don't use this!</b>
@@ -25,12 +27,13 @@ public class QueryDefinitionImpl implements QueryDefinition {
     @Deprecated
     QueryDefinitionImpl() { }
 
-    public QueryDefinitionImpl(String localeInfoName, FunctionDTO statisticToCalculate, AggregatorType aggregatorType) {
+    public QueryDefinitionImpl(String localeInfoName, FunctionDTO statisticToCalculate, AggregatorType aggregatorType, DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition) {
         this.localeInfoName = localeInfoName;
-        this.filterSelection = new HashMap<FunctionDTO, Iterable<? extends Serializable>>();
-        this.dimensionsToGroupBy = new ArrayList<FunctionDTO>();
         this.statisticToCalculate = statisticToCalculate;
         this.aggregatorType = aggregatorType;
+        this.dataRetrieverChainDefinition = dataRetrieverChainDefinition;
+        this.filterSelection = new HashMap<FunctionDTO, Iterable<? extends Serializable>>();
+        this.dimensionsToGroupBy = new ArrayList<FunctionDTO>();
     }
     
     public void setFilterSelectionFor(FunctionDTO dimension, Iterable<? extends Serializable> selection) {
@@ -45,6 +48,11 @@ public class QueryDefinitionImpl implements QueryDefinition {
     public String getLocaleInfoName() {
         return localeInfoName;
     }
+    
+    @Override
+    public DataRetrieverChainDefinitionDTO getDataRetrieverChainDefinition() {
+        return dataRetrieverChainDefinition;
+    }
 
     @Override
     public Map<FunctionDTO, Iterable<? extends Serializable>> getFilterSelection() {

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverChainDefinitionDTO.java

@@ -0,0 +1,48 @@
+package com.sap.sse.datamining.shared.impl.dto;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public class DataRetrieverChainDefinitionDTO implements Serializable, Comparable<DataRetrieverChainDefinitionDTO> {
+    private static final long serialVersionUID = 7806173601799997214L;
+    
+    private UUID id;
+    private String name;
+    private String dataSourceTypeName;
+    private String retrievedDataTypeName;
+
+    /**
+     * <b>Constructor for the GWT-Serialization. Don't use this!</b>
+     */
+    @Deprecated
+    DataRetrieverChainDefinitionDTO() { }
+
+    public DataRetrieverChainDefinitionDTO(UUID id, String name, String dataSourceTypeName, String retrievedDataTypeName) {
+        this.id = id;
+        this.name = name;
+        this.dataSourceTypeName = dataSourceTypeName;
+        this.retrievedDataTypeName = retrievedDataTypeName;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDataSourceTypeName() {
+        return dataSourceTypeName;
+    }
+
+    public String getRetrievedDataTypeName() {
+        return retrievedDataTypeName;
+    }
+
+    @Override
+    public int compareTo(DataRetrieverChainDefinitionDTO d) {
+        return this.getName().compareTo(d.getName());
+    }
+    
+}

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/FunctionDTOImpl.java

@@ -47,9 +47,14 @@ public class FunctionDTOImpl implements FunctionDTO {
     }
 
     @Override
-    public List<String> getParameters() {
+    public List<String> getParameterTypeNames() {
         return parameterTypeNames;
     }
+    
+    @Override
+    public String getFunctionName() {
+        return functionName;
+    }
 
     @Override
     public String getDisplayName() {