Commit Graph
119 Commits
Author SHA1 Message Date
Axel Uhl 4550f975dc Merge branch 'master' into polar-api
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).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, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
	java/pom.xml
2014-12-03 13:10:20 +01:00
Axel Uhl bf7d841974 rename local target definition so it is easier to recognize in Eclipse target definition selection 2014-11-30 12:10:15 +01:00
Axel Uhl ec382dea4e extended patching of local p2 target path for Cygwin users 2014-11-26 23:20:39 +01:00
Fredrik Teschke d25757fd3f bind generating local p2 repo to mvn compile goal 2014-11-22 18:57:58 +01:00
Fredrik Teschke 76ee054a29 generate local p2 repo in target/repository folder
- allows cleaning via mvn clean
2014-11-22 18:57:52 +01:00
Fredrik Teschke 91fef8fc84 build p2 repo with maven plugin instead of manually invoking launcher jar 2014-11-21 15:18:14 +01:00
Fredrik Teschke 56c25c50d7 keep only one target definition
- target definitions for ide and maven (local and p2admin) were all very similar
  - only differences between ide and maven: bundle versions, attributes in <location> tags and order of tags
  - only differences between local and p2admin: once one uses the file:// url for local, then they are exactly the same but for the specific URL
- retain only one base target definition (use for normal ide and maven scenario)
- introduce a script that can generate the target definition for the local p2 repo
2014-11-19 17:55:39 +01:00
Fredrik Teschke 141618d540 use locally built p2 repo in maven build
- ``-v`` flag in buildAndUpdateProduct.sh triggers building p2 repo and then uses it instead of p2.sapsailing.com
2014-11-19 16:49:17 +01:00
Fredrik Teschke 5b31fefc2d renamed maven-central target to maven-default (is also used for local maven build) 2014-11-19 13:14:53 +01:00
Fredrik Teschke 87f494c1d8 removed unused target definition maven-local 2014-11-19 10:44:16 +01:00
Fredrik Teschke 9e899bd8fe add target definition for maven p2admin build 2014-11-19 10:38:40 +01:00
Frederik Petersen 861359071f Merge branch 'master' into polar-api
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).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, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
2014-11-05 17:52:10 +01:00
Frederik Petersen db968e5937 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
2014-11-05 12:06:54 +01:00
Axel Uhl ef05cff710 and also for the last one... 2014-11-04 21:03:34 +01:00
Axel Uhl e650c2c0a5 removed version specificity for three org.apache bundles for other target definitions as well 2014-11-04 21:02:36 +01:00
Axel Uhl 09feafb256 removed version specificity for three bundles in central build's target platform 2014-11-04 20:36:25 +01:00
Axel Uhl 71845c258d Adjusted target platform definitions and launch configurations; added shiro.web bundle dependency to security-enabled web bundles 2014-11-04 18:09:14 +01:00
Axel Uhl eaca3e439c move Shiro JARs and ehcache to target platform; adjusting target definitions 2014-11-04 17:32:41 +01:00
Frederik Petersen 4cad148934 Merge branch 'master' into polar-api
Conflicts:
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelMultiDimensionalGroupingProcessor.java
2014-10-16 09:33:58 +02:00
Axel Uhl 0118c4dc21 updated the three other target definitions accordingly 2014-10-07 11:34:11 +02:00
Axel Uhl dae505eb13 moved org.apache.* stuff from com.sap.sse.security/lib to target platform 2014-10-07 11:28:19 +02:00
Axel Uhl 4c4e91f7e1 Merge branch 'master' into usermanagement 2014-10-06 13:06:39 +02:00
Axel Uhl 7fc6844f37 updated Jetty repository for other target platforms, particularly the central maven build one 2014-10-06 08:42:24 +02:00
Axel Uhl 5e90362e14 Merge branch 'master' into usermanagement
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch

The conflict was caused by removing the security.ui project from the GWT launch config's classpath
on the master branch; on this branch it has to stay, of course.
2014-10-06 00:33:36 +02:00
Axel Uhl 4e9e557a4e explicitly exclude javax.servlet version 2.5.x in target definitions;
now the OSGi upgrade invalidates one of the Igtimi bundles due to multiple dependency
chains reaching the same target; need to find out how to resolve.
2014-10-06 00:05:36 +02:00
Axel Uhl bd3c07542b trying to locate javax.servlet in version 3.1.0 in Orbit repository 2014-10-05 23:56:24 +02:00
Axel Uhl 62d26cf43a upgrading target platforms so we can use Java8;
org.eclipse.osgi has a profile.list file baked in that contains the list of execution environments (EEs).
JavaSE-1.8 is available only in Luna-like versions, so we need to upgrade our target definitions.
Upgrading OSGi entails upgrading Jetty, entails upgrading to a newer version of javax.servlet, ...
2014-10-05 23:33:48 +02:00
Axel Uhl 62f8afa103 Merge branch 'master' into usermanagement
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-10-04 23:51:19 +02:00
Axel Uhl 819ca7b182 interims state after merge; doesn't compileMerge branch 'master' into usermanagement
Conflicts:
	home.md
	java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/AbstractTestWithIgtimiConnection.java
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/GlobalNavigationPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/usermanagement/UserManagementPage.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-10-01 17:19:36 +02:00
Axel Uhl e9130d38f3 upgraded classpaths to JavaSE-1.8 2014-10-01 14:16:18 +02:00
Frederik Petersen 380d01cc04 Removed unused groovy-eclipse dependency 2014-07-21 10:50:21 +02:00
Frederik Petersen 5c62ab4364 Changed groovy-eclipse version in all target platforms
older version is not available anymore
2014-07-21 10:06:04 +02:00
Frederik Petersen a704b493c9 Replaced groovy eclipse release version to fix target platform 2014-07-18 17:15:00 +02:00
Frederik Petersen cfe4636b1c Merge branch 'dataMining' into polar-api
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/aggregation/PolarFixAggregationWorker.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).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, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sse.datamining/META-INF/MANIFEST.MF
2014-06-13 14:55:02 +02:00
Benjamin Ebling d46376eb40 Merge branch 'master' into usermanagement
Conflicts:
	java/com.sap.sailing.gwt.ui/.gitignore
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/UserStatusPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-06-04 15:49:02 +02:00
Axel Uhl bc1f11b283 fixed target platform upload script for adjusting permissions ($-sign missing for variable dereference) 2014-06-03 23:48:01 +02:00
Axel Uhl ee5d569a0f updated routeconverter JAR's version in feature.xml; fixed typo in target platform upload script 2014-06-03 22:53:26 +02:00
Axel Uhl 61ad832f58 upgraded target platform 2014-06-03 22:45:18 +02:00
Benjamin Ebling 4e7586b375 Added role management and login panel 2014-05-27 17:04:45 +02:00
Frederik Petersen f6d1c32a35 Removed apache math library 2014-03-19 13:36:25 +01:00
Frederik Petersen 7f3ead381c Enhanced test for linear regression and added apache regression class 2014-03-19 13:30:27 +01:00
fmittag 8d309ddf91 Upgrade to gwt 2.6
- added gwt version 2.6 jars
- added org.apache.commons.lang to all target platforms
- upgraded gwt-maven plugin to 2.6
2014-03-03 12:12:25 +01:00
D049941 5b9d469d5b Merge branch 'master-for-merge'
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java
	java/com.sap.sailing.selenium.test/local-test-environment.xml
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-12-10 15:49:40 +01:00
Axel Uhl 79c74649cd after uploading the p2 repository contents, make readable for world 2013-12-09 11:24:25 +01:00
Axel Uhl 94c41e83a8 added Apache Felix shell and remote shell to target platform 2013-12-09 10:35:10 +01:00
D049941 6df282edf7 Merge branch 'master' into riccardo2
Conflicts:
	configuration/udpsender.py
	configuration/udpserver.py
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NaturalComparator.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/NaturalComparatorTest.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/DatabaseHelper.java
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on
8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49Bethwaite.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49ORC.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49STG.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram505STG.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java
2013-12-05 12:30:46 +01:00
D049941 69b7096b3d Merge remote-tracking branch 'origin/master' into riccardo
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PreviousCompetitorDTOImpl.java
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BoatClassJsonDeserializer.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RaceDataAccessEval.java
	java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RacingEventPersistence.java
	java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracReaderFromURLs.java
	java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracWriter.java
	java/target/stop
2013-11-22 16:15:07 +01:00
Axel Uhl 46bd337641 upgraded Eclipse Orbit in target platforms to drop S20131024145017; added org.apache.[httpclient|httpcore|commons.logging] to target platform 2013-11-20 10:23:15 +01:00
fmittag 51edf2ff1c fixed broken line in tp definition 2013-09-03 15:28:12 +02:00
fmittag 8baf6e7630 added missing org.eclipse.equinox.launcher to new target platform defintions 2013-09-03 14:15:00 +02:00