Commit Graph
42 Commits
Author SHA1 Message Date
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 7af827eb6f upgraded routeconverter in target platform to 2.12.2 2014-06-03 23:40:07 +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 836a8fe6f7 RouteConverter target platform upgrade to 2.12.1; built that on the routeconverter-osgi branch 2014-06-03 22:39:00 +02:00
Benjamin Ebling 4e7586b375 Added role management and login panel 2014-05-27 17:04:45 +02:00
Axel Uhl dec22d638b fixed launches to auto-start connector bundles; removed groovy from target platform; fixed SailingGWT launch again 2014-01-10 18:06:25 +01:00
Lennart Hensler adbeb04b24 Merge branch 'master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/build.properties
	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/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	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.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
	java/pom.xml
2013-12-19 17:25:47 +01:00
Axel Uhl eceb2a46cb added link to target platform update description into README 2013-12-09 10:39:19 +01:00
Axel Uhl 94c41e83a8 added Apache Felix shell and remote shell to target platform 2013-12-09 10:35:10 +01:00
Lennart Hensler f6917c2dc3 Added the groovy jar to the target platform 2013-08-15 18:07:35 +02:00
Fredrik Teschke 698dc68c90 new version of routeconverter bundle 2013-07-05 13:21:05 +02:00
Fredrik Teschke 10d51720be renamed routeconverter bundle 2013-07-03 23:53:08 +02:00
Fredrik Teschke 2e99784387 RouteConverter with removed debug println 2013-07-03 22:58:42 +02:00
Fredrik Teschke 26711e3ce0 added RouteConverter with custom preferences implementation for performance gain 2013-07-03 22:35:02 +02:00
Fredrik Teschke 3620f90474 added new routeconverter version that doesn't include duplicated internal sun class 2013-07-03 16:59:54 +02:00
Fredrik Teschke e30b59f7f0 moved RouteConverter bundles into one, because of duplicate package name problems 2013-07-01 22:58:31 +02:00
Fredrik Teschke a4e2f1753a used jars with generate .class files 2013-07-01 22:19:00 +02:00
Fredrik Teschke 4da3b9cc3f added routeconverter to targetplatform 2013-07-01 16:00: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
Simon Pamies be852762ba Added mockito to target platform as requested by Lukas 2013-02-27 18:38:40 +01:00
fmittag 73d42e5a92 fixed broken manifest file in rome.jar 2013-02-07 16:35:31 +01:00
Simon Pamies acf2c74fc4 Moving rome library to target platform 2013-02-07 16:08:44 +01:00
Simon Pamies 9469d615a0 New SIGAR version 1.6.4.1 2013-01-11 14:45:08 +01:00
Simon Pamies a193d83e9a Updated org.hyperic.sigar MANIFEST to play nicely with new Tycho version 2013-01-11 14:05:16 +01:00
Simon Pamies f7fe346de8 Fixed plugin id 2013-01-10 14:31:21 +01:00
Simon Pamies da191d331e Updating target platform to include new plugins, updated monitoring to refer to those 2013-01-10 13:37:04 +01:00
Simon Pamies 0ce8e903ef Removed jars from lib folder moving them to target platform 2013-01-10 13:36:10 +01:00
Axel Uhl 6a30a93e0d Merge branch 'master' into gwt25 2013-01-08 15:18:41 +01:00
Fredrik Teschke 168cfa7df0 Added codec bundle with metadata in feature.xml 2012-12-13 08:58:44 +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
fmittag 8c4bff53da first version of simple jsp support 2012-09-26 17:34:03 +02:00
fmittag 5017243d63 build new target definition for jsp support 2012-09-26 15:06:09 +02:00
Axel Uhl 15d220b8b2 started first test case for RabbitMQ; nothing compiles yet 2012-07-10 14:17:05 +02:00
fmittag ed1716b44d fixed the target platform definition for the restlet integration 2012-05-31 14:38:45 +02:00
fmittag 6ce673a9bb added a new set of base libraries as feature to the common target platform: restlet
The restlet libs are used in the race committee app
2012-05-30 20:05:46 +02:00
fmittag efc9a2d04e fix for problems with resolving the new base feature "jms" from target platform 2012-04-23 18:01:26 +02:00
fmittag 6cacc49113 draft version of replication server bundle plus extended target platform for usage of ActiveMQ 5.4.3 2012-04-19 17:44:01 +02:00
fmittag 56e8ee6926 remove gen/p2 folder 2011-12-29 13:30:41 +01:00
Axel Uhl 70d3e3ab1a committing generated target platform so a central build can retrieve it 2011-12-28 23:46:46 +01:00
Axel Uhl 795669e891 added generated site's artifacts.jar and content.jar so they may be found in central maven build 2011-12-28 23:35:54 +01:00
fmittag 7c1706570a replace "com.sap.sailing.targetplatform.feature" project with "com.sap.sailing.targetplatform.base" 2011-12-28 12:28:53 +01:00