Author: dwoods
Date: Tue Mar 23 18:18:37 2010
New Revision: 926702
URL: http://svn.apache.org/viewvc?rev=926702&view=rev
Log:
OPENJPA-1557 fix passing of openjpa.Log to enhancer.xml scripts
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
openjpa/branches/1.3.x/openjpa-slice/pom.xml
openjpa/branches/1.3.x/openjpa-slice/src/main/ant/enhancer.xml
openjpa/branches/1.3.x/pom.xml
Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml?rev=926702&r1=926701&r2=926702&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Tue Mar 23 18:18:37
2010
@@ -60,6 +60,10 @@
</includes>
<systemProperties>
<property>
+ <name>openjpa.Log</name>
+ <value>${openjpa.Log}</value>
+ </property>
+ <property>
<name>openjpa.ConnectionDriverName</name>
<value>org.apache.commons.dbcp.BasicDataSource</value>
</property>
@@ -705,6 +709,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.Log"
value="${openjpa.Log}" />
<property name="build.enhance"
value="${build.enhance}" />
</ant>
</tasks>
@@ -922,6 +927,10 @@
</excludes>
<systemProperties>
<property>
+ <name>openjpa.Log</name>
+ <value>${openjpa.Log}</value>
+ </property>>
+ <property>
<name>openjpa.ConnectionDriverName</name>
<value>org.apache.commons.dbcp.BasicDataSource</value>
</property>
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml?rev=926702&r1=926701&r2=926702&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
(original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/main/ant/enhancer.xml
Tue Mar 23 18:18:37 2010
@@ -79,7 +79,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>
@@ -91,8 +91,8 @@
<include name="**/xml/*.class" />
<exclude name="**/Test*.class" />
</fileset>
- <config log="DefaultLevel=${openjpa.loglevel}" />
+ <config log="${openjpa.Log}" />
</openjpac>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: openjpa/branches/1.3.x/openjpa-slice/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-slice/pom.xml?rev=926702&r1=926701&r2=926702&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-slice/pom.xml Tue Mar 23 18:18:37 2010
@@ -128,6 +128,7 @@
</profile>
</profiles>
+
<build>
<plugins>
<plugin>
@@ -143,6 +144,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.Log"
value="${openjpa.Log}" />
</ant>
</tasks>
</configuration>
@@ -160,6 +162,10 @@
<argLine>${test.jvm.arguments}</argLine>
<systemProperties>
<property>
+ <name>openjpa.Log</name>
+ <value>${openjpa.Log}</value>
+ </property>
+ <property>
<name>derby.stream.error.file</name>
<value>target/derby.log</value>
</property>
Modified: openjpa/branches/1.3.x/openjpa-slice/src/main/ant/enhancer.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-slice/src/main/ant/enhancer.xml?rev=926702&r1=926701&r2=926702&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-slice/src/main/ant/enhancer.xml (original)
+++ openjpa/branches/1.3.x/openjpa-slice/src/main/ant/enhancer.xml Tue Mar 23
18:18:37 2010
@@ -76,7 +76,7 @@
<openjpac>
<classpath refid="cp" />
<fileset refid="enhance.path.ref" />
- <config log="DefaultLevel=${openjpa.loglevel}" />
+ <config log="${openjpa.Log}" />
</openjpac>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: openjpa/branches/1.3.x/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/pom.xml?rev=926702&r1=926701&r2=926702&view=diff
==============================================================================
--- openjpa/branches/1.3.x/pom.xml (original)
+++ openjpa/branches/1.3.x/pom.xml Tue Mar 23 18:18:37 2010
@@ -43,7 +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 -->
@@ -891,6 +891,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
<configuration>
<configLocation>${checkstyle.config.location}</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
