Rename test packages.

Add .query prefix to properties.

src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java

@@ -67,7 +67,7 @@ public class QueryRestConfig {
    private Set<String> defaultResponseFields() {
       List<String> defaultFields = Arrays.asList(
             StringUtils.commaDelimitedListToStringArray(
-                  env.getProperty("rest.default.response.fields")
+                  env.getProperty("queryrest.default.response.fields")
             ));
       Set<String> defaultResponseFields = Sets.newHashSet(defaultFields.iterator());
       return defaultResponseFields;

src/main/resources/queryrest.properties

@@ -3,4 +3,4 @@ server.port=8080
 
 # defines the fields that are included in the response 
 # if no fields have been specified by the user
-rest.default.response.fields=channel,pulseId,globalMillis,globalNanos,value
+queryrest.default.response.fields=channel,pulseId,globalMillis,globalNanos,value

src/test/java/ch/psi/daq/test/queryrest/AbstractDaqRestTest.java

@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest;
+package ch.psi.daq.test.queryrest;
 
 import org.junit.Before;
 import org.junit.runner.RunWith;

src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java

@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest;
+package ch.psi.daq.test.queryrest;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java

@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest.controller;
+package ch.psi.daq.test.queryrest.controller;
 
 import java.util.Date;
 import java.util.List;
@@ -21,7 +21,7 @@ import ch.psi.daq.query.model.PulseRangeQuery;
 import ch.psi.daq.query.model.TimeRangeQuery;
 import ch.psi.daq.query.range.QueryRange;
 import ch.psi.daq.query.range.QueryRangeImpl;
-import ch.psi.daq.test.rest.AbstractDaqRestTest;
+import ch.psi.daq.test.queryrest.AbstractDaqRestTest;
 
 /**
  * Tests the {@link DaqController} implementation. 

src/test/java/ch/psi/daq/test/queryrest/queries/AbstractQueryTest.java

@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest.queries;
+package ch.psi.daq.test.queryrest.queries;
 
 import java.util.Date;
 import java.util.List;

src/test/java/ch/psi/daq/test/queryrest/queries/AbstractQueryTestTest.java

@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest.queries;
+package ch.psi.daq.test.queryrest.queries;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;

src/test/java/ch/psi/daq/test/queryrest/queries/TimeRangeQueryTest.java

@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest.queries;
+package ch.psi.daq.test.queryrest.queries;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/test/java/ch/psi/daq/test/queryrest/query/DummyQueryProcessor.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package ch.psi.daq.test.rest.query;
+package ch.psi.daq.test.queryrest.query;
 
 import java.util.List;
 import java.util.Map;