CSPACE-6375: Hunting down problem with ehache when running ant import

diff --git a/services/account/client/src/test/resources/META-INF/persistence.xml b/services/account/client/src/test/resources/META-INF/persistence.xml
index 45d80c610b34d5589677cd437fd6abaa0a27fee0..875a72f9a7a4f694b80108067f28828ac2763481 100644 (file)
--- a/services/account/client/src/test/resources/META-INF/persistence.xml
+++ b/services/account/client/src/test/resources/META-INF/persistence.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-       http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" 
-       xmlns="http://java.sun.com/xml/ns/persistence" 
-       xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<persistence-unit name="org.collectionspace.services.account">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+             http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <persistence-unit name="org.collectionspace.services.account">
         <class>org.collectionspace.services.account.AccountsCommon</class>
         <class>org.collectionspace.services.account.AccountsCommonList</class>
         <class>org.collectionspace.services.account.AccountListItem</class>

diff --git a/services/authorization-mgt/import/src/main/resources/log4j.properties b/services/authorization-mgt/import/src/main/resources/log4j.properties
index b5f601bdf1fd4e34623bf74cbbfb6fc7bcb9730c..73353f981bda93955adc22974b81538a6205731d 100644 (file)
--- a/services/authorization-mgt/import/src/main/resources/log4j.properties
+++ b/services/authorization-mgt/import/src/main/resources/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger=debug, stdout, R
+log4j.rootLogger=INFO, stdout, R
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -31,9 +31,15 @@ log4j.logger.ch.elca.el4j.services.xmlmerge=INFO
 log4j.logger.com.sun.xml.bind.v2.runtime=DEBUG
 log4j.logger.javax.persistence.PersistenceException=ERROR
 
+#
+# REM - 3/3/2015 temp for debugging
+#
+log4j.logger.org.springframework=TRACE
+log4j.logger.net.sf.ehcache=TRACE
+
 #
 # Logging for the command line tool that generates the Service artifacts
 #
-log4j.logger.org.collectionspace=INFO, commandline
-log4j.additivity.org.collectionspace=false
+#log4j.logger.org.collectionspace=INFO, commandline
+#log4j.additivity.org.collectionspace=false