(no commit message)

diff --git a/.gitattributes b/.gitattributes
index 9c3baab7927d1a8a6d40c4b5db94bfc03e05e8d3..e6d26d77e52dd96fd6e96aba8233a0978b2f12ae 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -223,8 +223,8 @@ cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/AgentDaoHibernateImpl.
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IAgentDao.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/INonViralNameDao.java -text
-cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/NonViralNameDaoHibernateImpl.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/ITaxonNameDao.java -text
+cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/TaxonNameDaoHibernateImpl.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/BotanicNameCacheStrategy.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/INameCacheStrategy.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/IStrategy.java -text
@@ -237,7 +237,6 @@ cdmlibrary/src/site/site.xml -text
 cdmlibrary/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
 cdmlibrary/src/test/java/eu/etaxonomy/cdm/functiontest/SpringControl.java -text
 cdmlibrary/src/test/java/eu/etaxonomy/cdm/model/name/NameRelationshipTest.java -text
-cdmlibrary/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameTest.java -text
 cdmlibrary/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
 cdmlibrary/src/test/java/extern/TestJarMain.java -text
 cdmlibrary/zipManifest.txt -text

diff --git a/cdmlibrary/pom.xml b/cdmlibrary/pom.xml
index 7bd1274e587cda9f710cdf0cd7a9120774c5a93c..3f6a42b3152f688fae91e2862ab652c48a4ccb66 100644 (file)
--- a/cdmlibrary/pom.xml
+++ b/cdmlibrary/pom.xml
@@ -11,7 +11,7 @@
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>cdmLibrary</artifactId>\r
        <name>EDIT Common Data Model Library</name>\r
-       <version>0.3.0</version>\r
+       <version>0.4.0</version>\r
        <description>EDIT cdm library</description>\r
        <!-- UNDER WORK -->\r
        <scm>\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java
index 4acb703e590feefad4f51aa898907164ebce2923..89a674c3acdb47a9f5db2ba4316ab8ea4fb91bec 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.context.ApplicationContext;
 \r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.persistence.dao.IAgentDao;\r
-import eu.etaxonomy.cdm.persistence.dao.INonViralNameDao;\r
+import eu.etaxonomy.cdm.persistence.dao.ITaxonNameDao;\r
 \r
 \r
 /**\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
index 7323384290b9b4b16d5884713af44f96fe8db533..3b76274c0d6c2f9381e24919ae18a253aa43bd96 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
@@ -2,26 +2,16 @@ package eu.etaxonomy.cdm.api.service;
 \r
 import java.util.List;\r
 \r
-import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
+import eu.etaxonomy.cdm.model.name.*;\r
 \r
 public interface INameService extends IService {\r
 \r
-       /**Returns a new NonViralName object */\r
-       public abstract NonViralName createNonViralName(Rank rank);\r
-       \r
-       public abstract NonViralName getNonViralNameById(Integer id);\r
+       public abstract TaxonNameBase getTaxonNameById(Integer id);\r
 \r
-       /**\r
-        * Saves a NonViralName. If the NonViralName is already persisted,\r
-        * it is updated, otherwise it is saved as a new object.\r
-        * @param taxonName\r
-        * @return the NonViralNames Id\r
-        */\r
-       public abstract int saveNonViralName(NonViralName taxonName);\r
+       public abstract int saveTaxonName(TaxonNameBase taxonName);\r
 \r
-       public abstract List getAllNames();\r
+       public abstract List<TaxonNameBase> getAllNames();\r
 \r
-       public abstract List getNamesByNameString(String name);\r
+       public abstract List<TaxonNameBase> getNamesByNameString(String name);\r
 \r
 }
\ No newline at end of file

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 e8eb05c23cbd9ccc054aa2b64eb84ff9a8ffb09e..f63bc88c919f1e99f0fc9f34cb54b1f379388793 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
@@ -3,8 +3,9 @@ package eu.etaxonomy.cdm.api.service;
 import org.apache.log4j.Logger;\r
 import org.springframework.context.ApplicationContext;\r
 \r
+import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
 import eu.etaxonomy.cdm.model.name.*;\r
-import eu.etaxonomy.cdm.persistence.dao.INonViralNameDao;\r
+import eu.etaxonomy.cdm.persistence.dao.ITaxonNameDao;\r
 import eu.etaxonomy.cdm.strategy.BotanicNameCacheStrategy;\r
 \r
 import java.util.List;\r
@@ -14,40 +15,29 @@ import java.util.List;
 public class NameServiceImpl extends ServiceBase implements INameService {\r
        static Logger logger = Logger.getLogger(NameServiceImpl.class);\r
        \r
-       private INonViralNameDao nonViralNameDao;\r
+       private ITaxonNameDao taxonNameDao;\r
        \r
        /**\r
         * @return the taxonNameDao\r
         */\r
-       public INonViralNameDao getTaxonNameDao() {\r
-               return nonViralNameDao;\r
+       public ITaxonNameDao getTaxonNameDao() {\r
+               return taxonNameDao;\r
        }\r
 \r
        /**\r
-        * @param nonViralNameDao the taxonNameDao to set\r
+        * @param taxonNameDao the taxonNameDao to set\r
         */\r
-       public void setTaxonNameDao(INonViralNameDao nonViralNameDao) {\r
-               this.nonViralNameDao = nonViralNameDao;\r
+       public void setTaxonNameDao(ITaxonNameDao taxonNameDao) {\r
+               this.taxonNameDao = taxonNameDao;\r
        }\r
 \r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.service.INameService#getNewTaxonName()\r
-        */\r
-       public NonViralName createNonViralName(Rank rank) {\r
-               //TODO implement factory methods \r
-               NonViralName tn = (NonViralName) createCdmObject(NonViralName.class);\r
-               tn.setRank(rank);\r
-               return tn;\r
-               //return new TaxonName(new BotanicNameCacheStrategy());\r
-       }\r
 \r
 \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.service.INameService#getTaxonNameById(java.lang.Integer)\r
         */\r
-       public NonViralName getNonViralNameById(Integer id) {\r
-               NonViralName tn = nonViralNameDao.findById(id);\r
+       public TaxonNameBase getTaxonNameById(Integer id) {\r
+               TaxonNameBase tn = taxonNameDao.findById(id);\r
                if (tn != null) {\r
                        logger.info("getTaxonNameById: UUID: " + tn.getUuid());\r
                }\r
@@ -57,8 +47,8 @@ public class NameServiceImpl extends ServiceBase implements INameService {
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.service.INameService#saveTaxonName(eu.etaxonomy.cdm.model.name.TaxonName)\r
         */\r
-       public int saveNonViralName(NonViralName taxonName) {\r
-               nonViralNameDao.saveOrUpdate(taxonName);\r
+       public int saveTaxonName(TaxonNameBase taxonName) {\r
+               taxonNameDao.saveOrUpdate(taxonName);\r
                return taxonName.getId();\r
        }\r
        \r
@@ -66,14 +56,14 @@ public class NameServiceImpl extends ServiceBase implements INameService {
         * @see eu.etaxonomy.cdm.api.service.INameService#getAllNames()\r
         */\r
        public List getAllNames(){\r
-               return nonViralNameDao.getAllNames();\r
+               return taxonNameDao.getAllNames();\r
        }\r
        \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.service.INameService#getNamesByName(java.lang.String)\r
         */\r
        public List getNamesByNameString(String name){\r
-               return nonViralNameDao.getNamesByName(name);\r
+               return taxonNameDao.getNamesByName(name);\r
        }\r
 \r
 }\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
index c84bfa6d6aaae3a7d4cbed5c61f08d55dbfad073..b193357f5ae9fb4ed43d701c1c0f000a9f4f2990 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
@@ -39,6 +39,9 @@ public class NonViralName extends TaxonNameBase {
        //Species subdivision epithet
        @Description("Species subdivision epithet")
        private String infraSpecificEpithet;
+       //Full authorship string
+       @Description("Full authorship string")
+       private String fullAuthorship;
        /**
         * Author team that published the present combination
         */
@@ -124,10 +127,12 @@ public class NonViralName extends TaxonNameBase {
         * returns concatenated und formated authorteams including basionym and
         * combination authors 
         */
-       @Transient
        public String getFullAuthorship(){
                return "";
        }
+       public setFullAuthorship(String fullAuthorship){
+               fullAuthorship=fullAuthorship;
+       }
 
        @Override
        public String generateTitle() {

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/INonViralNameDao.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/INonViralNameDao.java
deleted file mode 100644 (file)
index a593eb1..0000000
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/INonViralNameDao.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**\r
- * \r
- */\r
-package eu.etaxonomy.cdm.persistence.dao;\r
-\r
-import java.util.List;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
-\r
-/**\r
- * @author a.mueller\r
- *\r
- */\r
-public interface INonViralNameDao extends IDao<NonViralName,Integer> {\r
-       \r
-       /* any nice thing to find*/\r
-       public List<NonViralName> getRelatedNames(Integer id);\r
-       \r
-       /* all names*/\r
-       public List<NonViralName> getAllNames();\r
-       \r
-       /* some names*/\r
-       public List<NonViralName> getNamesByName(String name);\r
-       \r
-       \r
-}\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/ITaxonNameDao.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/ITaxonNameDao.java
new file mode 100644 (file)
index 0000000..7291f34
--- /dev/null
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/ITaxonNameDao.java
@@ -0,0 +1,25 @@
+/**\r
+ * \r
+ */\r
+package eu.etaxonomy.cdm.persistence.dao;\r
+\r
+import java.util.List;\r
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+\r
+/**\r
+ * @author a.mueller\r
+ *\r
+ */\r
+public interface ITaxonNameDao extends IDao<TaxonNameBase,Integer> {\r
+       \r
+       /* any nice thing to find*/\r
+       public List<TaxonNameBase> getRelatedNames(Integer id);\r
+       \r
+       /* all names*/\r
+       public List<TaxonNameBase> getAllNames();\r
+       \r
+       /* some names*/\r
+       public List<TaxonNameBase> getNamesByName(String name);\r
+       \r
+       \r
+}\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/NonViralNameDaoHibernateImpl.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/TaxonNameDaoHibernateImpl.java
similarity index 50%
rename from cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/NonViralNameDaoHibernateImpl.java
rename to cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/TaxonNameDaoHibernateImpl.java
index e150e248eef6c422b584b91968d6275fd2ba042e..37209823dce0fb99bc767e942bc2b074326a594f 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/NonViralNameDaoHibernateImpl.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/TaxonNameDaoHibernateImpl.java
@@ -13,50 +13,50 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.orm.hibernate3.HibernateCallback;\r
 import org.springframework.orm.hibernate3.HibernateTemplate;\r
 \r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 \r
 /**\r
  * @author a.mueller\r
  *\r
  */\r
-public class NonViralNameDaoHibernateImpl \r
-                       extends DaoBase<NonViralName, Integer> implements INonViralNameDao {\r
-       static Logger logger = Logger.getLogger(NonViralNameDaoHibernateImpl.class);\r
+public class TaxonNameDaoHibernateImpl \r
+                       extends DaoBase<TaxonNameBase, Integer> implements ITaxonNameDao {\r
+       static Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class);\r
 \r
        /**\r
         * \r
         */\r
-       public NonViralNameDaoHibernateImpl() {\r
-               super(NonViralName.class); \r
+       public TaxonNameDaoHibernateImpl() {\r
+               super(TaxonNameBase.class); \r
        }\r
 \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.persistence.dao.ITaxonNameDAO#getRelatedNames(java.lang.Integer)\r
         */\r
-       public List<NonViralName> getRelatedNames(Integer id) {\r
+       public List<TaxonNameBase> getRelatedNames(Integer id) {\r
                // TODO Auto-generated method stub\r
                return null;\r
        }\r
        \r
        \r
-       public List<NonViralName> getAllNames() {\r
-               List<NonViralName> list = ht().find("from NonViralName");\r
+       public List<TaxonNameBase> getAllNames() {\r
+               List<TaxonNameBase> list = ht().find("from TaxonNameBase");\r
                return list;\r
        }\r
        \r
        \r
-       public List<NonViralName> getNamesByName(String name) {\r
-               List<NonViralName> list = ht().find("from NonViralName tn where tn.name=?", name);\r
+       public List<TaxonNameBase> getNamesByName(String name) {\r
+               List<TaxonNameBase> list = ht().find("from TaxonNameBase tn where tn.name=?", name);\r
                return list;\r
        }\r
 \r
        //TODO test\r
-       public NonViralName getDataSource(){\r
+       public TaxonNameBase getDataSource(){\r
                return null;\r
        }\r
 \r
        //TODO test\r
-       public void setDataSource(NonViralName tn){\r
+       public void setDataSource(TaxonNameBase tn){\r
                \r
        }\r
     \r

diff --git a/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml b/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
index 2668e4a0f45453ce036c37dbe8f2012afe0625d6..7270ef8a53dc289fb2cc6d68eff143be068eedaf 100644 (file)
--- a/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
+++ b/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
@@ -44,10 +44,12 @@
                
         <property name="annotatedClasses">\r
                        <list>\r
-                       <value>eu.etaxonomy.cdm.model.name.TaxonName</value>\r
+                       <value>eu.etaxonomy.cdm.model.name.NonViralName</value>\r
                        <value>eu.etaxonomy.cdm.model.name.NameRelationship</value>\r
-                       <value>eu.etaxonomy.cdm.model.common.VersionableEntity</value>\r
-                       <value>eu.etaxonomy.cdm.model.common.IdentifiableEntity</value>\r
+                               <value>eu.etaxonomy.cdm.model.common.CdmBase</value>
+                               <value>eu.etaxonomy.cdm.model.common.VersionableEntity</value>\r
+                               <value>eu.etaxonomy.cdm.model.common.AnnotatableEntity</value>
+                               <value>eu.etaxonomy.cdm.model.common.IdentifiableEntity</value>\r
                        <value>eu.etaxonomy.cdm.model.agent.Team</value>\r
                    </list>\r
                </property>\r
@@ -82,8 +84,6 @@
        <bean id="nameService" \r
                        class="eu.etaxonomy.cdm.api.service.NameServiceImpl">\r
                <property name="taxonNameDao" ref="taxonNameDao"/>\r
-               <!--  property name="newTaxonName" ref="taxonName"></property-->\r
-               <!--  replaced-method name="getNewTaxonName" replacer="taxonName" />-->\r
        </bean>\r
  \r
        \r
@@ -96,45 +96,12 @@
        </bean>\r
  \r
        <bean id="taxonNameDao" 
-                       class="eu.etaxonomy.cdm.persistence.dao.TaxonNameDaoHibernateImpl">
+               class="eu.etaxonomy.cdm.persistence.dao.TaxonNameDaoHibernateImpl">
                        <!-- autowire="byType"-->
                <property name="sessionFactory" ref="sessionFactory"/> 
        </bean>
-
- \r
-       <!-- CDM DOMAIN PROTOTYPE CLASSES -->
-       <bean  id="protoTaxonName" \r
-                       class="eu.etaxonomy.cdm.model.name.TaxonName" \r
-                       scope="prototype">\r
-               <property name="cacheStrategy" ref="botanicNameCacheStrategy"/>\r
-               <property name="year" value="2007"/> \r
-       </bean>
         \r
-
-
-
-
-\r
-       <!--  ************ AOP ***********************  --> \r
-       <!--
-       <bean id="changePropertyAspect" \r
-                       class="eu.etaxonomy.cdm.aspect.ChangePropertyAspect">\r
-       \r
-       </bean>\r
 \r
-       <aop:config>\r
-               <aop:pointcut id="afterSetPointcut" \r
-                       expression="execution(* eu.etaxonomy.cdm.model.name.TaxonName.set*(..))"/>\r
-               \r
-               <aop:aspect id="cpa" ref="changePropertyAspect">\r
-                       <aop:after-returning\r
-                               method="afterSet"\r
-                               arg-names="newValue"\r
-                               pointcut-ref="afterSetPointcut"/>\r
-               </aop:aspect>\r
-       </aop:config>\r
-       -->
-       \r
    \r
     <!-- ********* not used yet ********-->\r
     <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">\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 b646c422fc08515ff8c28e4469e58e4cab701e05..85dd91107cb46e7ec63064b9818bfc3b4f5a73ec 100644 (file)
--- a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/functiontest/SpringControl.java
+++ b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/functiontest/SpringControl.java
@@ -26,9 +26,9 @@ public class SpringControl {
                ClassPathResource cpr = new ClassPathResource(fileName);\r
                \r
                XmlBeanFactory  bf = new XmlBeanFactory(cpr);\r
-               INonViralNameDao tnDao = (INonViralNameDao)bf.getBean("tnDao");\r
-               TaxonName tn = tnDao.findById(1);\r
-               List<TaxonName> tnList = tnDao.getAllNames();\r
+               ITaxonNameDao tnDao = (ITaxonNameDao)bf.getBean("tnDao");\r
+               NonViralName tn = tnDao.findById(1);\r
+               List<NonViralName> tnList = tnDao.getAllNames();\r
                \r
                logger.warn(tn.getUuid());\r
        }\r
@@ -44,10 +44,10 @@ public class SpringControl {
                        System.out.println(o[i]);\r
                }\r
                \r
-               INonViralNameDao tnDao = (INonViralNameDao) appContext.getBean( "tnDao" );\r
-               TaxonName tn = tnDao.findById(1);\r
-               List<TaxonName> tnList = tnDao.getNamesByName(tn.getName());\r
-               for (TaxonName tn2: tnList){\r
+               ITaxonNameDao tnDao = (ITaxonNameDao) appContext.getBean( "tnDao" );\r
+               NonViralName tn = tnDao.findById(1);\r
+               List<NonViralName> tnList = tnDao.getNamesByName(tn.getName());\r
+               for (NonViralName tn2: tnList){\r
                        System.out.print(tn2.getUuid()+";");\r
                }\r
                appContext.close();\r
@@ -56,8 +56,8 @@ public class SpringControl {
        public void testAppController(){\r
                CdmApplicationController appCtr = new CdmApplicationController();\r
                logger.info("Create name objects...");\r
-               TaxonName tn = appCtr.getNameService().createTaxonName(Rank.SPECIES);\r
-               TaxonName tn3 = appCtr.getNameService().createTaxonName(Rank.SPECIES);\r
+               NonViralName tn = appCtr.getNameService().createTaxonName(Rank.SPECIES);\r
+               NonViralName tn3 = appCtr.getNameService().createTaxonName(Rank.SPECIES);\r
                \r
                // setup listeners\r
                PropertyChangeTest listener = new PropertyChangeTest();\r
@@ -65,9 +65,9 @@ public class SpringControl {
                tn3.addPropertyChangeListener(listener);\r
 \r
                // test listeners\r
-               tn.setGenus("tn1-Genus1");\r
-               tn3.setGenus("tn3-genus");\r
-               tn3.getGenus();\r
+               tn.setUninomial("tn1-Genus1");\r
+               tn3.setUninomial("tn3-genus");\r
+               tn3.getUninomial();\r
                \r
                logger.info("Create new Author team...");\r
                Team team= new Team();\r
@@ -82,9 +82,9 @@ public class SpringControl {
 \r
                // load objects\r
                logger.info("Load existing names from db...");\r
-               List<TaxonName> tnList = appCtr.getNameService().getAllNames();\r
-               for (TaxonName tn2: tnList){\r
-                       logger.info("Genus: "+ tn2.getGenus() + " UUID: " + tn2.getUuid()+";");\r
+               List<NonViralName> tnList = appCtr.getNameService().getAllNames();\r
+               for (NonViralName tn2: tnList){\r
+                       logger.info("Genus: "+ tn2.getUninomial() + " UUID: " + tn2.getUuid()+";");\r
                }\r
                appCtr.close();\r
        }\r

diff --git a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameTest.java b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameTest.java
deleted file mode 100644 (file)
index 0d4c563..0000000
--- a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameTest.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.model.name;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import org.junit.*;\r
-\r
-import static org.junit.Assert.*;\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
-import eu.etaxonomy.cdm.api.service.INameService;\r
-import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
-import eu.etaxonomy.cdm.persistence.dao.INonViralNameDao;\r
-\r
-/**\r
- * @author Andreas Mueller\r
- * @version 1.0\r
- * @created 15-Aug-2007 17:39:52\r
- */\r
-public class TaxonNameTest {\r
-       static Logger logger = Logger.getLogger(TaxonNameTest.class);\r
-\r
-       private static TaxonName tn;\r
-       private static int id;\r
-       private static INonViralNameDao tnDao;\r
-       private static INameService nameServiceImpl;\r
-       private static String mAuthorship = "authorship";\r
-       private static String mGenus = "genus";\r
-       \r
-       @Test\r
-       public final void getAuthorship(){\r
-               Assert.assertEquals("etwas stimmt hier nicht", mAuthorship, tn.getAuthorship());\r
-       }\r
-\r
-       @Test\r
-       public final void getAuthorTeam(){\r
-\r
-       }\r
-\r
-       @Test\r
-       public final void getCultivarName(){\r
-\r
-       }\r
-\r
-       @Test\r
-       public final void getExAuthorTeam(){\r
-\r
-       }\r
-\r
-//     @Test\r
-//     public final void getFacts(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getFullName(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getGenus(){\r
-//             Assert.assertEquals(mGenus, tn.getGenus());\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getHasProblem(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getIdInSource(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getInfragenericEpithet(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getInfraSpecificEpithet(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getInverseNameRelation(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getName(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getNameInSource(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getNameRelation(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getNomenclaturalCode(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getNomenclaturalMicroReference(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getNomenclaturalReference(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getProblems(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getRank(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getSource(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getSpecificEpithet(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getTypeDesignations(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getUninomial(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void getUnnamedNamePhrase(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void isAnamorphic(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void isAtomised(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void isBinomHybrid(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void isCultivarGroup(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void isHybridFormula(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void isMonomHybrid(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void isTrinomHybrid(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void parseName(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setAnamorphic(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setAtomised(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setAuthorship(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setAuthorTeam(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setBinomHybrid(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setCultivarGroup(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setCultivarName(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setExAuthorTeam(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setFacts(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setFullName(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setGenus(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setHasProblem(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setHybridFormula(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setIdInSource(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setInfragenericEpithet(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setInfraSpecificEpithet(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setInverseNameRelation(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setMonomHybrid(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setName(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setNameInSource(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setNameRelation(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setNomenclaturalCode(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setNomenclaturalMicroReference(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setNomenclaturalReference(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setRank(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setSource(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setSpecificEpithet(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setTrinomHybrid(){\r
-//\r
-//     }\r
-//\r
-//     @Test\r
-//     public final void setTypeDesignations(){\r
-//\r
-//     }\r
-\r
-       @Test\r
-       public final void setUninomial(){\r
-\r
-       }\r
-\r
-       @Test\r
-       public final void setUnnamedNamePhrase(){\r
-\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @exception Exception\r
-        */\r
-       @Before\r
-       public void setUp()\r
-         throws Exception{\r
-               //tn = tnDao.findById(id);\r
-               tn = nameServiceImpl.getTaxonNameById(id);\r
-       }\r
-\r
-       \r
-\r
-       \r
-       \r
-       /**\r
-        * \r
-        * @exception Exception\r
-        */\r
-       @BeforeClass\r
-       public static void setUpClass()\r
-         throws Exception{\r
-               /* Create ApplicationControler */\r
-               CdmApplicationController app = new CdmApplicationController();\r
-               INameService ns = app.getNameService();\r
-               \r
-               tn = ns.createTaxonName(Rank.SPECIES);\r
-               tn.setAuthorship(mAuthorship);\r
-               tn.setGenus(mGenus);\r
-               //tnDao = (ITaxonNameDAO)bf.getBean("tnDao");\r
-               //id = tnDao.save(tn);\r
-               nameServiceImpl = app.getNameService();\r
-               id = nameServiceImpl.saveTaxonName(tn);\r
-               logger.info("id is " + id);\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @exception Exception\r
-        */\r
-       @After\r
-       public void tearDown()\r
-         throws Exception{\r
-\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @exception Exception\r
-        */\r
-       @AfterClass\r
-       public static void tearDownClass()\r
-         throws Exception{\r
-\r
-       }\r
-\r
-       \r
-       //Used by Spring to setup test\r
-       public void setTaxonNameDAO(INonViralNameDao tnDao){\r
-               this.tnDao = tnDao;\r
-       }\r
-       \r
-}
\ No newline at end of file