Commit Graph

49 Commits

Author SHA1 Message Date
c751aab8de ATEST-205 2015-08-10 11:44:08 +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
f1587230a6 ATEST-129 2015-07-31 14:32:57 +02:00
47d921e1a4 ATEST-128 2015-07-31 12:50:29 +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
8ce8370601 ATEST-122 2015-07-29 11:32:36 +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
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
3157082262 ATEST-81:
- trying to fix bug re react stream and closed queue
2015-07-03 16:04:14 +02:00
6dfa14082d ATEST-81:
- tracking down bugs and trying to fix
2015-07-01 16:51:22 +02:00
2d7c299ef7 ATEST-81:
- fixing / trying to fix various bugs
2015-06-30 18:54:50 +02:00
df02fa4d4c ATEST-81:
- removing ComponentScan
2015-06-30 13:22:10 +02:00
1394a8b04c ATEST-81:
- implementing dummy write method for manual testing
2015-06-30 09:44:34 +02:00
8f2bbd47bd ATEST-81:
- renaming config so that all the configs follow the same naming
patterns
2015-06-26 15:19:43 +02:00
fad99c2ac3 ATEST-81:
- fixing tests using updated Cassandra startup routine
2015-06-26 13:33:40 +02:00
899d50492c ATEST-81:
- correct build setup
- add javadoc
2015-06-25 12:36:43 +02:00
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
5eb649fb34 ATEST-81:
- first draft for distributed querying
2015-06-24 17:26:26 +02:00
f7aeb4729f ATEST-81:
- remove not needed enum in BinningStrategyEnum
- rename enum in Ordering
2015-06-24 10:47:25 +02:00
6d44da8c96 ATEST-81:
- added dummy write method for REST interface
2015-06-23 15:50:03 +02:00
1276e20399 ATEST-81:
- fixing serialisation
- adding tests
2015-06-23 11:49:08 +02:00
c51db19001 ATEST-81:
- renaming package in hazelcast project
2015-06-22 12:52:30 +02:00
4f6ceccd68 - rename hazelcast.common 2015-06-22 11:58:41 +02:00
51d219f686 ATEST-79:
- removing code that uses UUIDGen
2015-06-19 15:36:49 +02:00
c1098a398f ATEST-79:
- implementing first draft of timerange and pulserange queries
- adding tests, again based on an embedded local cassandra instance
2015-06-19 15:14:54 +02:00
aaaf5a72fe ATEST-79:
- adding 1st draft of the queries
2015-06-18 10:52:34 +02:00
59f5aa0777 ATEST-75: simple testing whether externally configuring the cassandra
application works
2015-06-11 18:12:03 +02:00
a26dd2424d ATEST-74:
- setup gradle multibuild
2015-06-10 14:18:37 +02:00
26b7a15891 import package changes 2015-05-27 17:23:59 +02:00
0fe81045d5 initial commit 2015-05-27 16:59:20 +02:00