(no commit message)

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
index c9050ab75cdcc7ad7c9e9e31a13f2caedc1a123b..af4f12ee77cdeef9c540501d035160727983ad62 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
@@ -45,7 +45,7 @@ public class NameServiceImpl extends ServiceBase implements INameService {
         * @see eu.etaxonomy.cdm.api.service.INameService#getAllNames()\r
         */\r
        public List getAllNames(){\r
-               return taxonNameDao.getAllNames();\r
+               return taxonNameDao.list(1000);\r
        }\r
        \r
        /* (non-Javadoc)\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/AgentDaoHibernateImpl.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/AgentDaoHibernateImpl.java
index aea9608baa112aa01b50835eb4c83e9233a4fb08..7c7c7277a8f99e1b95385b6bb6bcae4315e7eec5 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/AgentDaoHibernateImpl.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/AgentDaoHibernateImpl.java
@@ -8,6 +8,7 @@ import org.springframework.stereotype.Repository;
 import eu.etaxonomy.cdm.model.agent.Agent;\r
 \r
 \r
+@Repository\r
 public class AgentDaoHibernateImpl extends DaoBase<Agent, Integer> implements IAgentDao{\r
        private static final Logger logger = Logger.getLogger(AgentDaoHibernateImpl.class);\r
 \r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java
index 5fe21787053702a1f73373717efc992dee841f0f..4e5e45c8540c9e733a1f79fc2582cc19912820ab 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java
@@ -23,7 +23,6 @@ import eu.etaxonomy.cdm.model.common.Enumeration;
  * @author a.mueller\r
  *\r
  */\r
-@Component\r
 public abstract class DaoBase<T, ID extends Serializable> implements IDao<T, ID> {\r
 \r
        static Logger logger = Logger.getLogger(DaoBase.class);\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImpl.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImpl.java
index 4f59f0792923a768369fd08a6e2875e60efb241f..13a8d6efd667bab8ca2af9c1336a1627a55781be 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImpl.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImpl.java
@@ -11,6 +11,7 @@ import eu.etaxonomy.cdm.model.common.Enumeration;
 
 
 
+@Repository
 public class EnumerationDaoHibernateImpl extends DaoBase<Enumeration, Integer> implements IEnumerationDAO {
        private static final Logger logger = Logger.getLogger(EnumerationDaoHibernateImpl.class);
 

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java
index c4cf06133b17af40933f072212ca13c6e48055a8..21bd3d236e35368a7b4c75961deeb2c17d25ac5d 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java
@@ -18,6 +18,7 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.orm.hibernate3.HibernateTemplate;
 
 import eu.etaxonomy.cdm.model.Description;
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Enumeration;
 
 /**
@@ -26,7 +27,7 @@ import eu.etaxonomy.cdm.model.common.Enumeration;
  * @version 1.0
  * @created 02-Nov-2007 19:36:10
  */
-public interface IDao<T, ID extends Serializable> {
+public interface IDao<T extends CdmBase, ID extends Serializable> {
        public void saveOrUpdate(T transientObject) throws DataAccessException;
        
        /* (non-Javadoc)

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/TaxonNameDaoHibernateImpl.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/TaxonNameDaoHibernateImpl.java
index 23eb5998fbf6b967b09f5ded56633a967280928b..58e685e6e69d698decc79a9f5615e0c9493a1e7e 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/TaxonNameDaoHibernateImpl.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/TaxonNameDaoHibernateImpl.java
@@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
  * @author a.mueller\r
  *\r
  */\r
+@Repository\r
 public class TaxonNameDaoHibernateImpl \r
                        extends DaoBase<TaxonNameBase, Integer> implements ITaxonNameDao {\r
        static Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class);\r

diff --git a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/functiontest/SpringControl.java b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/functiontest/SpringControl.java
index 5b5ff2bcf17cad0950643a49fba70519b4048e70..3d28b72c2caa975010f169fa52e04582776d9864 100644 (file)
--- a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/functiontest/SpringControl.java
+++ b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/functiontest/SpringControl.java
@@ -29,7 +29,7 @@ public class SpringControl {
                XmlBeanFactory  bf = new XmlBeanFactory(cpr);\r
                ITaxonNameDao tnDao = (ITaxonNameDao)bf.getBean("tnDao");\r
                TaxonNameBase tn = tnDao.findById(1);\r
-               List<TaxonNameBase> tnList = tnDao.getAllNames();\r
+               List<TaxonNameBase> tnList = tnDao.list(1000);\r
                \r
                logger.warn(tn.getUuid());\r
        }\r

diff --git a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImplTest.java b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImplTest.java
index 8e23d91923d7146c2346ec707a0ca5c35b4c5d98..a63ae4ef296d4dff7a13288381e0170b6dc913c0 100644 (file)
--- a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImplTest.java
+++ b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImplTest.java
@@ -59,6 +59,6 @@ public class EnumerationDaoHibernateImplTest extends CdmUnitTestBase{
 
        @Test
        public void testList100() {
-               assertFalse(dao.list100().isEmpty());
+               assertFalse(dao.list(100).isEmpty());
        }
 }