 Nidhi Sawhney
|
58f2201db5
|
Merge remote-tracking branch 'origin/master' into simulator
Conflicts:
doc/DEVELOPMENT
java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/RaceBoard.css
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardResources.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsFactory.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/shared/MarkPassingTimesDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapImageManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapResources.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapSettings.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/ZoomTypeFormatter.java
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).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.sailing.targetplatform.base/features/target-base/feature.xml
java/com.sap.sailing.targetplatform.base/site.xml
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local-frank.target
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-p2admin.target
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local-extern.target
java/com.sap.sailing.www/main.css
java/pom.xml
java/target/configuration/jetty/etc/realm.properties
|
2012-05-08 11:06:59 +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 |
|
|
Nidhi Sawhney
|
698ada3fb1
|
Merge remote-tracking branch 'origin/master' into simulator
|
2012-04-22 16:27:21 +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 |
|