Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Michael Dick 2010-03-16 18:44:11 +00:00
parent 992ba73a71
commit c618b4692d
11 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-integration/daytrader/pom.xml
View File

@ -192,7 +192,7 @@
<systemProperties> <systemProperties>
<property> <property>
<name>openjpa.Log</name> <name>openjpa.Log</name>
<value>DefaultLevel=${openjpa.loglevel}</value> <value>${openjpa.Log}</value>
</property> </property>
<property> <property>
<name>openjpa.DynamicEnhancementAgent</name> <name>openjpa.DynamicEnhancementAgent</name>

2
openjpa-integration/daytrader/src/main/ant/enhancer.xml
View File

@ -79,7 +79,7 @@
<openjpac> <openjpac>
<classpath refid="cp" /> <classpath refid="cp" />
<fileset refid="enhance.path.ref" /> <fileset refid="enhance.path.ref" />
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}" />
</openjpac> </openjpac>
</target> </target>
</project> </project>

4
openjpa-integration/validation/pom.xml
View File

@ -257,7 +257,7 @@
<property name="test" value="${test}" /> <property name="test" value="${test}" />
<property name="outdir" value="${project.build.outputDirectory}" /> <property name="outdir" value="${project.build.outputDirectory}" />
<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" /> <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}" /> <property name="build.enhance" value="${build.enhance}" />
</ant> </ant>
</tasks> </tasks>
@ -287,7 +287,7 @@
<systemProperties> <systemProperties>
<property> <property>
<name>openjpa.Log</name> <name>openjpa.Log</name>
<value>DefaultLevel=${openjpa.loglevel}</value> <value>${openjpa.Log}</value>
</property> </property>
<property> <property>
<name>openjpa.DynamicEnhancementAgent</name> <name>openjpa.DynamicEnhancementAgent</name>

4
openjpa-integration/validation/src/main/ant/enhancer.xml
View File

@ -87,7 +87,7 @@
<openjpac> <openjpac>
<classpath refid="cp" /> <classpath refid="cp" />
<fileset refid="enhance.path.ref" /> <fileset refid="enhance.path.ref" />
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}" />
</openjpac> </openjpac>
<openjpac> <openjpac>
<!-- enhance XML-defined pc's separately since they use their own mapping file --> <!-- enhance XML-defined pc's separately since they use their own mapping file -->
@ -97,7 +97,7 @@
<include name="**/XMLBase.class"/> <include name="**/XMLBase.class"/>
<include name="**/XMLSuper.class"/> <include name="**/XMLSuper.class"/>
</fileset> </fileset>
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}" />
</openjpac> </openjpac>
</target> </target>
</project> </project>

6
openjpa-persistence-jdbc/pom.xml
View File

@ -61,7 +61,7 @@
<systemProperties> <systemProperties>
<property> <property>
<name>openjpa.Log</name> <name>openjpa.Log</name>
<value>DefaultLevel=${openjpa.loglevel}</value> <value>${openjpa.Log}</value>
</property> </property>
<property> <property>
<name>openjpa.ConnectionDriverName</name> <name>openjpa.ConnectionDriverName</name>
@ -734,7 +734,7 @@
<property name="test" value="${test}" /> <property name="test" value="${test}" />
<property name="outdir" value="${project.build.outputDirectory}" /> <property name="outdir" value="${project.build.outputDirectory}" />
<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" /> <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}" /> <property name="build.enhance" value="${build.enhance}" />
</ant> </ant>
</tasks> </tasks>
@ -970,7 +970,7 @@
<systemProperties> <systemProperties>
<property> <property>
<name>openjpa.Log</name> <name>openjpa.Log</name>
<value>DefaultLevel=${openjpa.loglevel}</value> <value>${openjpa.Log}</value>
</property> </property>
<property> <property>
<name>openjpa.DynamicEnhancementAgent</name> <name>openjpa.DynamicEnhancementAgent</name>

8
openjpa-persistence-jdbc/src/main/ant/enhancer.xml
View File

@ -84,7 +84,7 @@
<openjpac> <openjpac>
<classpath refid="cp" /> <classpath refid="cp" />
<fileset refid="enhance.path.ref" /> <fileset refid="enhance.path.ref" />
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}" />
</openjpac> </openjpac>
<!-- Set detach state for serialization tests --> <!-- Set detach state for serialization tests -->
<openjpac> <openjpac>
@ -97,7 +97,7 @@
<exclude name="**/persistence/delimited/identifiers/xml/*.class"/> <exclude name="**/persistence/delimited/identifiers/xml/*.class"/>
<exclude name="**/Test*.class" /> <exclude name="**/Test*.class" />
</fileset> </fileset>
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}" />
</openjpac> </openjpac>
<!-- Enhance with private persistent properties compatibility option --> <!-- Enhance with private persistent properties compatibility option -->
<openjpac> <openjpac>
@ -106,7 +106,7 @@
<fileset dir="${project.build.testOutputDirectory}"> <fileset dir="${project.build.testOutputDirectory}">
<include name="**/persistence/property/AccessModsEntity.class"/> <include name="**/persistence/property/AccessModsEntity.class"/>
</fileset> </fileset>
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}" />
</openjpac> </openjpac>
<!-- Enhance delimited identifiers XML-based entities separately --> <!-- Enhance delimited identifiers XML-based entities separately -->
<openjpac> <openjpac>
@ -116,7 +116,7 @@
<include name="**/persistence/delimited/identifiers/xml/*.class"/> <include name="**/persistence/delimited/identifiers/xml/*.class"/>
<exclude name="**/persistence/delimited/identifiers/xml/Test*.class"/> <exclude name="**/persistence/delimited/identifiers/xml/Test*.class"/>
</fileset> </fileset>
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}"/>
</openjpac> </openjpac>
</target> </target>
</project> </project>

6
openjpa-persistence-locking/pom.xml
View File

@ -71,7 +71,7 @@
<systemProperties> <systemProperties>
<property> <property>
<name>openjpa.Log</name> <name>openjpa.Log</name>
<value>DefaultLevel=${openjpa.loglevel}</value> <value>${openjpa.Log}</value>
</property> </property>
<property> <property>
<name>openjpa.ConnectionDriverName</name> <name>openjpa.ConnectionDriverName</name>
@ -729,7 +729,7 @@
<property name="test" value="${test}" /> <property name="test" value="${test}" />
<property name="outdir" value="${project.build.outputDirectory}" /> <property name="outdir" value="${project.build.outputDirectory}" />
<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" /> <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}" /> <property name="build.enhance" value="${build.enhance}" />
</ant> </ant>
</tasks> </tasks>
@ -768,7 +768,7 @@
<systemProperties> <systemProperties>
<property> <property>
<name>openjpa.Log</name> <name>openjpa.Log</name>
<value>DefaultLevel=${openjpa.loglevel}</value> <value>${openjpa.Log}</value>
</property> </property>
<property> <property>
<name>openjpa.DynamicEnhancementAgent</name> <name>openjpa.DynamicEnhancementAgent</name>

2
openjpa-persistence-locking/src/test/ant/enhancer.xml
View File

@ -70,7 +70,7 @@
<openjpac> <openjpac>
<classpath refid="cp" /> <classpath refid="cp" />
<fileset refid="enhance.path.ref" /> <fileset refid="enhance.path.ref" />
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}" />
</openjpac> </openjpac>
</target> </target>
</project> </project>

4
openjpa-slice/pom.xml
View File

@ -116,7 +116,7 @@
<property name="test" value="${test}" /> <property name="test" value="${test}" />
<property name="outdir" value="${project.build.outputDirectory}" /> <property name="outdir" value="${project.build.outputDirectory}" />
<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" /> <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
<property name="openjpa.loglevel" value="${openjpa.loglevel}" /> <property name="openjpa.Log" value="${openjpa.Log}"/>
</ant> </ant>
</tasks> </tasks>
</configuration> </configuration>
@ -147,7 +147,7 @@
<systemProperties> <systemProperties>
<property> <property>
<name>openjpa.Log</name> <name>openjpa.Log</name>
<value>DefaultLevel=${openjpa.loglevel}</value> <value>${openjpa.Log}</value>
</property> </property>
<property> <property>
<name>derby.stream.error.file</name> <name>derby.stream.error.file</name>

15
openjpa-slice/src/main/ant/enhancer.xml
View File

@ -24,15 +24,20 @@
processing easier. processing easier.
Test classes will not be compiled if maven is invoked with 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"> <condition property="maven.test.skip.istrue">
<istrue value="${maven.test.skip}" /> <istrue value="${maven.test.skip}" />
</condition> </condition>
<condition property="test.isfalse"> <condition property="skip.enhance">
<or>
<equals arg1="${test}" arg2="false" /> <equals arg1="${test}" arg2="false" />
<equals arg1="${build.enhance}" arg2="false" />
<istrue value="${maven.test.skip}" />
<istrue value="${skipTests}" />
</or>
</condition> </condition>
<!-- ================================= <!-- =================================
@ -40,7 +45,7 @@
================================= --> ================================= -->
<target name="enhance" <target name="enhance"
description="--> run the enhancer unless test=false" description="--> run the enhancer unless test=false"
unless="test.isfalse"> unless="skip.enhance">
<antcall target="enhance.all.entities" <antcall target="enhance.all.entities"
inheritall="true" inheritall="true"
inheritrefs="true" /> inheritrefs="true" />
@ -51,7 +56,7 @@
================================= --> ================================= -->
<target name="enhance.all.entities" <target name="enhance.all.entities"
description="--> enhance the test entities" description="--> enhance the test entities"
unless="maven.test.skip.istrue"> unless="skip.enhance">
<echo> running enhancer</echo> <echo> running enhancer</echo>
<!-- <!--
Inherited references won't be present until the task is called. Inherited references won't be present until the task is called.
@ -74,7 +79,7 @@
<openjpac> <openjpac>
<classpath refid="cp" /> <classpath refid="cp" />
<fileset refid="enhance.path.ref" /> <fileset refid="enhance.path.ref" />
<config log="DefaultLevel=${openjpa.loglevel}" /> <config log="${openjpa.Log}" />
</openjpac> </openjpac>
</target> </target>
</project> </project>

1
pom.xml
View File

@ -43,6 +43,7 @@
<properties> <properties>
<openjpa.version>${pom.version}</openjpa.version> <openjpa.version>${pom.version}</openjpa.version>
<openjpa.loglevel>INFO</openjpa.loglevel> <openjpa.loglevel>INFO</openjpa.loglevel>
<openjpa.Log>DefaultLevel=INFO</openjpa.Log>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location> <checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
<!-- the test settings can be overridden my specific profiles --> <!-- the test settings can be overridden my specific profiles -->