From c618b4692d777a239bbf5e3788175b3f9acf0e02 Mon Sep 17 00:00:00 2001
From: Michael Dick <mikedd@apache.org>
Date: Tue, 16 Mar 2010 18:44:11 +0000
Subject: [PATCH] OPENJPA-1557: Use openjpa.Log to control build logging
 instead of openjpa.loglevel

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@923929 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-integration/daytrader/pom.xml             |  2 +-
 .../daytrader/src/main/ant/enhancer.xml           |  2 +-
 openjpa-integration/validation/pom.xml            |  4 ++--
 .../validation/src/main/ant/enhancer.xml          |  4 ++--
 openjpa-persistence-jdbc/pom.xml                  |  6 +++---
 .../src/main/ant/enhancer.xml                     |  8 ++++----
 openjpa-persistence-locking/pom.xml               |  6 +++---
 .../src/test/ant/enhancer.xml                     |  2 +-
 openjpa-slice/pom.xml                             |  4 ++--
 openjpa-slice/src/main/ant/enhancer.xml           | 15 ++++++++++-----
 pom.xml                                           |  1 +
 11 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml
index 89986a230..bbf43c840 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -192,7 +192,7 @@
                     <systemProperties>
                         <property>
                             <name>openjpa.Log</name>
-                            <value>DefaultLevel=${openjpa.loglevel}</value>
+                            <value>${openjpa.Log}</value>
                         </property>
                         <property>
                             <name>openjpa.DynamicEnhancementAgent</name>
diff --git a/openjpa-integration/daytrader/src/main/ant/enhancer.xml b/openjpa-integration/daytrader/src/main/ant/enhancer.xml
index cdb8390f0..d80d9bece 100644
--- a/openjpa-integration/daytrader/src/main/ant/enhancer.xml
+++ b/openjpa-integration/daytrader/src/main/ant/enhancer.xml
@@ -79,7 +79,7 @@
         <openjpac>
             <classpath refid="cp" />
             <fileset refid="enhance.path.ref" />
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}" />
         </openjpac>
     </target>
 </project>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 523ff97aa..c0a3ba3a4 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -257,7 +257,7 @@
                                     <property name="test" value="${test}" />
                                     <property name="outdir" value="${project.build.outputDirectory}" />
                                     <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
-                                    <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
+                                    <property name="openjpa.Log" value="${openjpa.Log}" />
                                     <property name="build.enhance" value="${build.enhance}" />
                                 </ant>
                             </tasks>
@@ -287,7 +287,7 @@
                     <systemProperties>
                         <property>
                             <name>openjpa.Log</name>
-                            <value>DefaultLevel=${openjpa.loglevel}</value>
+                            <value>${openjpa.Log}</value>
                         </property>
                         <property>
                             <name>openjpa.DynamicEnhancementAgent</name>
diff --git a/openjpa-integration/validation/src/main/ant/enhancer.xml b/openjpa-integration/validation/src/main/ant/enhancer.xml
index 718ecf9f3..0abe205e6 100644
--- a/openjpa-integration/validation/src/main/ant/enhancer.xml
+++ b/openjpa-integration/validation/src/main/ant/enhancer.xml
@@ -87,7 +87,7 @@
         <openjpac>
             <classpath refid="cp" />
             <fileset refid="enhance.path.ref" />
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}" />
         </openjpac>
         <openjpac>
         	<!-- enhance XML-defined pc's separately since they use their own mapping file -->
@@ -97,7 +97,7 @@
 				<include name="**/XMLBase.class"/>
 				<include name="**/XMLSuper.class"/>
             </fileset>
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}" />
         </openjpac>
     </target>
 </project>
diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index 349330a9b..6de612137 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -61,7 +61,7 @@
                     <systemProperties>
                         <property>
                             <name>openjpa.Log</name>
-                            <value>DefaultLevel=${openjpa.loglevel}</value>
+                            <value>${openjpa.Log}</value>
                         </property>
                         <property>
                             <name>openjpa.ConnectionDriverName</name>
@@ -734,7 +734,7 @@
                                     <property name="test" value="${test}" />
                                     <property name="outdir" value="${project.build.outputDirectory}" />
                                     <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
-                                    <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
+                                    <property name="openjpa.Log" value="${openjpa.Log}"/>
                                     <property name="build.enhance" value="${build.enhance}" />
                                 </ant>
                             </tasks>
@@ -970,7 +970,7 @@
                     <systemProperties>
                         <property>
                             <name>openjpa.Log</name>
-                            <value>DefaultLevel=${openjpa.loglevel}</value>
+                            <value>${openjpa.Log}</value>
                         </property>
                         <property>
                             <name>openjpa.DynamicEnhancementAgent</name>
diff --git a/openjpa-persistence-jdbc/src/main/ant/enhancer.xml b/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
index 789af6c1c..badba7efd 100644
--- a/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
+++ b/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
@@ -84,7 +84,7 @@
         <openjpac>
             <classpath refid="cp" />
             <fileset refid="enhance.path.ref" />
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}" />
         </openjpac>
         <!--  Set detach state for serialization tests -->
         <openjpac>
@@ -97,7 +97,7 @@
 				<exclude name="**/persistence/delimited/identifiers/xml/*.class"/>
                 <exclude name="**/Test*.class" />
             </fileset>
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}" />
         </openjpac>
 		<!-- Enhance with private persistent properties compatibility option -->
         <openjpac>
@@ -106,7 +106,7 @@
             <fileset dir="${project.build.testOutputDirectory}">
 				<include name="**/persistence/property/AccessModsEntity.class"/>
             </fileset>
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}" />
         </openjpac>
 		<!-- Enhance delimited identifiers XML-based entities separately -->
         <openjpac>
@@ -116,7 +116,7 @@
 				<include name="**/persistence/delimited/identifiers/xml/*.class"/>
 				<exclude name="**/persistence/delimited/identifiers/xml/Test*.class"/>
             </fileset>
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}"/>
         </openjpac>
     </target>
 </project>
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index 687aa9fc4..dfc572b54 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -71,7 +71,7 @@
                             <systemProperties>
                                 <property>
                                     <name>openjpa.Log</name>
-                                    <value>DefaultLevel=${openjpa.loglevel}</value>
+                                    <value>${openjpa.Log}</value>
                                 </property>
                                 <property>
                                     <name>openjpa.ConnectionDriverName</name>
@@ -729,7 +729,7 @@
                                     <property name="test" value="${test}" />
                                     <property name="outdir" value="${project.build.outputDirectory}" />
                                     <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
-                                    <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
+                                    <property name="openjpa.Log" value="${openjpa.Log}" />
                                     <property name="build.enhance" value="${build.enhance}" />
                                 </ant>
                             </tasks>
@@ -768,7 +768,7 @@
                     <systemProperties>
                         <property>
                             <name>openjpa.Log</name>
-                            <value>DefaultLevel=${openjpa.loglevel}</value>
+                            <value>${openjpa.Log}</value>
                         </property>
                         <property>
                             <name>openjpa.DynamicEnhancementAgent</name>
diff --git a/openjpa-persistence-locking/src/test/ant/enhancer.xml b/openjpa-persistence-locking/src/test/ant/enhancer.xml
index 556093b56..56593d11f 100644
--- a/openjpa-persistence-locking/src/test/ant/enhancer.xml
+++ b/openjpa-persistence-locking/src/test/ant/enhancer.xml
@@ -70,7 +70,7 @@
         <openjpac>
             <classpath refid="cp" />
             <fileset refid="enhance.path.ref" />
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}" />
         </openjpac>
     </target>
 </project>
diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml
index df22a2e91..2eaf456c5 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -116,7 +116,7 @@
                                     <property name="test" value="${test}" />
                                     <property name="outdir" value="${project.build.outputDirectory}" />
                                     <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
-                                    <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
+                                    <property name="openjpa.Log" value="${openjpa.Log}"/>
                                 </ant>
                             </tasks>
                         </configuration>
@@ -147,7 +147,7 @@
                     <systemProperties>
                         <property>
                             <name>openjpa.Log</name>
-                            <value>DefaultLevel=${openjpa.loglevel}</value>
+                            <value>${openjpa.Log}</value>
                         </property>
                         <property>
                             <name>derby.stream.error.file</name>
diff --git a/openjpa-slice/src/main/ant/enhancer.xml b/openjpa-slice/src/main/ant/enhancer.xml
index 06fddf0be..235f82086 100644
--- a/openjpa-slice/src/main/ant/enhancer.xml
+++ b/openjpa-slice/src/main/ant/enhancer.xml
@@ -24,15 +24,20 @@
         processing easier.
         
         Test classes will not be compiled if maven is invoked with 
-        -Dmaven.tests.skip=true. 
+        -Dmaven.test.skip=true. 
     -->
 
     <condition property="maven.test.skip.istrue">
         <istrue value="${maven.test.skip}" />
     </condition>
 
-    <condition property="test.isfalse">
+	<condition property="skip.enhance">
+		<or>
         <equals arg1="${test}" arg2="false" />
+			<equals arg1="${build.enhance}" arg2="false" />
+			<istrue value="${maven.test.skip}" />
+			<istrue value="${skipTests}" />
+        </or>
     </condition>
 
     <!-- ================================= 
@@ -40,7 +45,7 @@
          ================================= -->
     <target name="enhance"
             description="--> run the enhancer unless test=false"
-            unless="test.isfalse">
+            unless="skip.enhance">
         <antcall target="enhance.all.entities"
                  inheritall="true"
                  inheritrefs="true" />
@@ -51,7 +56,7 @@
          ================================= -->
     <target name="enhance.all.entities"
             description="--> enhance the test entities"
-            unless="maven.test.skip.istrue">
+            unless="skip.enhance">
         <echo> running enhancer</echo>
         <!-- 
             Inherited references won't be present until the task is called. 
@@ -74,7 +79,7 @@
         <openjpac>
             <classpath refid="cp" />
             <fileset refid="enhance.path.ref" />
-            <config log="DefaultLevel=${openjpa.loglevel}" />
+            <config log="${openjpa.Log}" />
         </openjpac>
     </target>
 </project>
diff --git a/pom.xml b/pom.xml
index a80a300fa..ac127b516 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
     <properties>
         <openjpa.version>${pom.version}</openjpa.version>
         <openjpa.loglevel>INFO</openjpa.loglevel>
+        <openjpa.Log>DefaultLevel=INFO</openjpa.Log>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
         <!-- the test settings can be overridden my specific profiles -->