Axel Uhl
eaacd3f4c1
moved server-side QR code stuff from sse.common to sse because it's not GWT-compileable
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/security/SailingPermissionsForRoleProvider.java
java/com.sap.sse.security.common/src/com/sap/sse/security/shared/PermissionsForRoleProvider.java
java/com.sap.sse.security/src/com/sap/sse/security/AbstractUserStoreBasedRealm.java
2015-02-16 15:58:18 +01:00
Axel Uhl
60be227a06
after uploading the target platform, make sailing/ directory itself readable for all
2015-02-15 17:12:19 +01:00
Axel Uhl
b037a465a9
Merge branch 'master' into jbross-email-invitation
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-02-15 09:03:34 +01:00
Axel Uhl
b4d3157bf0
renamed target definition again to its original name
2015-02-14 23:35:18 +01:00
Axel Uhl
39b1c55a88
made compileable after master mergeMerge branch 'master' into ftes-mail-move-to-sse
...
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, Jetty on 8890).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.sse.security.test/META-INF/MANIFEST.MF
java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2015-02-14 21:23:24 +01:00
Axel Uhl
1242bdfd01
fixed missing @Ignore import
2015-02-14 17:21:21 +01:00
Fredrik Teschke
eceabfa81b
removed duplicate constructors (probably from cherry-pick & merge)
2015-02-14 13:40:51 +01:00
Fredrik Teschke
d858f6c904
Merge branch 'master' of sapsailing.com:/home/trac/git
2015-02-14 08:30:15 +01:00
Fredrik Teschke
4b8b667f57
add REST API doc for smartphone tracking related endpoints
2015-02-14 08:28:45 +01:00
Axel Uhl
6bf7a35e55
ignore SecurityResourceTest.createAccessTokenAndAuthenticate for now on master
2015-02-14 08:00:41 +01:00
Fredrik Teschke
114bddfdde
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
2015-02-14 06:54:36 +01:00
Fredrik Teschke
aedbfbeac4
remove unused import
2015-02-14 06:54:15 +01:00
Fredrik Teschke
f60733698e
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
...
Conflicts:
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ConnectionResetAndReconnectTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java
java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java
2015-02-14 06:53:07 +01:00
Fredrik Teschke
6b6c657452
fix test failures due to previous refactoring of abstract replication test classes
2015-02-14 06:51:39 +01:00
Axel Uhl
799dfe93da
Merge remote-tracking branch 'server/master'
2015-02-13 23:23:44 +01:00
Axel Uhl
f5d87fc908
set bundle context in com.sap.sse.security's Activator.start method right at the beginning
2015-02-13 23:21:20 +01:00
Axel Uhl
52dfc60163
moved RoIB dashboard images to correct folder, avoiding warnings in GWT 2.7 build and breaks in later releases
2015-02-13 23:15:20 +01:00
Fredrik Teschke
ebb47e2900
fix typo in pom
2015-02-13 21:00:33 +01:00
Fredrik Teschke
1d99e6ba75
also add mail replication test that tests outside of SecurityService context
2015-02-13 20:59:11 +01:00
Fredrik Teschke
42e1411bb6
add replication test for mail service (could only test applying changes to master)
2015-02-13 20:30:32 +01:00
Fredrik Teschke
de39d6a40a
refactor AbstractServerReplicationTest to enable tests with multiple replicable services in future
2015-02-13 20:28:45 +01:00
Fredrik Teschke
b4b646be1f
refactor AbstractServerReplicationTest to enable tests with multiple replicable services in future
2015-02-13 20:27:23 +01:00
fmittag
f2d2b7784f
Merge remote-tracking branch 'origin/master'
2015-02-13 15:58:38 +01:00
fmittag
3977fe1001
improved margins for leaderboard styling hack
2015-02-13 15:46:03 +01:00
Axel Uhl
4607abfe3c
moved VerticalTabLayoutPanel.css to its Java class, avoiding more of the
...
"Resource 'com/sap/sse/gwt/resources/VerticalTabLayoutPanel.css' was located via ClassLoader"
warnings
2015-02-13 15:05:42 +01:00
Axel Uhl
971b9e0d1e
added tests for REST API permission checking
2015-02-13 14:40:50 +01:00
fmittag
b71be8fef3
Merge remote-tracking branch 'origin/master' into leadboard-grid-hack
2015-02-13 14:34:09 +01:00
Axel Uhl
d041cece0c
implemented AccessTokenRealm and added a first simple test case
2015-02-13 14:22:33 +01:00
Axel Uhl
dabd2d3a98
fixed initialization of SecurityResourceTest whose first test around access token retrieval is now green
2015-02-13 13:52:05 +01:00
Axel Uhl
412ee455ba
un-ignore breaking test on branch 2589 again
2015-02-13 13:17:57 +01:00
Axel Uhl
eed757481c
moved image resources so they come from GWT-compliant locations, avoiding warnings for GWT2.7, avoiding things to break after GWT2.7
2015-02-13 13:16:09 +01:00
Axel Uhl
f96f0b82de
fixed bug 2063
2015-02-13 12:59:35 +01:00
Axel Uhl
0bfe295609
Merge remote-tracking branch 'server/master'
...
Conflicts:
java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-13 12:46:04 +01:00
Axel Uhl
b07fd85182
upgraded TracAPI from 3.0.7 to 3.0.9, fixing a ConcurrentModificationException
2015-02-13 12:42:47 +01:00
Axel Uhl
c55ae812fb
ignore failing SecurityResourceTest for now on master
2015-02-13 12:41:25 +01:00
fmittag
848efcc96c
Merge remote-tracking branch 'origin/master' into leadboard-grid-hack
2015-02-13 12:24:35 +01:00
fmittag
120e3ffe98
Merge remote-tracking branch 'origin/bug2515'
2015-02-13 11:55:01 +01:00
fmittag
8a4b71e787
fixed positions of checkboxes for highcharts legend (grr... I believe for the 5th time or so)
2015-02-13 11:45:22 +01:00
Axel Uhl
0800cab32a
started with access token / REST security; test case read
2015-02-13 11:43:50 +01:00
Simon Pamies
c26a3d7909
Merge remote-tracking branch 'origin/master'
2015-02-13 11:36:04 +01:00
Simon Pamies
b32730a902
Updated configuration for com.sap.sse.gwt.test
2015-02-13 11:35:46 +01:00
fmittag
06f0cb2874
added i18n for competitor selection in charts
2015-02-13 10:27:00 +01:00
Axel Uhl
a1a8166b08
fixed MongoDB bundle reference in launch configurations after target platform upgrade
2015-02-13 10:18:32 +01:00
Axel Uhl
ecc6ff8332
Merge branch 'master' into bug2589
2015-02-13 09:31:59 +01:00
Fredrik Teschke
4cb7b535c8
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
...
Conflicts:
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/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
2015-02-13 08:29:41 +01:00
Fredrik Teschke
df3b798bda
Merge remote-tracking branch 'origin/master' into ftes-mail-move-to-sse
...
Conflicts:
java/com.sap.sse.security.test/META-INF/MANIFEST.MF
2015-02-13 08:26:24 +01:00
Axel Uhl
89cf67a50a
Merge branch 'master' into ftes-mongo-driver-2.13
2015-02-12 23:19:56 +01:00
fmittag
d661c30de5
added a text field displaying the number of selected competitors for a chart.
2015-02-12 18:35:59 +01:00
Fredrik Teschke
3b97cb9fed
re-add mail bundle to launch configs after merge
2015-02-12 18:31:26 +01:00
Fredrik Teschke
fa887140c8
Merge branch 'master' into ftes-mail-move-to-sse
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sse.security.ui/Security UI sdm.launch
java/pom.xml
2015-02-12 18:14:21 +01:00
Axel Uhl
Fredrik Teschke
fmittag
Simon Pamies