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/30 16:45:54 UTC
svn commit: r789769 - in /openjpa/branches/1.3.x: ./ openjpa-examples/
openjpa-integration/examples/ openjpa-integration/tck/ openjpa-kernel/
openjpa-lib/ openjpa-persistence-jdbc/ openjpa-persistence/
openjpa-project/ openjpa-slice/ openjpa/
Author: dwoods
Date: Tue Jun 30 14:45:53 2009
New Revision: 789769
URL: http://svn.apache.org/viewvc?rev=789769&view=rev
Log:
merge in pom updates and support for checkstyle from trunk, but no checkstyle modules are enabled for now.
Added:
openjpa/branches/1.3.x/openjpa-project/checkstyle.xml (with props)
Modified:
openjpa/branches/1.3.x/openjpa-examples/pom.xml
openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml
openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
openjpa/branches/1.3.x/openjpa-kernel/pom.xml
openjpa/branches/1.3.x/openjpa-lib/pom.xml
openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.3.x/openjpa-persistence/pom.xml
openjpa/branches/1.3.x/openjpa-project/pom.xml
openjpa/branches/1.3.x/openjpa-slice/pom.xml
openjpa/branches/1.3.x/openjpa/pom.xml
openjpa/branches/1.3.x/pom.xml
Modified: openjpa/branches/1.3.x/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-examples/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-examples/pom.xml Tue Jun 30 14:45:53 2009
@@ -26,8 +26,8 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-examples</artifactId>
<packaging>jar</packaging>
- <name>OpenJPA Persistence Examples</name>
- <description>OpenJPA Persistence Examples</description>
+ <name>OpenJPA Examples</name>
+ <description>OpenJPA Examples</description>
<url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
Modified: openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml Tue Jun 30 14:45:53 2009
@@ -34,7 +34,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>examples</artifactId>
<packaging>pom</packaging>
- <name>OpenJPA Examples Integration Tests</name>
+ <name>OpenJPA Integration Tests - Examples</name>
+ <description>OpenJPA Integration Tests - Examples</description>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
Modified: openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml Tue Jun 30 14:45:53 2009
@@ -57,7 +57,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tck</artifactId>
<packaging>pom</packaging>
- <name>OpenJPA JPA TCK Integration Tests</name>
+ <name>OpenJPA Integration Tests - JPA TCK</name>
+ <description>OpenJPA Integration Tests - JPA TCK</description>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
Modified: openjpa/branches/1.3.x/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-kernel/pom.xml Tue Jun 30 14:45:53 2009
@@ -88,31 +88,31 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>add-was-interfaces</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <id>add-was-interfaces</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
<execution>
- <id>generate-standard-sco-proxies</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
+ <id>generate-standard-sco-proxies</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
<arg line="-utils 5" />
</java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: openjpa/branches/1.3.x/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-lib/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-lib/pom.xml Tue Jun 30 14:45:53 2009
@@ -25,8 +25,8 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId>
<packaging>jar</packaging>
- <name>OpenJPA Utilities</name>
- <description>OpenJPA Utilities</description>
+ <name>OpenJPA Utilities Library</name>
+ <description>OpenJPA Utilities Library</description>
<url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
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=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Tue Jun 30 14:45:53 2009
@@ -25,8 +25,8 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<packaging>jar</packaging>
- <name>OpenJPA JPA JDBC</name>
- <description>OpenJPA JPA JDBC</description>
+ <name>OpenJPA Persistence JDBC</name>
+ <description>OpenJPA Persistence JDBC</description>
<url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
@@ -34,13 +34,6 @@
<version>1.3.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>
@@ -49,6 +42,48 @@
</properties>
<profiles>
+ <!-- Profile for testing with test-dynamic-enhancer -->
+ <profile>
+ <id>test-dynamic-enhancer</id>
+
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <build.enhance>false</build.enhance>
+ <surefire.jvm.args>-Dopenjpa.RuntimeUnenhancedClasses=unsupported ${test.jvm.arguments}</surefire.jvm.args>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ <includes><include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include></includes>
+ <systemProperties>
+ <property>
+ <name>openjpa.Log</name>
+ <value>DefaultLevel=${openjpa.loglevel}</value>
+ </property>
+ <property>
+ <name>openjpa.ConnectionDriverName</name>
+ <value>org.apache.commons.dbcp.BasicDataSource</value>
+ </property>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ <property>
+ <name>openjpa.ConnectionProperties</name>
+ <value>DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<!-- Profile for testing with Apache Derby -->
<profile>
<id>test-derby</id>
@@ -560,6 +595,7 @@
<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="build.enhance" value="${build.enhance}" />
</ant>
</tasks>
</configuration>
@@ -569,11 +605,40 @@
</execution>
</executions>
</plugin>
+ <!--
+ Create a o-p-j-tests.jar so we can reuse some of the base
+ TestCase classes in other modules, like openjpa-integration.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <!-- Note: Including entities in this jar will
+ cause problems for any modules that need
+ to enhance their own entities.
+ -->
+ <include>**/org/apache/openjpa/persistence/test/*.class</include>
+ <include>j2*.policy</include>
+ <include>META-INF/persistence.xml</include>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/DISCLAIM*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<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/branches/1.3.x/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence/pom.xml Tue Jun 30 14:45:53 2009
@@ -25,8 +25,8 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
<packaging>jar</packaging>
- <name>OpenJPA JPA</name>
- <description>OpenJPA JPA</description>
+ <name>OpenJPA Persistence</name>
+ <description>OpenJPA Persistence</description>
<url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
@@ -46,62 +46,64 @@
</dependencies>
<profiles>
- <profile>
- <!-- =============================================================== -->
- <!-- Compiling with JDK5 compiler excludes classes that explicitly -->
- <!-- import and use JDK6 classes/packages for annotation processing -->
- <!-- =============================================================== -->
- <id>jdk5-compiler</id>
+ <profile>
+ <!-- =========================================================== -->
+ <!-- Compiling with JDK5 excludes classes that explicitly import -->
+ <!-- and use JDK6 classes/packages for annotation processing -->
+ <!-- =========================================================== -->
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <id>jdk5-compiler</id>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/AnnotationProcessor6.java</exclude>
- <exclude>**/SourceAnnotationHandler.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- </profile>
- <profile>
- <!-- =========================================================== -->
- <!-- Compiling with JDK6 compiler packages a META-INF/services -->
- <!-- file for our annotation processor -->
- <!-- =========================================================== -->
- <id>jdk6-compiler</id>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/AnnotationProcessor6.java</exclude>
+ <exclude>**/SourceAnnotationHandler.java</exclude>
+ <exclude>**/CompileTimeLogger.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!-- =========================================================== -->
+ <!-- Compiling with JDK6+ compiler packages a META-INF/services -->
+ <!-- file for our annotation processor -->
+ <!-- =========================================================== -->
+ <activation>
+ <jdk>[1.6,)</jdk>
+ </activation>
+ <id>jdk6-compiler</id>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <!-- echo file="${basedir}/src/main/resources/META-INF/services/javax.annotation.processing.Processor"
- message="org.apache.openjpa.persistence.meta.AnnotationProcessor6"/ -->
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- </profile>
-
- </profiles>
+ <!--
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <echo file="${basedir}/src/main/resources/META-INF/services/javax.annotation.processing.Processor"
+ message="org.apache.openjpa.persistence.meta.AnnotationProcessor6"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ -->
+ </build>
+ </profile>
+ </profiles>
</project>
Added: openjpa/branches/1.3.x/openjpa-project/checkstyle.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/checkstyle.xml?rev=789769&view=auto
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/checkstyle.xml (added)
+++ openjpa/branches/1.3.x/openjpa-project/checkstyle.xml Tue Jun 30 14:45:53 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!-- This is a temporary file.
+ As we get closer to enforcing the OpenJPA style to be like the
+ default Sun Microsystems Definition default file, then
+ we can remove this file and remove the reference from the
+ pom.xml -->
+
+<module name="Checker">
+<!--
+ <module name="NewlineAtEndOfFile"/>
+ <module name="TreeWalker">
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ </module>
+-->
+</module>
Propchange: openjpa/branches/1.3.x/openjpa-project/checkstyle.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/branches/1.3.x/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/pom.xml Tue Jun 30 14:45:53 2009
@@ -24,7 +24,7 @@
<!--
To build the distribution files from project root:
- mvn clean compile package -Dtest=false
+ mvn clean compile package -Dtest=false -DfailIfNoTests=false
To build and deploy a full digned release with docs, run:
@@ -36,7 +36,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-openjpa</artifactId>
<packaging>pom</packaging>
- <name>OpenJPA Distribution</name>
+ <name>OpenJPA Project Docs and Assemblies</name>
+ <description>OpenJPA Project Docs and Assemblies</description>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
@@ -99,21 +100,22 @@
<jai.groupId>com.sun</jai.groupId>
<jai.version>1.1.3</jai.version>
+ <nightly.version>${pom.version}</nightly.version>
<!-- authentication for nightly uploads -->
<nightly.user.name>${user.name}</nightly.user.name>
<nightly.password>passw0rd</nightly.password>
- </properties>
+ </properties>
- <build>
+ <build>
<!-- needed to let maven pass the "compile" phase -->
<testSourceDirectory>/none/</testSourceDirectory>
<!-- filter site resources -->
<resources>
- <resource>
- <directory>${project.basedir}/src/site</directory>
- <!-- targetPath is relative to target/classes/ -->
- <targetPath>../filtered-site</targetPath>
+ <resource>
+ <directory>${project.basedir}/src/site</directory>
+ <!-- targetPath is relative to target/classes/ -->
+ <targetPath>../filtered-site</targetPath>
<filtering>false</filtering>
</resource>
</resources>
@@ -363,7 +365,7 @@
</repositories>
</profile>
<!--
- Upload distribution files, javadoc and manual to openjpa.apache.org/builds/latest.
+ Upload distribution files, javadoc and manual to openjpa.apache.org/builds/${nightly.version}.
This profile is designed to be run nightly by a continuous build server, but can
also be run manually.
@@ -403,13 +405,13 @@
<include name="*.zip" />
</fileset>
</checksum>
- <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/latest/downloads" trust="true">
+ <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/${nightly.version}/downloads" trust="true">
<fileset dir="target/site/downloads" />
</scp>
- <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/latest/docs" trust="true">
+ <scp todir="${nightly.user.name}:${nightly.password}@people.apache.org:/www/openjpa.apache.org/builds/${nightly.version}/docs" trust="true">
<fileset dir="target/site/tempDocs/docs" />
</scp>
- <sshexec host="people.apache.org" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w /www/openjpa.apache.org/builds/latest" trust="true" />
+ <sshexec host="people.apache.org" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w /www/openjpa.apache.org/builds/${nightly.version}" trust="true" />
<delete>
<fileset dir="target/site/tempDocs" />
</delete>
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=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-slice/pom.xml Tue Jun 30 14:45:53 2009
@@ -62,6 +62,13 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${pom.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<!-- Profile for testing with Apache Derby -->
Modified: openjpa/branches/1.3.x/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa/pom.xml Tue Jun 30 14:45:53 2009
@@ -55,8 +55,10 @@
<include name="*/target/openjpa-*.jar" />
<exclude name="*/target/openjpa-examples-*.jar" />
<exclude name="*/target/openjpa-all-*.jar" />
+ <exclude name="**/*-tests.jar" />
<exclude name="**/*-sources.jar" />
<exclude name="**/*-javadoc.jar" />
+ <exclude name="openjpa-integration/**/target/openjpa-all-*.jar" />
</fileset>
</unjar>
@@ -87,7 +89,7 @@
</plugin>
<!--
- create enhancer pre-main attribute
+ create enhancer pre-main and agent-main attributes
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -103,6 +105,11 @@
org.apache.openjpa.enhance.PCEnhancerAgent
</Premain-Class>
<Can-Redefine-Classes>true</Can-Redefine-Classes>
+ <Agent-Class>
+ org.apache.openjpa.enhance.InstrumentationFactory
+ </Agent-Class>
+ <Can-Redefine-Classes>true</Can-Redefine-Classes>
+ <Can-Retransform-Classes>true</Can-Retransform-Classes>
</manifestEntries>
</archive>
</configuration>
@@ -125,7 +132,7 @@
<!-- OSGi Bundle Metadata -->
<Private-Package>org.openjpa.lib.ant*,org.apache.jdbc.ant*,META-INF*</Private-Package>
<Export-Package>!META-INF*,!org.openjpa.lib.ant*,!org.apache.jdbc.ant*,org.apache.openjpa*</Export-Package>
- <Import-Package>com.ibm.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax.jms.*;resolution:=optional,javax.transaction.*;resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolution:=optional,*</Import-Package>
+ <Import-Package>com.ibm.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax.jms.*;resolution:=optional,javax.transaction.*;resolution:=optional,javax.validation.*;resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolution:=optional,*</Import-Package>
<!-- Eclipse metadata -->
<Eclipse-Autostart>false</Eclipse-Autostart>
<Bundle-ClassPath>.</Bundle-ClassPath>
Modified: openjpa/branches/1.3.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/pom.xml?rev=789769&r1=789768&r2=789769&view=diff
==============================================================================
--- openjpa/branches/1.3.x/pom.xml (original)
+++ openjpa/branches/1.3.x/pom.xml Tue Jun 30 14:45:53 2009
@@ -33,12 +33,19 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<packaging>pom</packaging>
- <name>OpenJPA</name>
+ <name>OpenJPA Parent POM</name>
<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>256m</test.jvm.maxpermsize>
+ <test.jvm.maxheapsize>512m</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>
<!--
@@ -113,7 +120,7 @@
</modules>
<build>
<plugins>
- <plugin>
+ <plugin>
<!--
javadoc plugin doesn't copy resources like the normal jar plugin.
Unzip license,etc from normal jar and add to javadoc jar.
@@ -239,6 +246,9 @@
<exclude>openjpa-project/*.txt</exclude>
<exclude>README.txt</exclude>
<exclude>BUILDRELEASE</exclude>
+ <exclude>scripts/*.list</exclude>
+ <exclude>scripts/*.options</exclude>
+ <exclude>scripts/*.dict</exclude>
<!-- generated content -->
<exclude>**/*.log</exclude>
@@ -247,6 +257,9 @@
<exclude>**/org.apache.openjpa.revision.properties</exclude>
<exclude>**/target/**/*</exclude>
<exclude>release.properties</exclude>
+ <exclude>**/NOTICE.vm</exclude>
+ <exclude>**/LICENSE.vm</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
<!--
Exclude internal repository. These files are
@@ -401,6 +414,10 @@
<exclude>openjpa-project/*.txt</exclude>
<exclude>README.txt</exclude>
<exclude>BUILDRELEASE</exclude>
+ <exclude>scripts/*.list</exclude>
+ <exclude>scripts/*.options</exclude>
+ <exclude>scripts/*.dict</exclude>
+
<!-- generated content -->
<exclude>**/*.log</exclude>
@@ -409,6 +426,9 @@
<exclude>**/org.apache.openjpa.revision.properties</exclude>
<exclude>**/target/**/*</exclude>
<exclude>release.properties</exclude>
+ <exclude>**/NOTICE.vm</exclude>
+ <exclude>**/LICENSE.vm</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
<!--
Exclude internal repository. These files are
@@ -430,7 +450,43 @@
<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>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <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} ${test.jvm.arguments}</surefire.jvm.args>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ <includes>
+ <include></include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </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>
@@ -693,6 +749,18 @@
<version>1.2.1</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.3</version>
@@ -723,7 +791,26 @@
</execution>
</executions>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ <configuration>
+ <configLocation>${checkstyle.config.location}</configLocation>
+ <failsOnError>true</failsOnError>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <excludes>**/*_.java</excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<reporting>
<plugins>
@@ -752,6 +839,15 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>${checkstyle.config.location}</configLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <excludes>**/*_.java</excludes>
+ </configuration>
+ </plugin>
</plugins>
</reporting>