Commit Graph

74 Commits

Author SHA1 Message Date
Zellweger Christof Ralf
d2ea89e632 - removing temporary fix which was necessary because there was a bug in
the iron-ajax Polymer component
2015-11-18 09:05:15 +01:00
Zellweger Christof Ralf
044a23f27c ATEST-266:
- adding a method for returning all dbmodes
- temporary fix for ajax CORS call issue (see comment)
2015-11-10 14:47:34 +01:00
Fabian Märki
095087a478 ATEST-267 2015-11-09 16:04:05 +01:00
Fabian Märki
7fb24f830e ATEST-261 2015-11-02 09:17:46 +01:00
Fabian Märki
e463716858 ATEST-267 2015-10-30 16:16:28 +01:00
Fabian Märki
9179f78905 Resolve javadoc generation issue. 2015-10-30 13:40:06 +01:00
Fabian Märki
dd3ec01573 Use correct content. 2015-10-30 11:49:09 +01:00
Fabian Märki
3f60043416 Remove renamed test. 2015-10-30 11:46:46 +01:00
Fabian Märki
0b41016535 Merge branch 'master' into ATEST-246
Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
2015-10-30 11:46:30 +01:00
Fabian Märki
2f6a012abb ATEST-246 2015-10-30 11:33:29 +01:00
Zellweger Christof Ralf
00e181c8aa ATEST-259:
- clean up, improving naming
2015-10-28 13:03:18 +01:00
Zellweger Christof Ralf
cd72af733a ATEST-259:
- adding tests, re-implementing a simpler CORS filter than previously
used
2015-10-28 12:52:32 +01:00
Zellweger Christof Ralf
6aa5801491 ATEST-259:
- adding simple CORS filter which includes some standard cors headers
2015-10-27 18:14:54 +01:00
Zellweger Christof Ralf
001e093623 ATEST-259:
- fixing QueryRestController tests before adding the CORS filter
2015-10-27 18:00:05 +01:00
Zellweger Christof Ralf
8488541282 ATEST-259:
- trying to implement dummy cassandra reader
- fixing some of the tests
2015-10-27 15:41:42 +01:00
Fabian Märki
1819283622 Java doc. 2015-10-21 10:41:03 +02:00
Fabian Märki
a61fddf699 Reformatting. 2015-10-21 10:01:00 +02:00
Zellweger Christof Ralf
c894bb5939 ATEST-249:
- provide a channel search method with with the user can define all or
part of the channel name
2015-10-20 11:49:12 +02:00
Fabian Märki
1c1ddf773a ATEST-242 2015-10-13 13:18:04 +02:00
Fabian Märki
cc0639432a ATEST-206 2015-09-30 11:11:34 +02:00
Fabian Märki
610fbaa0e0 Change DBMode wording. 2015-09-07 13:28:48 +02:00
Fabian Märki
9a6b9de4d9 provide shape too. 2015-08-21 08:42:40 +02:00
Fabian Märki
1e44d2dc2b Only log info messages. 2015-08-20 15:05:05 +02:00
Fabian Märki
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
Fabian Märki
776c8135e5 Log loaded values in config
Add/remove / in REST interface.
2015-08-10 17:28:15 +02:00
Fabian Märki
c751aab8de ATEST-205 2015-08-10 11:44:08 +02:00
Fabian Märki
6ce4d1553b Merge branch 'master' into ATEST-128 2015-08-07 08:43:59 +02:00
Fabian Märki
c5b8c55970 ATEST-128 2015-08-07 08:38:37 +02:00
Fabian Märki
2dc1b4bfb6 ATEST-128 First working impl. 2015-08-05 14:06:06 +02:00
Zellweger Christof Ralf
fb244d95b7 - switching back from @Autowired to @Resource 2015-07-31 16:21:45 +02:00
Fabian Märki
46c1406d57 Merge branch 'master' into ATEST-128 2015-07-31 14:36:26 +02:00
Fabian Märki
f1587230a6 ATEST-129 2015-07-31 14:32:57 +02:00
Fabian Märki
47d921e1a4 ATEST-128 2015-07-31 12:50:29 +02:00
Zellweger Christof Ralf
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
Zellweger Christof Ralf
22c2adf7cc ATEST-124:
- implement the QueryValidator class
- adjust / fix tests
2015-07-31 10:17:11 +02:00
Fabian Märki
2f24e95303 ATEST-123 2015-07-31 10:14:01 +02:00
Fabian Märki
ebb904009d ATEST-123 2015-07-31 10:12:52 +02:00
Fabian Märki
107bddbd72 ATEST-123 2015-07-30 15:33:53 +02:00
Zellweger Christof Ralf
1d07c618a9 ATEST-124:
- implement the query validator
2015-07-30 12:16:31 +02:00
Fabian Märki
8ce8370601 ATEST-122 2015-07-29 11:32:36 +02:00
Fabian Märki
ea7ebbabbe For readme. 2015-07-24 17:51:12 +02:00
Fabian Märki
689622be07 Async read, query REST etc. 2015-07-24 15:34:35 +02:00
Fabian Märki
9b370cebe3 Reorder packages. 2015-07-20 17:04:16 +02:00
Fabian Märki
11e931c8e3 Use new query structure. 2015-07-14 15:11:43 +02:00
Fabian Märki
7518010d9b Move query tests to daq.query (where the classes are). 2015-07-13 16:47:27 +02:00
Fabian Märki
4a3704fbbe correct properties file name. 2015-07-13 16:43:06 +02:00
Fabian Märki
3fdde89e57 Rename test packages.
Add .query prefix to properties.
2015-07-13 16:39:42 +02:00
Zellweger Christof Ralf
8c363bacd6 ATEST-109:
- renaming rest to queryrest
2015-07-08 16:18:47 +02:00
Zellweger Christof Ralf
7fb05a65f3 ATEST-109:
- renaming packages in query project
2015-07-08 15:27:08 +02:00
Zellweger Christof Ralf
6d9ca551ce ATEST-109:
- renaming hazelcast to query
2015-07-08 15:23:49 +02:00