bugfix for transaction in ExtensionMapper and adapting Proxy narrorwing logging,...

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
index 59c852f25361ff624e952eb545ebb1264d591605..6ae830eb45c1888d06c68d3b1ee2df79c2779b77 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
@@ -193,8 +193,8 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
                        //set vocabulary //TODO allow user defined vocabularies\r
                        UUID uuidExtensionTypeVocabulary = UUID.fromString("117cc307-5bd4-4b10-9b2f-2e14051b3b20");\r
                        IVocabularyService vocService = currentImport.getVocabularyService();\r
-                       TermVocabulary voc = vocService.find(uuidExtensionTypeVocabulary);\r
                        TransactionStatus tx = currentImport.startTransaction();\r
+                       TermVocabulary<ExtensionType> voc = vocService.find(uuidExtensionTypeVocabulary);\r
                        currentImport.getVocabularyService().saveOrUpdate(voc);\r
                        if (voc != null){\r
                                voc.addTerm(extensionType);\r

diff --git a/cdmlib-remote-webapp/src/main/resources/log4j.properties b/cdmlib-remote-webapp/src/main/resources/log4j.properties
index bc10f9d59624839c628bb274f93192cffc43f94f..94980efc01d4c8f456256be7388f97d6fe9f5606 100644 (file)
--- a/cdmlib-remote-webapp/src/main/resources/log4j.properties
+++ b/cdmlib-remote-webapp/src/main/resources/log4j.properties
@@ -60,7 +60,7 @@ log4j.logger.org.hibernate.type=WARN
 #     log schema export/update\r
 log4j.logger.org.hibernate.tool.hbm2ddl=WARN\r
 # This overcomes the proxy narrow log of hibernate\r
-log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=ERROR\r
+log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR\r
 \r
 ### log transaction binding\r
 #log4j.logger.org.hibernate.transaction=debug\r

diff --git a/cdmlib-remote-webapp/src/test/resources/log4j.properties b/cdmlib-remote-webapp/src/test/resources/log4j.properties
index 7f7dda674fb1b2dcbc443c81f8ccb0c83512f6d9..1e2a70367ace20fe86242d94eeb6d499122e8004 100644 (file)
--- a/cdmlib-remote-webapp/src/test/resources/log4j.properties
+++ b/cdmlib-remote-webapp/src/test/resources/log4j.properties
@@ -62,6 +62,6 @@ log4j.logger.org.hibernate.type = WARN
 #     log schema export/update\r
 log4j.logger.org.hibernate.tool.hbm2ddl = WARN\r
 # This overcomes the proxy narrow log of hibernate\r
-log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog = ERROR\r
+log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR\r
 \r
 log4j.logger.com.mchange.v2.c3p0 = WARN\r

diff --git a/cdmlib-remote/src/main/resources/log4j.properties b/cdmlib-remote/src/main/resources/log4j.properties
index 9bc089343cce7a4c4561bf6a947757bab8ef4f3f..273e037b6933c172d3cdf7006b939bbd7ccb029a 100644 (file)
--- a/cdmlib-remote/src/main/resources/log4j.properties
+++ b/cdmlib-remote/src/main/resources/log4j.properties
@@ -61,5 +61,5 @@ log4j.logger.org.hibernate.type=WARN
 #     log schema export/update\r
 log4j.logger.org.hibernate.tool.hbm2ddl=WARN\r
 # This overcomes the proxy narrow log of hibernate\r
-log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=ERROR\r
+log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR\r
 \r

diff --git a/cdmlib-remote/src/test/resources/log4j.properties b/cdmlib-remote/src/test/resources/log4j.properties
index 81c3361ebba9d65dcb874c832bacf4527041dc57..de116125c817aedbaaedf13418d5e3ae27cc5d22 100644 (file)
--- a/cdmlib-remote/src/test/resources/log4j.properties
+++ b/cdmlib-remote/src/test/resources/log4j.properties
@@ -61,6 +61,6 @@ log4j.logger.org.hibernate.type=WARN
 #     log schema export/update\r
 log4j.logger.org.hibernate.tool.hbm2ddl=WARN\r
 # This overcomes the proxy narrow log of hibernate\r
-log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=ERROR\r
+log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR\r
 \r
 log4j.logger.com.mchange.v2.c3p0=WARN\r

diff --git a/pom.xml b/pom.xml
index 80cf5f9e66f9db42316277d1c25dfe9cce8273d3..4dc0c112e19b6ddf2cf9644d4c624fea6cf21e21 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -28,9 +28,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <unitils.version>3.3</unitils.version>
         <lucene.version>3.6.2</lucene.version>
-        <!-- OLD: <lucene.version>2.9.4</lucene.version> --><!-- lucene.version in hibernate-search 3.4.0-SNAPSHOT is 2.4.0-->
-        
-        
         <hsqldb.version>1.8.0.10</hsqldb.version><!-- 1.8.0.10, 1.9.0-rc6 (manualy build only for debugging) -->
                <httpcomponents.version>4.2.3</httpcomponents.version>
     </properties>
@@ -819,7 +816,7 @@
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.15</version>
+        <version>1.2.17</version>
       </dependency>
             <dependency>
                 <groupId>javax.annotation</groupId>

diff --git a/src/site/fml/troubleshooting.fml b/src/site/fml/troubleshooting.fml
index 58034d8b0043fd9880c6c412a0af697a49128911..35b309a2a6b9f705ad52d99079a7eccad94ad644 100644 (file)
--- a/src/site/fml/troubleshooting.fml
+++ b/src/site/fml/troubleshooting.fml
@@ -1,31 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd" title="Troubleshooting" toplink="false">
-       <part id="eclipse">
-               <title>Eclipse</title>
-               <faq id="">
-                       <question>"The method getTextContent() is undefined for the type Node" in cdmlib-io and/or cdmlib-model.</question>
-                       <answer><p>This problem is due to some inconsistency between the <em>JRE System Library</em> and JAXB artifacts that got loaded by maven. In order to solve this you have to open the <em>Preferences</em> dialog for the respective project and open the <em>Java Build Path</em> section. In this section choose <em>Order and Export</em>. Locate <em>JRE System Library</em> and use the buttons on the right to move it up in the list, so it it is located directly beneath the projects source folders. Repeat this for all cdmlib projects where the error occurs.</p><p>You will definitely have to go through this procedure everytime you called <code>mvn eclipse:eclipse</code> as it will regenerate the .project file.</p></answer>
-               </faq>
-       </part>
-       
-       <part id="maven">
-               <title>Maven</title>
-               <faq id="generic-errors">
-                       <question>Why do I get "... is not within its bound" errors when running maven install?</question>
-                       <answer>
-                               <p>For (unfortunately still) unclear reasons we encountered problems using generics.
-               We did not yet resolve this problem but at least found out that this problem does not occur when building with eclipse. 
-               So all you have to do is make sure your projects got compiled by eclipse. In order to do that you have to open the eclipse clean dialog by executing "Projects -> Clean...". In the resulting dialog either select all cdmlib projects or simply check the "Clean all projects" radiobutton. Eclipse will then clean the build directries and execute a new build. <strong>We are working on this and it should be removed in the very near future.</strong></p>
-                       </answer>
-               </faq>
-       </part>
        
        <part id="log4j">
                <title>Log4J</title>
                <faq id="proxyWarnLog_breaks">
                        <question>My logfile is full with "ProxyWarnLog ... breaks ...".</question>
                        <answer>
-                               <p>Please add <code>log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog = error</code> to your log4j.properties file.</p>
+                               <p>Please add <code>log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext = error</code> to your log4j.properties file.</p>
                        </answer>
                </faq>
        </part>