openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r923929 - in /openjpa/trunk: ./ openjpa-integration/daytrader/ openjpa-integration/daytrader/src/main/ant/ openjpa-integration/validation/ openjpa-integration/validation/src/main/ant/ openjpa-persistence-jdbc/ openjpa-persistence-jdbc/src/m...
Date Tue, 16 Mar 2010 18:44:11 GMT
Author: mikedd
Date: Tue Mar 16 18:44:11 2010
New Revision: 923929

URL: http://svn.apache.org/viewvc?rev=923929&view=rev
Log:
OPENJPA-1557: 
Use openjpa.Log to control build logging instead of openjpa.loglevel

Modified:
    openjpa/trunk/openjpa-integration/daytrader/pom.xml
    openjpa/trunk/openjpa-integration/daytrader/src/main/ant/enhancer.xml
    openjpa/trunk/openjpa-integration/validation/pom.xml
    openjpa/trunk/openjpa-integration/validation/src/main/ant/enhancer.xml
    openjpa/trunk/openjpa-persistence-jdbc/pom.xml
    openjpa/trunk/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
    openjpa/trunk/openjpa-persistence-locking/pom.xml
    openjpa/trunk/openjpa-persistence-locking/src/test/ant/enhancer.xml
    openjpa/trunk/openjpa-slice/pom.xml
    openjpa/trunk/openjpa-slice/src/main/ant/enhancer.xml
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-integration/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/daytrader/pom.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/daytrader/pom.xml Tue Mar 16 18:44:11 2010
@@ -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>

Modified: openjpa/trunk/openjpa-integration/daytrader/src/main/ant/enhancer.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/daytrader/src/main/ant/enhancer.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/daytrader/src/main/ant/enhancer.xml (original)
+++ openjpa/trunk/openjpa-integration/daytrader/src/main/ant/enhancer.xml Tue Mar 16 18:44:11
2010
@@ -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>

Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Tue Mar 16 18:44:11 2010
@@ -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>

Modified: openjpa/trunk/openjpa-integration/validation/src/main/ant/enhancer.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/main/ant/enhancer.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/src/main/ant/enhancer.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/src/main/ant/enhancer.xml Tue Mar 16 18:44:11
2010
@@ -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>

Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Tue Mar 16 18:44:11 2010
@@ -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>

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/ant/enhancer.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/ant/enhancer.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/ant/enhancer.xml Tue Mar 16 18:44:11 2010
@@ -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>

Modified: openjpa/trunk/openjpa-persistence-locking/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/pom.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-locking/pom.xml Tue Mar 16 18:44:11 2010
@@ -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>

Modified: openjpa/trunk/openjpa-persistence-locking/src/test/ant/enhancer.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/ant/enhancer.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/src/test/ant/enhancer.xml (original)
+++ openjpa/trunk/openjpa-persistence-locking/src/test/ant/enhancer.xml Tue Mar 16 18:44:11
2010
@@ -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>

Modified: openjpa/trunk/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Tue Mar 16 18:44:11 2010
@@ -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>

Modified: openjpa/trunk/openjpa-slice/src/main/ant/enhancer.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/src/main/ant/enhancer.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/src/main/ant/enhancer.xml (original)
+++ openjpa/trunk/openjpa-slice/src/main/ant/enhancer.xml Tue Mar 16 18:44:11 2010
@@ -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>

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=923929&r1=923928&r2=923929&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Tue Mar 16 18:44:11 2010
@@ -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 -->



Mime
View raw message