(no commit message)

diff --git a/cdmlibrary/src/main/resources/applicationContext.xml b/cdmlibrary/src/main/resources/applicationContext.xml
index 87435b93c2da1086f95dd92ac95fbc8b0e8ead37..2368f6821164f50d67f7a0f96cfafc04e2bf9a05 100644 (file)
--- a/cdmlibrary/src/main/resources/applicationContext.xml
+++ b/cdmlibrary/src/main/resources/applicationContext.xml
@@ -6,7 +6,7 @@
     http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
     http://www.springframework.org/schema/context
     http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-        
+    \r
     <import resource="sessionfactory.xml"/>
     <import resource="cdm.datasource.xml"/>\r
 </beans>

diff --git a/cdmlibrary/src/main/resources/log4j.properties b/cdmlibrary/src/main/resources/log4j.properties
index 983ce666a4c0e0a4da9a41b0125494c448443c0c..08442abd0b58837ed7d0bcc7a49b98b126e4531e 100644 (file)
--- a/cdmlibrary/src/main/resources/log4j.properties
+++ b/cdmlibrary/src/main/resources/log4j.properties
@@ -22,6 +22,7 @@ log4j.rootLogger=info, stdout
        ### *** CDM *** ###
 
 log4j.logger.eu.etaxonomy.cdm = debug 
+log4j.logger.eu.etaxonomy.cdm.database.init = info
 
 
        ### *** SPRING ************ ###

diff --git a/cdmlibrary/src/main/resources/terms/NameRelationshipType.csv b/cdmlibrary/src/main/resources/terms/NameRelationshipType.csv
index 141b38be14674a1688ac196b57171e5bbdfd9988..854846bf36e50278aa6ee6d405ec27ae63ab1783 100644 (file)
--- a/cdmlibrary/src/main/resources/terms/NameRelationshipType.csv
+++ b/cdmlibrary/src/main/resources/terms/NameRelationshipType.csv
@@ -1,10 +1,10 @@
-"eeaea868-c4c1-497f-b9fe-52c9fc4aca53",,"Orthographic Variant",,"Orthographic Variant",,"true","true"
-"80f06f65-58e0-4209-b811-cb40ad7220a6",,"Later Homonym",,"Ealier Homonym",,"false","true"
-"2990a884-3302-4c8b-90b2-dfd31aaa2778",,"Treated As Later Homonym",,"Treated As Earlier Homonym",,"false","false"
-"049c6358-1094-4765-9fae-c9972a0e7780",,"Alternative Name",,"Alternative Name",,"true","true"
-"25792738-98de-4762-bac1-8c156faded4a",,"Basionym",,"New Combination",,"false","false"
-"71c67c38-d162-445b-b0c2-7aba56106696",,"Replaced Synonym",,"New Name",,"false","false"
-"e6439f95-bcac-4ebb-a8b5-69fa5ce79e6a",,"Conserved against",,"Rejected in favour",,"false","false"
-"a176c9ad-b4c2-4c57-addd-90373f8270eb",,"Validated by Name",,"Validating Name",,"false","false"
-"a25ee4c1-863a-4dab-9499-290bf9b89639",,"Later Validated by Name",,"Later Validating Name",,"false","false"
-,,"Blocking Name for",,"New Combination blocked by",,"false","false"
\ No newline at end of file
+"eeaea868-c4c1-497f-b9fe-52c9fc4aca53",,""Orthographic Variant"",,""Orthographic Variant"",,""true"",""true""\r
+"80f06f65-58e0-4209-b811-cb40ad7220a6",,""Later Homonym"",,""Ealier Homonym"",,""false"",""true""\r
+"2990a884-3302-4c8b-90b2-dfd31aaa2778",,""Treated As Later Homonym"",,""Treated As Earlier Homonym"",,""false"",""false""\r
+"049c6358-1094-4765-9fae-c9972a0e7780",,""Alternative Name"",,""Alternative Name"",,""true"",""true""\r
+"25792738-98de-4762-bac1-8c156faded4a",,""Basionym"",,""New Combination"",,""false"",""false""\r
+"71c67c38-d162-445b-b0c2-7aba56106696",,""Replaced Synonym"",,""New Name"",,""false"",""false""\r
+"e6439f95-bcac-4ebb-a8b5-69fa5ce79e6a",,""Conserved against"",,""Rejected in favour"",,""false"",""false""\r
+"a176c9ad-b4c2-4c57-addd-90373f8270eb",,""Validated by Name"",,""Validating Name"",,""false"",""false""\r
+"a25ee4c1-863a-4dab-9499-290bf9b89639",,""Later Validated by Name"",,""Later Validating Name"",,""false"",""false""\r
+"1dab357f-2e12-4511-97a4-e5153589e6a6",,""Blocking Name for"",,""New Combination blocked by"",,""false"",""false""
\ No newline at end of file