You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/06/29 20:54:32 UTC
svn commit: r789410 - in /openjpa/trunk: openjpa-persistence-jdbc/pom.xml
pom.xml
Author: dwoods
Date: Mon Jun 29 18:54:32 2009
New Revision: 789410
URL: http://svn.apache.org/viewvc?rev=789410&view=rev
Log:
OPENJPA-1148 Build failures with 64bit Sun JDK6 on Linux due to PermGen space. Part 1 - cleanup of setting jvm arguments for surefire.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=789410&r1=789409&r2=789410&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Mon Jun 29 18:54:32 2009
@@ -34,13 +34,6 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
- <openjpa.loglevel>INFO</openjpa.loglevel>
- <test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
- <test.jvm.maxheapsize>512m</test.jvm.maxheapsize>
- <!-- to set debug arguments, you might set the following at the command line:
- -Dtest.jvm.arguments="-Xmx512m -agentlib:jdwp=transport=dt_socket,server=y,address=8000"
- -->
- <test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -XX:MaxPermSize=${test.jvm.maxpermsize}</test.jvm.arguments>
<dbcp.maxActive>10</dbcp.maxActive>
<dbcp.maxIdle>5</dbcp.maxIdle>
<dbcp.minIdle>2</dbcp.minIdle>
@@ -57,8 +50,8 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <build.enhance>false</build.enhance>
- <test.jvm.arguments>-Dopenjpa.RuntimeUnenhancedClasses=unsupported -Xmx512m </test.jvm.arguments>
+ <build.enhance>false</build.enhance>
+ <surefire.jvm.args>-Dopenjpa.RuntimeUnenhancedClasses=unsupported ${test.jvm.arguments}</surefire.jvm.args>
</properties>
<build>
<plugins>
@@ -66,9 +59,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
-
- <argLine>${test.jvm.arguments}</argLine>
- <includes><include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include></includes>
+ <argLine>${surefire.jvm.args}</argLine>
+ <includes><include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include></includes>
<systemProperties>
<property>
<name>openjpa.Log</name>
@@ -646,7 +638,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${test.jvm.arguments}</argLine>
+ <argLine>${surefire.jvm.args}</argLine>
<excludes>
<!-- exclude classes that end with 'Test'; these
are not test cases per OpenJPA standards -->
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=789410&r1=789409&r2=789410&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Mon Jun 29 18:54:32 2009
@@ -37,8 +37,14 @@
<description>OpenJPA</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openjpa.version>${pom.version}</openjpa.version>
+ <openjpa.loglevel>INFO</openjpa.loglevel>
+ <test.jvm.maxpermsize>512m</test.jvm.maxpermsize>
+ <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
+ <test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -XX:MaxPermSize=${test.jvm.maxpermsize}</test.jvm.arguments>
+ <!-- the sufire.jvm.args can be overridden my specific profiles -->
+ <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
</properties>
@@ -413,9 +419,10 @@
<properties>
<test.env>-Dtest.basedir=${basedir}/..</test.env>
<policy.file>${basedir}/../openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy</policy.file>
- <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=${policy.file} ${test.env}</surefire.jvm.args>
+ <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=${policy.file} ${test.env} ${test.jvm.arguments}</surefire.jvm.args>
</properties>
</profile>
+
<profile>
<id>test-dynamic-enhancer</id>
<activation>
@@ -424,7 +431,7 @@
<properties>
<test.env>-Dtest.basedir=${basedir}/..</test.env>
<policy.file>${basedir}/../openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy</policy.file>
- <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=${policy.file} ${test.env}</surefire.jvm.args>
+ <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=${policy.file} ${test.env} ${test.jvm.arguments}</surefire.jvm.args>
</properties>
<build>
<plugins>
@@ -432,7 +439,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${test.jvm.arguments}</argLine>
+ <argLine>${surefire.jvm.args}</argLine>
<includes>
<include></include>
</includes>
@@ -442,6 +449,16 @@
</build>
</profile>
+ <profile>
+ <id>debug</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -XX:MaxPermSize=${test.jvm.maxpermsize} -agentlib:jdwp=transport=dt_socket,server=y,address=8000</test.jvm.arguments>
+ </properties>
+ </profile>
+
</profiles>
<!-- default versions for dependencies that child modules may include -->