Fabian Märki
9179f78905
Resolve javadoc generation issue.
2015-10-30 13:40:06 +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
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
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
c5b8c55970
ATEST-128
2015-08-07 08:38:37 +02:00
Fabian Märki
f1587230a6
ATEST-129
2015-07-31 14:32:57 +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
11e931c8e3
Use new query structure.
2015-07-14 15:11:43 +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
Zellweger Christof Ralf
fa78ce234c
ATEST-109:
...
- renaming hazelcast to query
2015-07-08 14:30:55 +02:00
Zellweger Christof Ralf
3157082262
ATEST-81:
...
- trying to fix bug re react stream and closed queue
2015-07-03 16:04:14 +02:00
Zellweger Christof Ralf
6dfa14082d
ATEST-81:
...
- tracking down bugs and trying to fix
2015-07-01 16:51:22 +02:00
Zellweger Christof Ralf
2d7c299ef7
ATEST-81:
...
- fixing / trying to fix various bugs
2015-06-30 18:54:50 +02:00
Zellweger Christof Ralf
df02fa4d4c
ATEST-81:
...
- removing ComponentScan
2015-06-30 13:22:10 +02:00
Zellweger Christof Ralf
1394a8b04c
ATEST-81:
...
- implementing dummy write method for manual testing
2015-06-30 09:44:34 +02:00
Zellweger Christof Ralf
8f2bbd47bd
ATEST-81:
...
- renaming config so that all the configs follow the same naming
patterns
2015-06-26 15:19:43 +02:00
Zellweger Christof Ralf
899d50492c
ATEST-81:
...
- correct build setup
- add javadoc
2015-06-25 12:36:43 +02:00
Zellweger Christof Ralf
2cc816ee9a
ATEST-81:
...
- rename and move some components
- setup component scanning to work properly
- create a HazelcastClient to connect to hazelcast cluster, configure it
properly
2015-06-25 11:20:10 +02:00
Zellweger Christof Ralf
5eb649fb34
ATEST-81:
...
- first draft for distributed querying
2015-06-24 17:26:26 +02:00
Zellweger Christof Ralf
f7aeb4729f
ATEST-81:
...
- remove not needed enum in BinningStrategyEnum
- rename enum in Ordering
2015-06-24 10:47:25 +02:00
Zellweger Christof Ralf
6d44da8c96
ATEST-81:
...
- added dummy write method for REST interface
2015-06-23 15:50:03 +02:00
Zellweger Christof Ralf
1276e20399
ATEST-81:
...
- fixing serialisation
- adding tests
2015-06-23 11:49:08 +02:00
Zellweger Christof Ralf
c51db19001
ATEST-81:
...
- renaming package in hazelcast project
2015-06-22 12:52:30 +02:00
Zellweger Christof Ralf
4f6ceccd68
- rename hazelcast.common
2015-06-22 11:58:41 +02:00
Zellweger Christof Ralf
51d219f686
ATEST-79:
...
- removing code that uses UUIDGen
2015-06-19 15:36:49 +02:00