move MockCdmCacher to TermLoader

diff --git a/.gitattributes b/.gitattributes
index b03d06be439d829c01890941f8ad11a446b1b60a..39c4f0f9370c20b628a96b2f97db34b5ad7df87c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -777,6 +777,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java -te
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WrongTermTypeException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermInitializer.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermLoader.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/MockCdmCacher.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermLoader.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermNotFoundException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java -text
@@ -1108,7 +1109,6 @@ cdmlib-model/src/main/resources/update/update_term_r2.4.2.1-r2.4.2.2.mysql.sql -
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DatabaseInitialiser.java -text
-cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/MockCdmCacher.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/AgentValidationTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembershipTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/TeamTest.java -text

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java
index a2608d1d7f2a09a31c0e3acc84e21c887eee8c27..8053668ebf9b9746a7217a1aba49e40dd53f5cc7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java
@@ -15,9 +15,9 @@ import java.util.UUID;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.model.MockCdmCacher;\r
 import eu.etaxonomy.cdm.model.common.init.ITermInitializer;\r
 import eu.etaxonomy.cdm.model.common.init.ITermLoader;\r
+import eu.etaxonomy.cdm.model.common.init.MockCdmCacher;\r
 import eu.etaxonomy.cdm.model.common.init.TermLoader;\r
 \r
 /**\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/MockCdmCacher.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/MockCdmCacher.java
similarity index 98%
rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/MockCdmCacher.java
rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/MockCdmCacher.java
index 224ef43490b39e811c15e22426fefaa908d345e8..a0ba51e2fa8e156cade1be9017dc0b49e6e94936 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/MockCdmCacher.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/MockCdmCacher.java
@@ -1,4 +1,4 @@
-package eu.etaxonomy.cdm.model;
+package eu.etaxonomy.cdm.model.common.init;
 
 import java.util.Set;
 import java.util.UUID;
@@ -11,6 +11,7 @@ import net.sf.ehcache.config.PersistenceConfiguration;
 import net.sf.ehcache.config.PersistenceConfiguration.Strategy;
 import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
 
+import eu.etaxonomy.cdm.model.ICdmCacher;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
index 0ed841f7a07b527f25bd26542220c3d76d223fff..93fc9405c60b7a47dd35c36b872867709d239697 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java
@@ -20,13 +20,11 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.MockCdmCacher;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 \r
 /**\r