diff --git a/java/com.sap.sailing.feature.p2build/scripts/README b/java/com.sap.sailing.feature.p2build/scripts/README index cf419621e87..57c4321dbab 100644 --- a/java/com.sap.sailing.feature.p2build/scripts/README +++ b/java/com.sap.sailing.feature.p2build/scripts/README @@ -6,5 +6,5 @@ what is defined in the .product file. Example usage: - analyzeProduct.sh ../raceanalysis.product ../../com.sap.sailing.server/SailingServer\ \(No\ Proxy\,\ GENERATED\).launch + updateEclipseLaunchers.sh ../raceanalysis.product ../../com.sap.sailing.server/SailingServer\ \(No\ Proxy\,\ GENERATED\).launch diff --git a/java/com.sap.sailing.feature.p2build/scripts/analyzeProduct.sh b/java/com.sap.sailing.feature.p2build/scripts/updateEclipseLaunchers.sh similarity index 98% rename from java/com.sap.sailing.feature.p2build/scripts/analyzeProduct.sh rename to java/com.sap.sailing.feature.p2build/scripts/updateEclipseLaunchers.sh index 112b1f6e56f..fcf1cd16727 100755 --- a/java/com.sap.sailing.feature.p2build/scripts/analyzeProduct.sh +++ b/java/com.sap.sailing.feature.p2build/scripts/updateEclipseLaunchers.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Call like this: analyzeProduct.sh [ ...] +# Call like this: updateEclipseLaunchers.sh [ ...] # Updates Eclipse .launch files with the bundles needed for starting an SAP Sailing server based on the current feature.xml. # The .launch files must be in the workspace format that was introduced with Eclipse 2019-12. The script prints an error when no matching # replacement section could be found. diff --git a/java/com.sap.sailing.feature.p2build/scripts/updateSeleniumPom.sh b/java/com.sap.sailing.feature.p2build/scripts/updateSeleniumPom.sh index 20f960569a8..5b367c13244 100755 --- a/java/com.sap.sailing.feature.p2build/scripts/updateSeleniumPom.sh +++ b/java/com.sap.sailing.feature.p2build/scripts/updateSeleniumPom.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Call like this: analyzeProduct.sh +# Call like this: updateSeleniumPom.sh # Will patch the bundleStartLevel section in the pom.xml file so that all auto-start bundles # configured in the product specification are also launched properly and with the correct start level # for the Selenium tests. diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html index 3f8e81c84eb..a5f91fb76fb 100644 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html @@ -372,6 +372,10 @@ name to make sure you get to the event you're interested in. /api/v1/mark/revokeMarkOnRegatta Revokes a Mark from a specified Regatta + + /api/v1/mark/searchMarksByMarkPropertiesObject + Searches for Marks, that originated from a specified MarkProperties object. + /api/v1/{leaderboard}/{racecolumn}/{fleet}/tags Gets, creates, updates and deletes tags. @@ -428,6 +432,10 @@ name to make sure you get to the event you're interested in. /api/v1/remoteserverreference/remove Removes a remote server reference from a server. + + /api/v1/remoteserverreference/remove + Removes a remote server reference from a server. +
diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/searchMarksByMarkPropertiesObject.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/searchMarksByMarkPropertiesObject.html new file mode 100644 index 00000000000..4fb59128cbb --- /dev/null +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/searchMarksByMarkPropertiesObject.html @@ -0,0 +1,122 @@ + + + + + + + + SAP Sailing Analytics Webservices API Version 1.0 + + +

SAP Sailing Analytics Webservices API Version 1.0

+

URL: /api/v1/mark/searchMarksByMarkPropertiesObject/{markPropertiesId}

+ +Description: +

Searches for Marks, that originated from a specified MarkProperties object.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Webservice Type:REST
Intput format:path and query parameters
Output format:Json
Request method:GET
Mandatory parameters: +
    +
  • + markPropertiesId:
    + The id of the MarkProperties object to of which the returned Marks should have originated from. +
    • +
+
Optional parameters: +
    +
  • + eventIds:
    + A set of Ids, representing Events to which the returned Marks should belong to. Will serve as filter.
    + If both "eventIds" and "regattaNames" is set and no intersection is found, no Marks will be returned. +
    • +
  • + regattaNames:
    + A set of names, representing Regattas to which the returned Marks should belong to. Will serve as filter.
    + If both "eventIds" and "regattaNames" is set and no intersection is found, no Marks will be returned. +
    • +
  • + onlyCurrentlyActive:
    + A boolean value. Will narrow the results to only include Marks belonging to currently active Regattas/Events. + An Event/Regatta is considered "currently active" if it's enddate is before the current date in time. +
    • +
+
Examples: + Request: + 
+                GET: http://127.0.0.1:8888/sailingserver/api/v1/mark/searchMarksByMarkPropertiesObject/020c11b7-8b2d-48d3-9f51-968cf2d7e832? 

+                regattaNames=MarkTestRegattaWithoutEvent&eventIds=0ade3e41-985e-453f-b6e2-fc95003ad64f&onlyCurrentlyActive=true
+
+ 
+                Response:
+                  [
+                      {
+                          "mark": {
+                              "@class": "Mark",
+                              "name": "testMark2",
+                              "shortName": null,
+                              "id": "9e0b6cf4-0187-4602-9ea5-2670ccbba453",
+                              "originatingMarkPropertiesId": "020c11b7-8b2d-48d3-9f51-968cf2d7e832"
+                          },
+                          "events": [
+                              {
+                                  "eventId": 0ade3e41-985e-453f-b6e2-fc95003ad64f,
+                                  "name": "MarkTestEventWithRegatta"
+                              }
+                          ],
+                          "regatta": {
+                              "regattaName": "MarkTestRegattaBelongingToEvent"
+                          }
+                      },
+                      {
+                          "mark": {
+                          "@class": "Mark",
+                          "name": "testMark2",
+                          "shortName": null,
+                          "id": "e8e6226c-4512-4e78-8ce8-8ee05368721f",
+                          "originatingMarkPropertiesId": "020c11b7-8b2d-48d3-9f51-968cf2d7e832"
+                          },
+                          "events": [
+                             {
+                                 "eventId": 0ade3e41-985e-453f-b6e2-fc95003ad64f,
+                                 "name": "MarkTestEventWithRegatta"
+                              }
+                          ],
+                          "regatta": {
+                             "regattaName": "MarkTestRegattaBelongingToEvent"
+                          }
+                      }
+                  ]
+
+
+
+Back to Web Service Overview + + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch index a8d1b0c6f35..2f84e354fc1 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch @@ -1,228 +1,225 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +