(no commit message)

diff --git a/.gitattributes b/.gitattributes
index c97b25fa86bd87faaa10bfc3a8bfb7dd4ca70a5f..3b05c27e97715f6b4e6a7f7a517344e189d9bd98 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -52,7 +52,6 @@ cdmParent/.project -text
 cdmParent/mavenInstall.bat -text
 cdmParent/pom.xml -text
 cdmParent/settings.xml -text
-cdmlibrary/build.xml -text
 cdmlibrary/listAnnotatedClasses.py -text
 cdmlibrary/pom.xml -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java -text
@@ -220,7 +219,6 @@ cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/INameCacheStrategy.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/IStrategy.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/StrategyBase.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/ZooNameCacheStrategy.java -text
-cdmlibrary/src/main/resources/applicationContext-test.xml -text
 cdmlibrary/src/main/resources/applicationContext.xml -text
 cdmlibrary/src/main/resources/log4j.properties -text
 cdmlibrary/src/main/resources/servicedao.xml -text
@@ -234,7 +232,7 @@ cdmlibrary/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java -text
 cdmlibrary/src/test/java/eu/etaxonomy/cdm/persistence/dao/EnumerationDaoHibernateImplTest.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
+cdmlibrary/src/test/resources/applicationContext-test.xml -text
 docs/layers.graffle -text
 docs/layers.png -text
 updateSite/.project -text

diff --git a/cdmlibrary/build.xml b/cdmlibrary/build.xml
deleted file mode 100644 (file)
index 973b605..0000000
--- a/cdmlibrary/build.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<!--\r
-\r
-       cdmLibrary ANT build script.\r
-\r
--->\r
-\r
-<project name="cmd" default="compile" basedir=".">\r
-\r
-    <!-- ################################################################## -->\r
-    <!-- ################## Property definitions ########################## -->\r
-    <!-- ################################################################## -->\r
-\r
-       <!-- Name of project and version, used to create filenames -->\r
-       <property name="name" value="Taxonomic Common Data Model"/>\r
-       <property name="name2" value="cdmLibrary"/>\r
-       <property name="version.major" value="1"/>\r
-       <property name="version.minor" value="0"/>\r
-       <property name="version.micro" value="0"/>\r
-    <property name="version.full" value="${version.major}.${version.minor}.${version.micro}"/>\r
-    <property name="version.major_minor" value="${version.major}.${version.minor}"/>\r
-    <property name="fullname" value="${name}-${version.full}"/>\r
-\r
-    <!-- Various SCM-controlled directories -->\r
-    <property name="dir.src" value="src/main/java" />\r
-    <property name="dir.test" value="src/test/java" />\r
-    <property name="dir.etc" value="etc" />\r
-       <property name="dir.lib" value="lib" />\r
-       <property name="dir.doc" value="doc"/>\r
-       <property name="dir.doc.api" value="${dir.doc}/api"/>\r
-       <property name="dir.doc.ref" value="${dir.doc}/reference"/>\r
-    <property name="dir.build" value="target/classes"/>\r
-       <property name="dir.build.test" value="target/test-classes"/>\r
-       <property name="dir.resources" value="src/main/resources"/>\r
-       <property name="dir.test.resources" value="src/test/resources"/>
-<!--   <property name="dir.maven.local" value="/Users/markus/.m2/repository"/> -->\r
-<!--   <property name="dir.maven.local" value="C:\Dokumente und Einstellungen\a.mueller\.m2\repository\"/>-->\r
-       <property name="dir.maven.local" value="${user.home}${file.separator}.m2${file.separator}repository${file.separator}"/>\r
-               \r
-       \r
-       <!-- Distribution -->\r
-       <property name="dist.dir" value="dist" />\r
-       <property name="dist.zip" value="${dist.dir}/zip" />\r
-       <property name="dist.jar" value="${dist.dir}/jar" />\r
-       <property name="jar.name" value="${name2}"/>\r
-       \r
-       <!-- Configs -->\r
-       <property name="spring.cfg" value="${dir.resources}/editCdm.spring.cfg.xml"/>\r
-       <property name="log4j.prop" value="${dir.resources}/log4j.properties"/>\r
-\r
-       \r
-    <!-- Classpath declaration -->\r
-    <path id="project.classpath">\r
-       <fileset dir="${dir.maven.local}">
-               <include name="**/*.jar"/>
-               <include name="**/**/*.jar"/>
-               <include name="**/**/**/*.jar"/>
-       </fileset>\r
-       <fileset dir="${dir.build}">\r
-               <include name="**\*.class"/>\r
-       </fileset>\r
-       <fileset dir="${dir.build.test}">\r
-               <include name="**\*.class"/>\r
-       </fileset>\r
-       
-    <!--       <fileset dir="${dir.build}">
-               <include name="**/*.jar"/>\r
-               <include name="**/*.zip"/>\r
-        </fileset>
-       -->\r
-       <fileset dir="${dir.build.test}">\r
-               <include name="eu.etaxonomy.cdm.test.suite"/>\r
-       </fileset>\r
-       \r
-       \r
-    </path>\r
-       \r
-\r
-    <!-- Useful shortcuts -->\r
-    <patternset id="meta.files">\r
-               <exclude name="**/org/bgbm/berlinmodel/hibernate/*.xml"/> <!-- by Andreas can be deleted-->\r
-       <include name="**/*.xml"/>\r
-        <include name="**/*.properties"/>\r
-    </patternset>\r
-    \r
-<!-- xxxxxxxxxxxx  TARGETS xxxxxxxxxxxxxxxxxxxxxxxxxxx -->     \r
-       \r
-    <!-- Clean up -->\r
-    <target name="clean" description="Clean the build directory">\r
-        <delete dir="${dir.build}"/>\r
-        <mkdir dir="${dir.build}"/>
-        <delete dir="${dir.build.test}"/>
-        <mkdir dir="${dir.build.test}"/>\r
-    </target>\r
-       \r
-\r
-    <!-- Compile Java source -->\r
-    <target name="compile" depends="copyConfigFiles" \r
-               description="compile all classes">\r
-        <mkdir dir="${dir.build}"/>\r
-       <mkdir dir="${dir.build.test}"/>\r
-       <javac debug="true" srcdir="${dir.src}" \r
-               destdir="${dir.build}"\r
-               classpathref="project.classpath"/>\r
-        <javac debug="true" srcdir="${dir.test}" 
-               destdir="${dir.build.test}"
-               classpathref="project.classpath"/>
-    </target> \r
-       \r
-       <!-- Compile Java test source -->\r
-       <target name="compileTest" depends="copyConfigFilesTest" \r
-                       description="compile all test classes">\r
-               <mkdir dir="${dir.build.test}"/>\r
-               <javac debug="true" srcdir="${dir.test}" \r
-                      destdir="${dir.build.test}"\r
-                      classpathref="project.classpath"/>\r
-       </target> \r
-               \r
-       \r
-       \r
-       <!-- Copy metadata to build classpath -->\r
-       <target name="copyMetaFiles">\r
-               <mkdir dir="${dir.build}"/>\r
-           <copy todir="${dir.build}">\r
-               <fileset dir="${dir.src}">\r
-                       <patternset refid="meta.files"/>\r
-               </fileset>\r
-           </copy>\r
-       </target>\r
-       \r
-       <!-- Copy configuration files to build classpath -->\r
-       <target name="copyConfigFiles">\r
-               <mkdir dir="${dir.build}"/>\r
-               <copy file="${log4j.prop}" todir="${dir.build}"/>\r
-               <copy file="${spring.cfg}" todir="${dir.build}"/>\r
-       </target>\r
-       \r
-       \r
-       <!-- Copy test configuration files to build classpath -->\r
-       <target name="copyConfigFilesTest">\r
-               <mkdir dir="${dir.build.test}"/>\r
-               <copy file="${log4j.prop}" todir="${dir.build}"/>\r
-               <copy file="${spring.cfg}" todir="${dir.build}"/>\r
-       </target>\r
-       \r
-       <!-- Distribute as ZIP-File -->\r
-       <target name="distAsZip" depends="compile" \r
-                          description="Builds an zip file containing jar and lib-directory. classpathes must be set in manifest.txt\r
-                                                               jar is executable">\r
-               <delete file="${dist.jar}/${jar.name}.jar"/>\r
-           <delete file="${dist.zip}/${jar.name}.zip"/>\r
-           <mkdir dir="${dist.jar}" />\r
-           <mkdir dir="${dist.zip}" />
-           <jar jarfile="${dist.jar}/${jar.name}.jar"\r
-                basedir="${dir.build}"\r
-                manifest="zipManifest.txt" />\r
-           <zip destfile="${dist.zip}/${jar.name}.zip">\r
-             <fileset dir="." includes="${dir.lib}/*" />\r
-             <fileset dir="." includes="${jar.name}.jar" />\r
-           </zip>\r
-       </target>\r
-\r
-</project>\r

diff --git a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/CdmUnitTestBase.java b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/CdmUnitTestBase.java
index 079c7ceb96029ba0e492694aa266d7bdffd80fab..6e73e1752e573d8d6f13b8c4697d0aa011995430 100644 (file)
--- a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/CdmUnitTestBase.java
+++ b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/CdmUnitTestBase.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 //ApplicationContext will be loaded from "/applicationContext.xml" and "/applicationContext-test.xml"
 //in the root of the classpath
-@ContextConfiguration(locations={"applicationContext-test.xml"})
+@ContextConfiguration(locations={"/applicationContext-test.xml"})
 public abstract class CdmUnitTestBase{
        
 }

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 7944aafdf058bfedd21231dd69fe970aeb11fda1..70ad02ae0c5c3e6c9379cce606db55912a923299 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
@@ -10,33 +10,16 @@ import java.util.Set;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import eu.etaxonomy.cdm.CdmUnitTestBase;
 import eu.etaxonomy.cdm.model.common.*;
 
 public class EnumerationDaoHibernateImplTest extends CdmUnitTestBase{
-       private static IEnumerationDAO dao;
-       private static Enumeration myStaticEnum = new Enumeration();
+       @Autowired
+       private IEnumerationDAO dao;
        private Enumeration enumeration;
 
-       public static IEnumerationDAO getDao() {
-               return dao;
-       }
-
-       // to be set by spring
-       public static void setDao(IEnumerationDAO dao) {
-               EnumerationDaoHibernateImplTest.dao = dao;
-       }
-
-       @BeforeClass
-       public static void setUpBeforeClass() throws Exception {
-               String [] repres = {"real","fake","original"};
-               for (String r : repres){
-                       Keyword term = new Keyword(r);
-                       myStaticEnum.addTerm(term);                     
-               }
-       }
-
        @Before
        // generate enumeration for every test to play with
        public void onSetUp() throws Exception {

diff --git a/cdmlibrary/src/main/resources/applicationContext-test.xml b/cdmlibrary/src/test/resources/applicationContext-test.xml
similarity index 100%
rename from cdmlibrary/src/main/resources/applicationContext-test.xml
rename to cdmlibrary/src/test/resources/applicationContext-test.xml

diff --git a/cdmlibrary/zipManifest.txt b/cdmlibrary/zipManifest.txt
deleted file mode 100644 (file)
index 1758070..0000000
--- a/cdmlibrary/zipManifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0\r
-Class-Path: . 
\ No newline at end of file