From 7e6ad27e07f58b3ce8875c53da89ee4e63cb8ecd Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 21 May 2017 17:39:07 +0200
Subject: Centralizing openjpa log config

---
 archiva-modules/archiva-web/archiva-webapp/pom.xml                      | 1 +
 .../archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'archiva-modules/archiva-web/archiva-webapp')

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 9dc3eb80c..6d101a4a5 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -977,6 +977,7 @@
             <org.apache.sirona.configuration.sirona.properties>${archiva.sirona.configuration}</org.apache.sirona.configuration.sirona.properties>
             <AsyncLoggerConfig.WaitStrategy>Block</AsyncLoggerConfig.WaitStrategy>
             <AsyncLogger.WaitStrategy>Block</AsyncLogger.WaitStrategy>
+            <openjpa.Log>${openjpa.Log}</openjpa.Log>
           </systemProperties>
           <additionalClasspathDirs>
             <additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 49f0301db..d6edfc856 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -306,7 +306,7 @@
         <entry key="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)" />
         <entry key="openjpa.jdbc.MappingDefaults"
                   value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/>
-        <entry key="openjpa.Log" value="DefaultLevel=TRACE, Runtime=TRACE, Tool=INFO, SQL=TRACE"/>
+        <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" />
         <entry key="openjpa.jdbc.DBDictionary" value="(disableSchemaFactoryColumnTypeErrors=true,BitTypeName=CHAR(1),BooleanTypeName=CHAR(1),BooleanRepresentation=STRING_YN)"/>
       </map>
     </property>
-- 
cgit v1.2.3