#5250 Initial attempt at property paths

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
index 847181732677189e6b4284ed319db25991ab02ab..8d4bf0e08bb2ba91867cc4cfc3e7d6dad551f0aa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
@@ -171,9 +171,11 @@ public class SearchManager {
                    }
                }
                final List<String> OCCURRENCE_INIT_STRATEGY = Arrays.asList(new String[] {
+                       "collection",
                        "descriptions",
                        "identifiers",
-                       "derivationEvents.originals"
+                       "derivationEvents.originals",
+                       "derivedFrom.originals"
                });
                configurator.setPropertyPaths(OCCURRENCE_INIT_STRATEGY);
                if(configurator.getClazz().equals(SpecimenOrObservationBase.class)){

diff --git a/eu.etaxonomy.taxeditor.test/src/test/resources/server.properties b/eu.etaxonomy.taxeditor.test/src/test/resources/server.properties
deleted file mode 100644 (file)
index 5b20cc4..0000000
--- a/eu.etaxonomy.taxeditor.test/src/test/resources/server.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-httpPort=9090
-stopPort=9191
-stopKey=jetty-cdm-server
-user=admin
-password=00000