Commit Graph
102 Commits
Author SHA1 Message Date
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
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
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
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
fmittag 319f77bdc9 changed target platform definition to explicitly define required equinox core bundles instead of loading the whole equinox SDK with 229 bundles 2013-09-01 14:32:29 +02:00
fmittag 0e26eaffa1 Added support for enums in toJSONString() method of JSONValue 2013-08-30 12:36:07 +02:00
Simon Pamies af1cbc37f7 Fixed line ending problem 2013-08-15 23:16:48 +02:00
Axel Uhl 673fbdd801 added Groovy to target platform, loading it from springsource.org 2013-08-14 16:18:31 +02:00
Axel Uhl c556a95b93 added web socket example 2013-08-08 16:06:00 +02:00
fmittag ce038fb774 updated all target platform definitions to use jetty9 2013-08-07 11:02:19 +02:00
fmittag 3a375c3d3a initial version of jetty9 support 2013-08-06 14:23:26 +02:00
Axel Uhl 1e6f3546f9 fixed host name used for p2 online repository, using p2.sapsailing.com 2013-06-18 11:53:58 +02:00
Armin Zamani b501d1ca6f Merge branch 'racecommittee_integrated' of
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Simon Pamies 5396b1bddb Added missing hamcrest.* 2013-04-01 17:45:59 +02:00
Fredrik Teschke 1488cfa547 Added JDOM lib from eclipse orbit, updated launch configs, removed gateway dependency from gwt.ui 2013-01-22 18:53:56 +01:00
Fredrik Teschke 9c95e17c26 Added commons.io bundle from Eclipse orbit, fixex maven-local.target (had space before xml def) 2013-01-22 18:23:39 +01:00
Simon Pamies ad2ad27f78 Added a new script that eases the uploading process 2013-01-10 14:14:20 +01:00
Simon Pamies 53e3b71776 Added a new script that initializes and updates a local repository, this script should run on every linux system without the need of adapting paths 2013-01-10 13:34:36 +01:00
D049941 c393031c41 Merge branch 'master' into 'gwt25'
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortedCellTableWithStylableHeaders.java
2012-11-22 15:43:03 +01:00
Axel Uhl cb2b7bdf46 added org.apache.commons.fileupload to target platform 2012-10-10 17:25:08 +02:00
fmittag 3f55aa6fc2 added new jsp-libs to target platform and feature.xml's 2012-10-04 18:16:50 +02:00