Commit Graph
449 Commits
Author SHA1 Message Date
Kai Börnert 045c502438 Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java
2019-01-07 09:07:40 +01:00
Steffen Schaefer 1e00d2d194 Merge branch 'master' into permission-vertical
# Conflicts:
#	java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
#	java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.polars.datamining/META-INF/MANIFEST.MF
#	java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java
#	java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java
#	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
#	java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
#	java/com.sap.sailing.server/META-INF/MANIFEST.MF
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingServiceImpl.java
#	java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java
#	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
#	java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java
#	java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java
#	java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
#	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java
#	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java
#	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2018-12-17 14:36:37 +01:00
Axel Uhl 5993f36bb6 fixed duplicate pom entry
Change-Id: Ib2a1df8d4b5ed49f76cc2d43c88f798d29dbfe18
2018-12-15 18:47:55 +01:00
Axel Uhl ec7aea5b0d added com.sap.sse.jersey.jaxbdependencyfragment to java/pom.xml; don't autostart fragments but require them for Selenium
Change-Id: Ic2ea61e6854bc8c12f6e85a9c1941d899a3f3331
2018-12-15 16:20:41 +01:00
Axel Uhl c88a09b076 added com.sap.sailing.server.interface pom.xml and added it to java's pom.xml
Change-Id: I912348daab0e0202b3e3ae8f3bf8bc2e16b86a7b
2018-12-14 23:59:27 +01:00
Axel Uhl 4c4752a748 extracted replication interfaces into separate bundle to avoid having to activate the replication service only for registering a replicable
Change-Id: I22e423efee06e653a9ed3b9bea13b3b0153f7156
2018-12-14 21:27:17 +01:00
Axel Uhl b8c5fdffc3 Merge branch 'master' into permission-vertical
Change-Id: I983bec4adfd8e8c67e1af232a829ad1d8407b117
2018-12-04 15:20:22 +01:00
Axel Uhl ebd3bddc4e fixed pom.xml reference to routeconverterjava11extension fragment 2018-12-02 16:17:43 +01:00
Axel Uhl e80ba19aaa added missing pom.xml for routeconverterjava11extension 2018-12-02 15:39:55 +01:00
Axel Uhl 140a064b2b moved jersey fragment to Java backend build only
Change-Id: I227cfeeac4ac1d03d095e0b5a7c56a215a34ee68
2018-11-27 01:46:50 +01:00
Axel Uhl b7aac479bc added com.sap.sse.jersey.jaxbdependencyfragment to pom.xml
infrastructure

Change-Id: I1de175bbce8f888fe97574402c6d1e647acf73dc
2018-11-27 01:02:43 +01:00
Thomas Wiese fbee8ba6c2 move gwt compiler parameter java/com.sap.sailing.gwt.ui/pom.xml to root pom.xml 2018-11-21 13:54:57 +01:00
Steffen Schaefer bcda9af455 Bug 4202: Added ajaxloader to parent pom's modules 2018-08-02 15:51:53 +02:00
Steffen Schaefer 32e601a7a4 Bug 4202: Imported Maps API wrapper as source project 2018-08-02 13:33:33 +02:00
Maximilian Groß 668ee283e9 added com.sap.sse.datamining.ui bundle 2018-04-23 10:01:35 +02:00
Axel Uhl 4316ceb547 fixed windfinder pom.xml file structure 2017-12-30 11:57:40 +01:00
Axel Uhl f58cc0a558 bug 1301: started with a WindFinder adapter
Change-Id: Ic2bbb89284d095366e6a14da38099d6169d6c82f
2017-12-29 18:21:41 +01:00
Kai Boernert 5d4770370a Merge branch 'master' into bug4382 2017-12-06 14:01:24 +01:00
Kai Boernert fc4452d5f2 added new module to pom for hudson build 2017-12-05 13:32:40 +01:00
Steffen Schaefer fb856dbe2b Merge branch 'master' into bug4374 2017-12-04 08:55:54 +01:00
Steffen Schaefer 1cd933bb7e Bug 4374: Activated fragment merging for the GWT compiler in Maven and
Eclipse
2017-11-22 11:23:38 +01:00
Axel Uhl 1ef977b257 offer GPS fix import from Bravo files; not all launch configs updated yet
Change-Id: Ia36f53c91606da800d4d7ca41f65b90b0ac08ac1
2017-11-21 22:32:58 +01:00
Axel Uhl 743374f670 moved ExpeditionDeviceConfiguration to .common bundle to share with gwt.ui
Change-Id: I41bf907dbab196a5376f8ac655c5a3aee3917b13
2017-10-25 15:58:54 +02:00
Axel Uhl b24f5a089e Merge branch 'master' into bug4351 2017-10-25 10:27:08 +02:00
Axel Uhl dfd0f5b4d0 added expeditionconnector.persistence bundle; started support for Expedition sensor and GPS device identifiers
Change-Id: Idaab85dde6088c3679e729e426b2483570df8bb1
2017-10-24 17:18:23 +02:00
Steffen Schaefer a46a0af258 Bug 4303: Updated version of used gwt-maven-plugin 2017-10-24 09:17:17 +02:00
Steffen Schaefer 94bfa841cb Bug 4303: Updated version of GWT bundles 2017-10-24 09:15:15 +02:00
Axel Uhl 2d9d0d9850 added Maven support for new expeditionadapter bundle
Change-Id: If3facd3e74bc0dbe1239649af0ed72c31043d552
2017-10-18 13:23:06 +02:00
Axel Uhl e7f3551df7 fixed nmeaconnector reference in pom.xml 2017-08-07 21:42:49 +02:00
Axel Uhl 68dccd9d03 lazy activation for NMEA/MarineAPI; added to feature.xml and pom.xml
Change-Id: I4f9cd93510b88bbdddf52f7bb59256b04e86b1a9
2017-08-07 17:12:49 +02:00
Steffen Schaefer 2d51e076c0 Increasing GWT compiler's memory limit by 512MB in the hope that this
fixes hanging builds on Hudson
2017-05-22 14:18:13 +02:00
Steffen Schaefer 7839416608 Updated GWT to version 2.8.1 2017-04-27 14:35:37 +02:00
Axel Uhl 1579c7914b removed xml-apis-1.4.01.jar (taken over by JDK's rt.jar); back to Tycho 1.0.0
Change-Id: If11cd258a6adba7da000a31b2f381a740c99b213
2017-02-21 19:52:27 +01:00
Axel Uhl 4137c6b34d temporarily revert to Tycho 0.21.0 to isolate the Selenium issues
Change-Id: I9a45141a5335b57ac92dab9c9a469e8cc3b0a986
2017-02-21 11:08:43 +01:00
Axel Uhl 08934830bd re-added <directory>bin</directory> specifier and revert buildAndInstallProduct.sh to use bin instead of target folder
Change-Id: I3b9a79a2df619112e411beead749c80b3d4808ad
2017-02-20 10:04:49 +01:00
Axel Uhl 0620842b81 removed unnecessary <directory> tag in java/pom.xml
Change-Id: I68201f539ebeb8defea1d59a37c35aae88c1ff8c
2017-02-17 16:40:42 +01:00
Axel Uhl f1e3ce3d3f upgraded Tycho version to 1.0.0
Change-Id: I680647ed62ca81443829237a043dd36536a14e0a
2017-02-17 13:31:51 +01:00
Axel Uhl b458576894 Merge branch 'master' into grib2 2017-02-02 14:33:37 +01:00
Axel Uhl 1740ea3db0 removed dependency from polars.datamining to sailing.datamining by introducing a new bundle sailing.datamining.provider
Change-Id: I7d388ef039445d8b38a68586b4ff74f743c3d627
2017-01-26 17:35:53 +01:00
Axel Uhl 47afbe69b2 added pom.xml files for Grib projects
Change-Id: Ie637435f65e072e88906265dc53103cbaab00b20
2017-01-19 16:07:53 +01:00
Steffen Schaefer 673907c017 Merge branch 'master' into bug2447
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/pom.xml
2017-01-09 10:05:05 +01:00
Axel Uhl 5a8de86e7a removed com.sap.sailing.autoload bundle; it is obsoleted by the solution for bug 2
Change-Id: I4b0d7c7472a65605f676e97e5626f767d5bef7ee
2016-12-29 20:18:22 +01:00
Axel Uhl 8ee18e9ae5 Merge branch 'master' into bug3246; this merge temporarily kills the addition of the competitor import bundle to the launch configs
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch
	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 8889, auto-replicate dev).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).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

Change-Id: I88164350550d862bf9feed4d127a2d773d064add
2016-12-07 17:47:05 +01:00
Steffen Schaefer b598a5c4a6 Merge branch 'master' into bug2447
# Conflicts:
#	java/com.google.gwt.user/META-INF/MANIFEST.MF
#	java/com.sap.sailing.feature/feature.xml
#	java/com.sap.sse.gwt.test/META-INF/MANIFEST.MF
#	java/com.sap.sse.security/META-INF/MANIFEST.MF
2016-12-05 17:10:22 +01:00
Steffen Schaefer 00b56f2fa3 Added new features in sse for runtime and sse itself 2016-12-01 10:22:11 +01:00
Steffen Schaefer 0556ef3734 Fixed typo in POM 2016-11-21 10:34:32 +01:00
Steffen Schaefer f8c0319f1e Added gwt-dev and gwt-user as separate bundles 2016-11-21 10:10:41 +01:00
Steffen Schaefer 2cc4ffaae5 Including gwt-servlet project in maven build 2016-11-16 11:14:13 +01:00
Steffen Schaefer cc8ae16a87 Using GWT 2.8 in Maven 2016-11-16 11:08:49 +01:00
Alexander Tatarinovich d16d2b3eca Merge branch 'master' into bug3246
Conflicts:
	java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java
	java/pom.xml

Change-Id: Ic6d8da3151e0e37adf4d16b634d20a70b7e20cc5
2016-10-24 19:17:03 +03:00