fauna europaea import fix

diff --git a/app-import/build.xml b/app-import/build.xml
index a8f70176f07c568924d3f8a1cca6250f996c9b8a..24d2870b11727bc191ddab606d06477aad7b458d 100644 (file)
--- a/app-import/build.xml
+++ b/app-import/build.xml
@@ -6,6 +6,7 @@
     <property name="debuglevel" value="source,lines,vars"/>\r
     <property name="target" value="1.5"/>\r
     <property name="source" value="1.5"/>\r
+    <property name="agentlib-option" value="-agentlib:yjpagent"/>\r
 \r
     <path id="app-import.classpath">\r
         <pathelement location="target/classes"/>\r
@@ -129,13 +130,14 @@
     </target>\r
     <target name="DipteraActivator">\r
         <java classname="eu.etaxonomy.cdm.app.wp6.diptera.DipteraActivator" failonerror="true" fork="yes">\r
-            <jvmarg line="-Xmx1512M"/>\r
+            <jvmarg line="-Xmx1512M ${agentlib-option}"/>\r
             <classpath refid="app-import.classpath"/>\r
         </java>\r
     </target>\r
     <target name="FaunaEuropaeaActivator">\r
         <java classname="eu.etaxonomy.cdm.app.faunaEuropaea.FaunaEuropaeaActivator" failonerror="true" fork="yes">\r
-            <jvmarg line="-Xmx1600M"/>\r
+            <!-- <jvmarg line="-Xmx10000M -XX:+PrintGC ${agentlib-option}"/> -->\r
+           <jvmarg line="-Xmx1000M ${agentlib-option}"/>\r
             <classpath refid="app-import.classpath"/>\r
         </java>\r
     </target>\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaActivator.java
index cd02fe5ecf6ee8381d7e8c6f2d1875536302ae2b..9b07ed4068388ce6877cbc6eb02e63c66a465e88 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaActivator.java
@@ -31,7 +31,7 @@ public class FaunaEuropaeaActivator {
        static final Source faunaEuropaeaSource = FaunaEuropaeaSources.faunEu();\r
        static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_anahit();\r
        \r
-       static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;\r
+       static final CHECK check = CHECK.CHECK_AND_IMPORT;\r
 //     static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE;\r
 //     static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE;\r
        static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.UPDATE;\r

diff --git a/app-import/src/main/resources/log4j.properties b/app-import/src/main/resources/log4j.properties
index b58d7a95375aafc3152202d2937aac472df55747..b243c168fa13aaa3d521282b21fca571f86de017 100644 (file)
--- a/app-import/src/main/resources/log4j.properties
+++ b/app-import/src/main/resources/log4j.properties
@@ -36,6 +36,7 @@ log4j.logger.eu.etaxonomy.cdm.api.application.eclipse = warn
 log4j.logger.eu.etaxonomy.cdm.io.berlinModel = info\r
 log4j.logger.eu.etaxonomy.cdm.io.faunaEuropaea = info\r
 log4j.logger.eu.etaxonomy.cdm.io.tcsrdf = info\r
+log4j.logger.eu.etaxonomy.cdm.io.faunaEuropaea = info\r
 log4j.logger.eu.etaxonomy.cdm.persistence.dao.hibernate.common = info\r
 log4j.logger.eu.etaxonomy.cdm.io.taxonx.TaxonXImportConfigurator = error\r
 \r