moved play test functions to test package

diff --git a/.gitattributes b/.gitattributes
index 9265a1063bd04959db393e1b5b607e9a8a641302..a6b393919b163edd209f3050836a1dc50a152ecb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -82,8 +82,6 @@ cdmlibrary/src/eu/etaxonomy/cdm/api/service/IService.java -text
 cdmlibrary/src/eu/etaxonomy/cdm/api/service/NameServiceImpl.java -text
 cdmlibrary/src/eu/etaxonomy/cdm/api/service/ServiceBase.java -text
 cdmlibrary/src/eu/etaxonomy/cdm/aspect/ChangePropertyAspect.java -text
-cdmlibrary/src/eu/etaxonomy/cdm/control/ListenerTest.java -text
-cdmlibrary/src/eu/etaxonomy/cdm/control/SpringControl.java -text
 cdmlibrary/src/eu/etaxonomy/cdm/control/hibernate/CdmManager.java -text
 cdmlibrary/src/eu/etaxonomy/cdm/control/hibernate/HibernateUtil.java -text
 cdmlibrary/src/eu/etaxonomy/cdm/database/DbType.java -text

diff --git a/cdmlibrary/.classpath b/cdmlibrary/.classpath
index 7811bd8d5556fc2723d0ff743c78a01f1f92260d..ac22ecadf46aa3f74b31bc12d2d7d98f15a55ed0 100644 (file)
--- a/cdmlibrary/.classpath
+++ b/cdmlibrary/.classpath
@@ -1,40 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="src" path="test"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/>\r
-       <classpathentry kind="lib" path="lib/asm.jar"/>\r
-       <classpathentry kind="lib" path="lib/asm-attrs.jar"/>\r
-       <classpathentry kind="lib" path="lib/cglib-2.1.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/commons-collections-2.1.1.jar"/>\r
-       <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>\r
-       <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>\r
-       <classpathentry kind="lib" path="lib/ehcache-1.2.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/ejb3-persistence.jar"/>\r
-       <classpathentry kind="lib" path="lib/hibernate3.jar"/>\r
-       <classpathentry kind="lib" path="lib/hibernate-annotations.jar"/>\r
-       <classpathentry kind="lib" path="lib/hibernate-commons-annotations.jar"/>\r
-       <classpathentry kind="lib" path="lib/hibernate-validator.jar"/>\r
-       <classpathentry kind="lib" path="lib/javassist.jar"/>\r
-       <classpathentry kind="lib" path="lib/jaxb-api.jar"/>\r
-       <classpathentry kind="lib" path="lib/jaxb-impl-2.0.jar"/>\r
-       <classpathentry kind="lib" path="lib/jaxb-impl-2.0-sources.jar"/>\r
-       <classpathentry kind="lib" path="lib/jdbc2_0-stdext.jar"/>\r
-       <classpathentry kind="lib" path="lib/jta.jar"/>\r
-       <classpathentry kind="lib" path="lib/junit-4.4.jar"/>\r
-       <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>\r
-       <classpathentry kind="lib" path="lib/mysql-connector-java-3.1.14-bin.jar"/>\r
-       <classpathentry kind="lib" path="lib/spring.jar"/>\r
-       <classpathentry kind="lib" path="lib/xml-apis.jar"/>\r
-       <classpathentry kind="lib" path="lib/hsqldb.jar" sourcepath="C:/Dokumente und Einstellungen/a.mueller/Eigene Dateien/Downloads/hsqldb_1_8_0_7.zip"/>\r
-       <classpathentry kind="lib" path="lib/spring-aspects.jar"/>\r
-       <classpathentry kind="lib" path="lib/aspectjlib-1.5.0.jar"/>\r
-       <classpathentry kind="lib" path="lib/aspectjrt-1.5.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/aspectjtools-1.5.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/aspectjweaver-1.5.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/asm-commons-2.2.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/asm-2.2.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/xercesImpl.jar"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="test"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/>
+       <classpathentry kind="lib" path="lib/asm.jar"/>
+       <classpathentry kind="lib" path="lib/asm-attrs.jar"/>
+       <classpathentry kind="lib" path="lib/cglib-2.1.3.jar"/>
+       <classpathentry kind="lib" path="lib/commons-collections-2.1.1.jar"/>
+       <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
+       <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+       <classpathentry kind="lib" path="lib/ehcache-1.2.3.jar"/>
+       <classpathentry kind="lib" path="lib/ejb3-persistence.jar"/>
+       <classpathentry kind="lib" path="lib/hibernate3.jar"/>
+       <classpathentry kind="lib" path="lib/hibernate-annotations.jar"/>
+       <classpathentry kind="lib" path="lib/hibernate-commons-annotations.jar"/>
+       <classpathentry kind="lib" path="lib/hibernate-validator.jar"/>
+       <classpathentry kind="lib" path="lib/javassist.jar"/>
+       <classpathentry kind="lib" path="lib/jaxb-api.jar"/>
+       <classpathentry kind="lib" path="lib/jaxb-impl-2.0.jar"/>
+       <classpathentry kind="lib" path="lib/jaxb-impl-2.0-sources.jar"/>
+       <classpathentry kind="lib" path="lib/jdbc2_0-stdext.jar"/>
+       <classpathentry kind="lib" path="lib/jta.jar"/>
+       <classpathentry kind="lib" path="lib/junit-4.4.jar"/>
+       <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
+       <classpathentry kind="lib" path="lib/mysql-connector-java-3.1.14-bin.jar"/>
+       <classpathentry kind="lib" path="lib/spring.jar"/>
+       <classpathentry kind="lib" path="lib/xml-apis.jar"/>
+       <classpathentry kind="lib" path="lib/hsqldb.jar" sourcepath="C:/Dokumente und Einstellungen/a.mueller/Eigene Dateien/Downloads/hsqldb_1_8_0_7.zip"/>
+       <classpathentry kind="lib" path="lib/spring-aspects.jar"/>
+       <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
+       <classpathentry kind="lib" path="lib/aspectjrt.jar"/>
+       <classpathentry kind="lib" path="lib/aspectjweaver.jar"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/cdmlibrary/editCdm.spring.cfg.xml b/cdmlibrary/editCdm.spring.cfg.xml
index 0979f0e089804d1ae2e33b3dda63084efd4e6a8d..a1bd61e4b82ecb95f03a6be7821d5b41ab8149c3 100644 (file)
--- a/cdmlibrary/editCdm.spring.cfg.xml
+++ b/cdmlibrary/editCdm.spring.cfg.xml
@@ -102,13 +102,19 @@
        </bean>\r
  \r
  \r
-       <bean  id="taxonName" \r
+       <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
+       <bean  id="etsttt" 
+                       class="eu.etaxonomy.cdm.model.name.TaxonName" 
+                       scope="prototype">
+               <property name="cacheStrategy" ref="protoTaxonName"/>
+               <property name="year" value="2007"/> 
+       </bean>
+        \r
        <bean id="taxonNameDao" \r
                        class="eu.etaxonomy.cdm.persistence.dao.TaxonNameDaoHibernateImpl">\r
                        <!-- autowire="byType"-->\r
@@ -116,6 +122,7 @@
        </bean>\r
 \r
        <!--  ************ AOP ***********************  --> \r
+       <!--
        <bean id="changePropertyAspect" \r
                        class="eu.etaxonomy.cdm.aspect.ChangePropertyAspect">\r
        \r
@@ -132,22 +139,8 @@
                                pointcut-ref="afterSetPointcut"/>\r
                </aop:aspect>\r
        </aop:config>\r
+       -->
        \r
-       <!--  aop:aspectj-autoproxy/-->\r
-       \r
-       <!-- ************ AOP *********************** >\r
-       <bean id="aspTest"\r
-               class="org.springframework.aop.aspectj.AspectJExpressionPointcut">\r
-               <property name="parameterNames" value="setAuthorTeam"/>\r
-       </bean>\r
-\r
-   <aop:config>\r
-       <aop:aspect ref="taxonName">\r
-               <aop:after-returning\r
-                       method="firePropertyChange"\r
-                       pointcut-ref="aspTest"/>\r
-       </aop:aspect>\r
-   </aop:config-->\r
    \r
     <!-- ********* not used yet ********-->\r
     <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">\r

diff --git a/cdmlibrary/log4j.properties b/cdmlibrary/log4j.properties
index 14cda9c145e9217ffd29f48d93e460929736d7dd..39f4ab187f7b1797fdf9618073f10e90e1a463c1 100644 (file)
--- a/cdmlibrary/log4j.properties
+++ b/cdmlibrary/log4j.properties
@@ -21,7 +21,7 @@ log4j.rootLogger=warn, stdout
 
        ### *** CDM *** ###
 
-log4j.logger.eu.etaxonomy.cdm.control = info 
+log4j.logger.eu.etaxonomy.cdm.functiontest = debug 
 
        ### ***HIBERNATE ************ ###
 

diff --git a/cdmlibrary/src/eu/etaxonomy/cdm/api/service/ServiceBase.java b/cdmlibrary/src/eu/etaxonomy/cdm/api/service/ServiceBase.java
index 7c0ac009a66d28bb14687d1899b2c5432273ae8b..8465e7ff273788afba6bb67c339dbd3e3fc5b757 100644 (file)
--- a/cdmlibrary/src/eu/etaxonomy/cdm/api/service/ServiceBase.java
+++ b/cdmlibrary/src/eu/etaxonomy/cdm/api/service/ServiceBase.java
@@ -10,7 +10,7 @@ import org.springframework.context.ApplicationContextAware;
 \r
 import org.springframework.context.support.ClassPathXmlApplicationContext;\r
 \r
-import eu.etaxonomy.cdm.control.SpringControl;\r
+import eu.etaxonomy.cdm.functiontest.SpringControl;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.persistence.dao.ITaxonNameDao;\r

diff --git a/cdmlibrary/src/eu/etaxonomy/cdm/control/ListenerTest.java b/cdmlibrary/src/eu/etaxonomy/cdm/control/ListenerTest.java
deleted file mode 100644 (file)
index 6842936..0000000
--- a/cdmlibrary/src/eu/etaxonomy/cdm/control/ListenerTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**\r
- * \r
- */\r
-package eu.etaxonomy.cdm.control;\r
-\r
-import java.beans.PropertyChangeEvent;\r
-import java.beans.PropertyChangeListener;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author a.mueller\r
- *\r
- */\r
-public class ListenerTest implements PropertyChangeListener {\r
-       private static final Logger logger = Logger.getLogger(ListenerTest.class);\r
-       \r
-       /* (non-Javadoc)\r
-        * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)\r
-        */\r
-       public void propertyChange(PropertyChangeEvent evt) {\r
-               String str = " Changed from " + evt.getOldValue() + " to " + evt.getNewValue();\r
-               logger.info("Jippie, changes found: " + str);\r
-\r
-       }\r
-\r
-}\r

diff --git a/cdmlibrary/src/eu/etaxonomy/cdm/control/SpringControl.java b/cdmlibrary/src/eu/etaxonomy/cdm/control/SpringControl.java
deleted file mode 100644 (file)
index 9348e95..0000000
--- a/cdmlibrary/src/eu/etaxonomy/cdm/control/SpringControl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* just for testing */\r
-\r
-\r
-package eu.etaxonomy.cdm.control;\r
-import org.springframework.context.support.ClassPathXmlApplicationContext;\r
-import org.apache.log4j.Logger;\r
-import org.springframework.beans.factory.xml.XmlBeanFactory;\r
-import org.springframework.core.io.*;\r
-\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
-import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.name.*;\r
-import eu.etaxonomy.cdm.persistence.dao.*;\r
-\r
-\r
-import java.beans.PropertyChangeListener;\r
-import java.util.*;\r
-\r
-public class SpringControl {\r
-       static Logger logger = Logger.getLogger(SpringControl.class);\r
-       \r
-       public void testBeanFactory (){\r
-               String fileName = "editCdm.spring.cfg.xml";\r
-               ClassPathResource cpr = new ClassPathResource(fileName);\r
-               \r
-               XmlBeanFactory  bf = new XmlBeanFactory(cpr);\r
-               ITaxonNameDao tnDao = (ITaxonNameDao)bf.getBean("tnDao");\r
-               TaxonName tn = tnDao.findById(1);\r
-               List<TaxonName> tnList = tnDao.getAllNames();\r
-               \r
-               logger.warn(tn.getUuid());\r
-       }\r
-       \r
-       public void testAppContext(){\r
-               String fileName = "editCdm.spring.cfg.xml";\r
-               \r
-               ClassPathXmlApplicationContext appContext = new ClassPathXmlApplicationContext(fileName);\r
-               appContext.registerShutdownHook();\r
-               \r
-               String[] o = appContext.getBeanDefinitionNames();\r
-               for (int i= 0; i<o.length;i++){\r
-                       System.out.println(o[i]);\r
-               }\r
-               \r
-               ITaxonNameDao tnDao = (ITaxonNameDao) appContext.getBean( "tnDao" );\r
-               TaxonName tn = tnDao.findById(1);\r
-               List<TaxonName> tnList = tnDao.getNamesByName(tn.getName());\r
-               for (TaxonName tn2: tnList){\r
-                       System.out.print(tn2.getUuid()+";");\r
-               }\r
-               appContext.close();\r
-       }\r
-       \r
-       public void testAppController(){\r
-               CdmApplicationController appCtr = new CdmApplicationController();\r
-               TaxonName tn = appCtr.getNameService().createTaxonName(Rank.SPECIES);\r
-               TaxonName tn3 = appCtr.getNameService().createTaxonName(Rank.SPECIES);\r
-               \r
-               PropertyChangeListener listener = new ListenerTest();\r
-               tn.addPropertyChangeListener(listener);\r
-               tn3.addPropertyChangeListener(listener);\r
-               tn.setGenus("tn1-Genus1");\r
-               tn3.setGenus("tn3-genus");\r
-               tn3.getGenus();\r
-               \r
-               Team team= new Team();\r
-               team.setShortName("AuthorTeam1");\r
-               tn.setAuthorTeam(team);\r
-               \r
-               appCtr.getAgentService().saveTeam(team);\r
-               appCtr.getNameService().saveTaxonName(tn);\r
-               \r
-               List<TaxonName> tnList = appCtr.getNameService().getNamesByNameString("Abies alba");\r
-               for (TaxonName tn2: tnList){\r
-                       System.out.print(tn2.getUuid()+";");\r
-               }\r
-               appCtr.close();\r
-       }\r
-       \r
-       private void test(){\r
-               System.out.println("Start");\r
-               SpringControl sc = new SpringControl();\r
-       //testBeanFactory();\r
-       //testAppContext();\r
-       testAppController();\r
-       System.out.println("\nEnd");\r
-       }\r
-       \r
-       /**\r
-        * @param args\r
-        */\r
-       public static void  main(String[] args) {\r
-               SpringControl sc = new SpringControl();\r
-       sc.test();\r
-       }\r
-\r
-}\r

diff --git a/cdmlibrary/test/eu/etaxonomy/cdm/test/model/name/TaxonNameTest.java b/cdmlibrary/test/eu/etaxonomy/cdm/test/model/name/TaxonNameTest.java
index 036c54a9cd1e812597f1bda6d4caef4961899f76..afc8ecbcc37032ccb195140af4ead14e5750d829 100644 (file)
--- a/cdmlibrary/test/eu/etaxonomy/cdm/test/model/name/TaxonNameTest.java
+++ b/cdmlibrary/test/eu/etaxonomy/cdm/test/model/name/TaxonNameTest.java
@@ -390,7 +390,7 @@ public class TaxonNameTest {
                CdmApplicationController app = new CdmApplicationController();\r
                INameService ns = app.getNameService();\r
                \r
-               tn = ns.getNewTaxonName(Rank.SPECIES);\r
+               tn = ns.createTaxonName(Rank.SPECIES);\r
                tn.setAuthorship(mAuthorship);\r
                tn.setGenus(mGenus);\r
                //tnDao = (ITaxonNameDAO)bf.getBean("tnDao");\r