Commit Graph

236 Commits

Author SHA1 Message Date
eb1bdee425 Progress 2015-08-21 11:06:58 +02:00
3886bd4c77 Progress 2015-08-21 10:58:09 +02:00
a7c38186aa In progress... 2015-08-21 10:46:51 +02:00
c567a442f6 in progress... 2015-08-21 10:43:56 +02:00
fe3cd931b0 query docu in progress... 2015-08-21 10:31:48 +02:00
0d4d6aa279 inline image. 2015-08-21 10:30:38 +02:00
5d0282ae4e Images 2015-08-21 10:29:07 +02:00
cbe2bef4c0 Docu 2015-08-21 10:28:42 +02:00
9a6b9de4d9 provide shape too. 2015-08-21 08:42:40 +02:00
1e44d2dc2b Only log info messages. 2015-08-20 15:05:05 +02:00
a3965fb093 - Add iocMillis, iocNanos to default response
- Set correct response type
- Serialize byte[] as byte[] and not String
2015-08-11 15:59:47 +02:00
776c8135e5 Log loaded values in config
Add/remove / in REST interface.
2015-08-10 17:28:15 +02:00
c751aab8de ATEST-205 2015-08-10 11:44:08 +02:00
a1cb60c56f Merge pull request #11 in ST/ch.psi.daq.queryrest from ATEST-128 to master
# By Fabian Märki
# Via Fabian Märki
* commit '6ce4d1553bbd36e55f8c2f2071377d5a208bf0ec':
  ATEST-128
  ATEST-128 First working impl.
  ATEST-128
2015-08-07 10:30:55 +02:00
6ce4d1553b Merge branch 'master' into ATEST-128 2015-08-07 08:43:59 +02:00
c5b8c55970 ATEST-128 2015-08-07 08:38:37 +02:00
2dc1b4bfb6 ATEST-128 First working impl. 2015-08-05 14:06:06 +02:00
fb244d95b7 - switching back from @Autowired to @Resource 2015-07-31 16:21:45 +02:00
46c1406d57 Merge branch 'master' into ATEST-128 2015-07-31 14:36:26 +02:00
83613f883f Merge pull request #10 in ST/ch.psi.daq.queryrest from ATEST-129 to master
# By Fabian Märki
# Via Fabian Märki
* commit 'f1587230a64e253775a494283da651cdae5c19f7':
  ATEST-129
2015-07-31 14:34:37 +02:00
f1587230a6 ATEST-129 2015-07-31 14:32:57 +02:00
47d921e1a4 ATEST-128 2015-07-31 12:50:29 +02:00
fbab668184 Merge pull request #9 in ST/ch.psi.daq.queryrest from atest124 to master
* commit 'e4ad14bb3f9f051723b1bef1010157351ac48250':
  ATEST-124: - implement the QueryValidator class - adjust / fix tests
  ATEST-124: - implement the query validator
2015-07-31 11:36:48 +02:00
e4ad14bb3f Merge remote-tracking branch 'origin/master' into atest124
Conflicts:
	src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
	src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
2015-07-31 11:27:05 +02:00
22c2adf7cc ATEST-124:
- implement the QueryValidator class
- adjust / fix tests
2015-07-31 10:17:11 +02:00
2f24e95303 ATEST-123 2015-07-31 10:14:01 +02:00
ebb904009d ATEST-123 2015-07-31 10:12:52 +02:00
107bddbd72 ATEST-123 2015-07-30 15:33:53 +02:00
1d07c618a9 ATEST-124:
- implement the query validator
2015-07-30 12:16:31 +02:00
9057d7e32e Merge pull request #8 in ST/ch.psi.daq.queryrest from ATEST-122 to master
# By Fabian Märki
# Via Fabian Märki
* commit '8ce83706010d3ad29ff7a03c9d7e4cfc58e9443a':
  ATEST-122
2015-07-29 13:09:49 +02:00
8ce8370601 ATEST-122 2015-07-29 11:32:36 +02:00
8ace7ec050 Corrections. 2015-07-24 18:03:42 +02:00
fe6ba9a394 Corrections. 2015-07-24 18:02:32 +02:00
11fdcff377 Corrections. 2015-07-24 18:01:13 +02:00
81f97ebb12 Corrections. 2015-07-24 17:59:08 +02:00
c25771b543 fix markup. 2015-07-24 17:54:58 +02:00
1540a51168 fix markup 2015-07-24 17:53:16 +02:00
ea7ebbabbe For readme. 2015-07-24 17:51:12 +02:00
689622be07 Async read, query REST etc. 2015-07-24 15:34:35 +02:00
9b370cebe3 Reorder packages. 2015-07-20 17:04:16 +02:00
11e931c8e3 Use new query structure. 2015-07-14 15:11:43 +02:00
7518010d9b Move query tests to daq.query (where the classes are). 2015-07-13 16:47:27 +02:00
4a3704fbbe correct properties file name. 2015-07-13 16:43:06 +02:00
3fdde89e57 Rename test packages.
Add .query prefix to properties.
2015-07-13 16:39:42 +02:00
287659fa65 Fix jar name 2015-07-09 17:00:09 +02:00
8c363bacd6 ATEST-109:
- renaming rest to queryrest
2015-07-08 16:18:47 +02:00
7fb05a65f3 ATEST-109:
- renaming packages in query project
2015-07-08 15:27:08 +02:00
6d9ca551ce ATEST-109:
- renaming hazelcast to query
2015-07-08 15:23:49 +02:00
fa78ce234c ATEST-109:
- renaming hazelcast to query
2015-07-08 14:30:55 +02:00
749904b747 ATEST-81:
- update path
2015-07-08 12:11:38 +02:00