added @Qualifier to help autowiring in cdmlib-remote

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
index 09ab6756cdadde456ce8f8571b9599e4f5cdd703..280d48413c9ac7760cc8eb31350efec003b5b3c1 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase;
 \r
 @Repository\r
 public class AgentDaoImpl extends IdentifiableDaoBase<Agent> implements IAgentDao{\r
+       \r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(AgentDaoImpl.class);\r
 \r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java
index a271577f67bd1f6c628b06c742f604c13177adcc..d13904be875c2869cf152a7c9f098f09378adf63 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java
@@ -13,6 +13,7 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Query;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
 
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
@@ -26,6 +27,7 @@ import eu.etaxonomy.cdm.persistence.dao.common.IAnnotatableDao;
  * @version 1.0
  */
 @Repository
+@Qualifier("annotatableDaoImpl")
 public class AnnotatableDaoImpl<T extends AnnotatableEntity> extends CdmEntityDaoBase<T> implements IAnnotatableDao<T> {
        private static Logger logger = Logger.getLogger(AnnotatableDaoImpl.class);
        

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java
index e3d24690bbf48196aebe0e62725d8d57d56c9e06..4cb369cfa7d72b40a0e026ae685bbbc0e987dbb4 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java
@@ -18,6 +18,7 @@ import org.hibernate.Criteria;
 import org.hibernate.Query;\r
 import org.hibernate.criterion.Projections;\r
 import org.hibernate.criterion.Restrictions;\r
+import org.springframework.beans.factory.annotation.Qualifier;\r
 import org.springframework.stereotype.Repository;\r
 \r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
@@ -35,7 +36,10 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase;
 \r
 \r
 @Repository\r
+@Qualifier("descriptionDaoImpl")\r
 public class DescriptionDaoImpl extends IdentifiableDaoBase<DescriptionBase> implements IDescriptionDao{\r
+\r
+       @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(DescriptionDaoImpl.class);\r
 \r
        public DescriptionDaoImpl() {\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
index fe8c9b3b9692f0bb2beac217dfc5317cd89d5cad..9eeca2ca0541778aaede6599c106d431ac20fb55 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
@@ -16,6 +16,7 @@ import org.hibernate.Criteria;
 import org.hibernate.Query;\r
 import org.hibernate.criterion.Projections;\r
 import org.hibernate.criterion.Restrictions;\r
+import org.springframework.beans.factory.annotation.Qualifier;\r
 import org.springframework.stereotype.Repository;\r
 \r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
@@ -35,8 +36,11 @@ import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao;
  *\r
  */\r
 @Repository\r
+@Qualifier("taxonNameDaoHibernateImpl")\r
 public class TaxonNameDaoHibernateImpl \r
                        extends IdentifiableDaoBase<TaxonNameBase> implements ITaxonNameDao {\r
+       \r
+       @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class);\r
 \r
        public TaxonNameDaoHibernateImpl() {\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java
index 3a785345aa8d8f78ab1a36a89f5e972db3f66d4e..fe041fd8c4310cc2b450a7d86d7b7287aca0e3e7 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java
@@ -27,8 +27,9 @@ import eu.etaxonomy.cdm.persistence.dao.occurrence.IOccurrenceDao;
 @Repository\r
 public class OccurrenceDaoHibernateImpl extends IdentifiableDaoBase<SpecimenOrObservationBase> implements\r
                IOccurrenceDao {\r
-\r
-       static Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class);\r
+       \r
+       @SuppressWarnings("unused")\r
+       private static final Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class);\r
 \r
        public OccurrenceDaoHibernateImpl() {\r
                super(SpecimenOrObservationBase.class);\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java
index 4f8798611475a3281d698fd6050909295181b0ef..c332abebca255a1cb0a6983699f4fbe9212420b3 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java
@@ -9,6 +9,7 @@
 package eu.etaxonomy.cdm.persistence.dao.hibernate.reference;\r
 \r
 import org.apache.log4j.Logger;\r
+import org.springframework.beans.factory.annotation.Qualifier;\r
 import org.springframework.stereotype.Repository;\r
 \r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
@@ -20,8 +21,11 @@ import eu.etaxonomy.cdm.persistence.dao.reference.IReferenceDao;
  *\r
  */\r
 @Repository\r
+@Qualifier("referenceDaoHibernateImpl")\r
 public class ReferenceDaoHibernateImpl extends IdentifiableDaoBase<ReferenceBase> implements IReferenceDao {\r
-       static Logger logger = Logger.getLogger(ReferenceDaoHibernateImpl.class);\r
+       \r
+       @SuppressWarnings("unused")\r
+       private static final Logger logger = Logger.getLogger(ReferenceDaoHibernateImpl.class);\r
 \r
        public ReferenceDaoHibernateImpl() {\r
                super(ReferenceBase.class);\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
index c1d833ae46ee4478fcf95dd3ccd97be2d9e831dc..db6d8c18657445d4e9ff1f580ee4f8b95fd2b1e4 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
@@ -21,6 +21,7 @@ import org.hibernate.Query;
 import org.hibernate.criterion.Criterion;\r
 import org.hibernate.criterion.Projections;\r
 import org.hibernate.criterion.Restrictions;\r
+import org.springframework.beans.factory.annotation.Qualifier;\r
 import org.springframework.dao.DataAccessException;\r
 import org.springframework.stereotype.Repository;\r
 \r
@@ -57,8 +58,11 @@ import eu.etaxonomy.cdm.persistence.fetch.CdmFetch;
  * @version 1.0\r
  */\r
 @Repository\r
+@Qualifier("taxonDaoHibernateImpl")\r
 public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implements ITaxonDao {\r
-       static Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class);\r
+       \r
+       @SuppressWarnings("unused")\r
+       private static final Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class);\r
 \r
        public TaxonDaoHibernateImpl() {\r
                super(TaxonBase.class);\r