openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r995467 [1/2] - in /openjpa/branches/1.3.x: ./ openjpa-all/ openjpa-examples/ openjpa-integration/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc/ openjpa-kernel/ openjpa-lib/ openjpa-persistence-jdbc/ openjpa-persisten...
Date Thu, 09 Sep 2010 15:37:16 GMT
Author: dwoods
Date: Thu Sep  9 15:37:15 2010
New Revision: 995467

URL: http://svn.apache.org/viewvc?rev=995467&view=rev
Log:
OPENJPA-1712 merge in updates from 2.0.1

Modified:
    openjpa/branches/1.3.x/openjpa-all/pom.xml
    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/pom.xml
    openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
    openjpa/branches/1.3.x/openjpa-jdbc/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-project/source-assembly.xml
    openjpa/branches/1.3.x/openjpa-slice/pom.xml
    openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml
    openjpa/branches/1.3.x/openjpa/pom.xml
    openjpa/branches/1.3.x/pom.xml

Modified: openjpa/branches/1.3.x/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-all/pom.xml?rev=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-all/pom.xml Thu Sep  9 15:37:15 2010
@@ -22,32 +22,53 @@
     the release plugin.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>openjpa-all</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Aggregate Jar with Dependencies</name>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-all</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Aggregate Jar with Dependencies</name>
+
     <build>
         <plugins>
+            <!-- disable creating javadoc for this module -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>   
+            <!-- disable creating source jars for this module -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <attach>false</attach>
+                </configuration>
+            </plugin>
             <!--
-                 Need to disable source plugin here, as it overwrites the shade
-                 plugin created sources jar.
+                 Need to disable jar plugin here, as it overwrites the shade
+                 plugin created binary jar.
             -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>attach-sources</id>
+                        <id>default-jar</id>
                         <phase>none</phase>
                     </execution>
                 </executions>
             </plugin>
+
             <!-- Create our aggregate all JAR -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -60,7 +81,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <createSourcesJar>true</createSourcesJar>
+                            <createSourcesJar>${createSources}</createSourcesJar>
                             <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <!-- 
@@ -104,7 +125,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <!-- include commons-logging -->
         <dependency>

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-examples/pom.xml Thu Sep  9 15:37:15 2010
@@ -22,23 +22,31 @@
     the release plugin.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-examples</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Examples</name>
-    <description>OpenJPA Examples</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-examples</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Examples</name>
+    <description>OpenJPA Examples</description>
+
+    <properties>
+        <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
+        <checkstyle.config.location>${project.basedir}/../openjpa-project/checkstyle.xml</checkstyle.config.location>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
@@ -56,14 +64,27 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
+            <!-- disable creating javadoc for this module -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
                     <!--
                         need to skip reversemapping since it depends on
                         classes that are generated by the build.xml file

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml Thu Sep  9 15:37:15 2010
@@ -40,6 +40,7 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-integration-examples</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Integration Tests - Examples</name>
@@ -65,11 +66,11 @@
                         <delete dir="${examples.base}" quiet="true"/>
                         <mkdir dir="${examples.base}" />
 
-                        <unzip overwrite="false" dest="${examples.base}" src="../../openjpa-project/target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
+                        <unzip overwrite="false" dest="${examples.base}" src="../../openjpa-project/target/site/downloads/apache-openjpa-${project.version}-binary.zip" />
 
                         <path id="assembly.classpath"> 
                             <fileset dir="${examples.base}">
-                                <include name="**/openjpa-all-${pom.version}.jar" />
+                                <include name="**/openjpa-all-${project.version}.jar" />
                             </fileset>
                         </path>
                         <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
@@ -98,7 +99,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-all</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: openjpa/branches/1.3.x/openjpa-integration/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/pom.xml?rev=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/pom.xml Thu Sep  9 15:37:15 2010
@@ -31,6 +31,7 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-integration</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Integration Tests</name>
@@ -39,4 +40,20 @@
         <module>examples</module>
         <module>tck</module>
     </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!-- disable creating javadoc for these modules -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                    <inherited>true</inherited>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml Thu Sep  9 15:37:15 2010
@@ -63,11 +63,16 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-integration-tck</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Integration Tests - JPA TCK</name>
     <description>OpenJPA Integration Tests - JPA TCK</description>
 
+    <properties>
+        <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -130,11 +135,12 @@
                         <property name="db.username" value="nousername" />
                         <property name="db.password" value="nopassword" />
 
-                        <property name="openjpa.log.level" value="WARN" />
+                        <property name="openjpa.Log" value="${openjpa.Log}" />
 
                         <property name="jpatck.pkg.dir" value="com" />
                         <property name="jpatck.test" value="" />
 
+                        <property name="jpatck.reports.dir" value="${tck.dir}/../reports" />
                         <property name="jpatck.work.dir" value="${tck.dir}/../work" />
                         <property name="tck.log" value="${tck.base}/openjpa-tck.log" />
 
@@ -150,7 +156,7 @@ openjpa.ConnectionPassword: ${db.passwor
 openjpa.FetchBatchSize: -1
 openjpa.Compatibility: StrictIdentityValues=true
 openjpa.Sequence: time
-openjpa.Log: DefaultLevel=${openjpa.log.level}
+openjpa.Log: ${openjpa.Log}
 openjpa.jdbc.DBDictionary: StoreCharsAsNumbers=false
 openjpa.jdbc.SchemaFactory: native(ForeignKeys=true)
                         </echo>
@@ -167,7 +173,7 @@ openjpa.jdbc.SchemaFactory: native(Forei
 
 jpa.home=${tck.dir}
 work.dir=${jpatck.work.dir}
-report.dir=${tck.dir}/../reports
+report.dir=${jpatck.reports.dir}
 jpa.classes=${cp.property}
 database.classes=${jpa.classes}
 # Need to specify java.* classes, both in Windows/UNIX locations as well as Mac.
@@ -186,6 +192,7 @@ databaseName=${db.name}
                         <!-- convert backslashes and known paths with spaces
                             to get around a problem with the TCK testrunner 
                             on windows -->
+                        <echo>Update directory paths if running on Windows</echo>
                         <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
                         <concat append="true" destfile="${jpatck.config}">
                             <fileset file="${jpatck.config}.tmp" />
@@ -220,7 +227,7 @@ databaseName=${db.name}
                             <attribute name="buildfile" />
                             <attribute name="target" />
                             <sequential>
-                                <java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="true" dir="${tck.dir}/src" append="true" output="${tck.log}" timeout="7200000">
+                                <java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="true" dir="${tck.dir}/src" append="true" output="${tck.log}" timeout="7200000" resultproperty="tsant.result">
                                     <arg value="-emacs" />
                                     <arg value="-buildfile" />
                                     <arg value="@{buildfile}" />
@@ -254,10 +261,21 @@ databaseName=${db.name}
                         <echo>Logging JPA TCK output to ${tck.log}</echo>
 
                         <!-- first initialize the database -->
+                        <echo>Calling TCK initdb.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
+                        <echo>TCK initdb.xml returned result=${tsant.result}</echo>
 
                         <!-- now run the TCK -->
+                        <echo>Calling TCK build.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" />
+                        <echo>TCK build.xml returned result=${tsant.result}</echo>
+
+                        <!-- archive the results -->
+                        <property name="tck.results.archive" value="${tck.base}/openjpa-tck-results.zip" />
+                        <zip destfile="${tck.results.archive}">
+                            <fileset dir="${jpatck.work.dir}" />
+                        </zip>
+                        <echo>Results archive at: ${tck.results.archive}</echo>
 
                         <!--
                             The TCK's Java process doesn't actually fail when
@@ -269,24 +287,20 @@ databaseName=${db.name}
                             <contains string="${jpatck.results}" substring="Completed test run: not ok" />
                         </condition>
                         <fail if="jpatck.failed">Some tests failed</fail>
-
+                        <!-- else -->
                         <echo>JPA TCK Passed 100%!</echo>
 
-                        <property name="tck.results.archive" value="${tck.base}/openjpa-tck-results.zip" />
-                        <zip destfile="${tck.results.archive}" basedir="${jpatck.work.dir}" />
-                        <echo>Results archive at: ${tck.results.archive}</echo>
-
-                        </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                    </tasks>
+                  </configuration>
+                  <goals>
+                    <goal>run</goal>
+                  </goals>
+                </execution>
+              </executions>
             </plugin>
-        </plugins>
-    </build>
-    </profile>
+          </plugins>
+        </build>
+      </profile>
     </profiles>
 
     <dependencies>

Modified: openjpa/branches/1.3.x/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/pom.xml?rev=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-jdbc/pom.xml Thu Sep  9 15:37:15 2010
@@ -21,23 +21,26 @@
     Maven release plugin requires the project tag to be on a single line. 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-jdbc</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA JDBC</name>
-    <description>OpenJPA JDBC</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-jdbc</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA JDBC</name>
+    <description>OpenJPA JDBC</description>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-kernel/pom.xml Thu Sep  9 15:37:15 2010
@@ -21,23 +21,26 @@
     Maven release plugin requires the project tag to be on a single line. 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-kernel</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Kernel</name>
-    <description>OpenJPA Kernel</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-kernel</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Kernel</name>
+    <description>OpenJPA Kernel</description>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -63,6 +66,7 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -118,25 +122,35 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/com/ibm/**</exclude>
-                    </excludes>
-                </configuration>                
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Agent-Class>org.apache.openjpa.enhance.InstrumentationFactory</Agent-Class>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                   <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                </manifest>
+                                <manifestEntries>
+                                    <Implementation-Build>${buildNumber}</Implementation-Build>
+                                    <Agent-Class>org.apache.openjpa.enhance.InstrumentationFactory</Agent-Class>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>attach-tests</id>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
+
     <repositories>
         <!-- 
             Internal (in SVN) repository which contains jar files that are not

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-lib/pom.xml Thu Sep  9 15:37:15 2010
@@ -21,18 +21,21 @@
     Maven release plugin requires the project tag to be on a single line. 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-lib</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Utilities Library</name>
-    <description>OpenJPA Utilities Library</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-lib</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Utilities Library</name>
+    <description>OpenJPA Utilities Library</description>
+
     <dependencies>
         <dependency>
             <groupId>jakarta-regexp</groupId>
@@ -67,6 +70,7 @@
             <artifactId>serp</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <!--

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Thu Sep  9 15:37:15 2010
@@ -50,7 +50,7 @@
             </properties>
             <build>
             <plugins>
-               <plugin>
+              <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
@@ -229,6 +229,10 @@
                 <connection.url>${openjpa.postgresql.url}</connection.url>
                 <connection.username>${openjpa.postgresql.username}</connection.username>
                 <connection.password>${openjpa.postgresql.password}</connection.password>
+                <!-- DBCP overrides -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
+                <dbcp.maxActive>20</dbcp.maxActive>
             </properties>
         </profile>
 
@@ -262,6 +266,11 @@
                     -Dmssql.artifactid=sqljdbc4
             -->
             <id>test-mssql</id>
+            <activation>
+                <property>
+                    <name>test-mssql</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>${mssql.groupid}</groupId>
@@ -300,6 +309,11 @@
         <!-- Profile for testing with SQLServer DB using the jTDS driver -->
         <profile>
             <id>test-sqlserver</id>
+            <activation>
+                <property>
+                    <name>test-sqlserver</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>net.sourceforge.jtds</groupId>
@@ -345,7 +359,11 @@
         <!-- Profile for testing with Ingres DB -->
         <profile>
             <id>test-ingres</id>
-            <activation><property><name>test-ingres</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-ingres</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>com.ingres.jdbc</groupId>
@@ -483,6 +501,11 @@
                     -Ddb2.version=9.5
             -->
             <id>test-db2-jcc</id>
+            <activation>
+                <property>
+                    <name>test-db2-jcc</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>${db2.groupid}</groupId>
@@ -525,6 +548,65 @@
             </repositories>
         </profile>          
 
+        <!-- Profile for testing Apache Derby with the DB2 JCC driver -->
+        <profile>
+            <id>test-derbyjcc</id>
+            <activation>
+                <property>
+                    <name>test-derbyjcc</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${db2.groupid}</groupId>
+                    <artifactId>${db2.driver.artifactid}</artifactId>
+                    <version>${db2.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${db2.groupid}</groupId>
+                    <artifactId>${db2.license.artifactid}</artifactId>
+                    <version>${db2.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
+                <db2.groupid>com.ibm.db2</db2.groupid>
+                <db2.driver.artifactid>jcc-driver</db2.driver.artifactid>
+                <db2.license.artifactid>jcc-license</db2.license.artifactid>
+                <db2.version>9.5</db2.version>
+                <!--
+                    Note: DB must be created before using this profile,
+                    which can be done by running:
+                        mvn test -Dtest=<testcase> -Ptest-derbynet
+                -->
+                <openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa13</openjpa.derbyjcc.url>
+                <!-- Note: commons-dbcp requires dummy values for uid/pwd -->
+                <openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username>
+                <openjpa.derbyjcc.password>pwd</openjpa.derbyjcc.password>
+                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
+                <connection.url>${openjpa.derbyjcc.url}</connection.url>
+                <connection.username>${openjpa.derbyjcc.username}</connection.username>
+                <connection.password>${openjpa.derbyjcc.password}</connection.password>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>db2.repository</id>
+                    <name>DB2 Repository</name>
+                    <url>${db2.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+
         <!-- Profile for testing Informix with the DB2 JCC driver -->
         <profile>
             <!-- 
@@ -551,6 +633,11 @@
                     -Dids.version=9.5
             -->
             <id>test-ids-jcc</id>
+            <activation>
+                <property>
+                    <name>test-ids-jcc</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>${ids.groupid}</groupId>
@@ -619,6 +706,11 @@
                     -Doracle.version=10g
             -->
             <id>test-oracle</id>
+            <activation>
+                <property>
+                    <name>test-oracle</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>${oracle.groupid}</groupId>
@@ -660,12 +752,12 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -694,6 +786,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -720,42 +813,6 @@
                     </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>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>test-base</classifier>
-                            <classesDirectory>${project.build.testOutputDirectory}</classesDirectory>
-                            <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>META-INF/LICENSE*</include>
-                                <include>META-INF/NOTICE*</include>
-                                <include>META-INF/DISCLAIM*</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>attach-tests</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence/pom.xml Thu Sep  9 15:37:15 2010
@@ -21,23 +21,26 @@
     Maven release plugin requires the project tag to be on a single line. 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-persistence</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Persistence</name>
-    <description>OpenJPA Persistence</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-persistence</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Persistence</name>
+    <description>OpenJPA Persistence</description>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/pom.xml Thu Sep  9 15:37:15 2010
@@ -21,6 +21,18 @@
     Maven release plugin requires the project tag to be on a single line.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <!--
+        To build the distribution files from project root:
+
+        mvn clean compile package -Dtest=false -DfailIfNoTests=false
+
+        To build and deploy a fully signed release with docs, run:
+
+            mvn clean deploy -Papache-release,docbook-profile
+
+        Note that to sign the release, you need to have "gpg" installed and
+        create a key. See http://apache.org/dev/release-signing.html
+    -->
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,6 +42,7 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
     <artifactId>apache-openjpa</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Project Docs and Assemblies</name>
@@ -91,7 +104,7 @@
         <jai.groupId>com.sun</jai.groupId>
         <jai.version>1.1.3</jai.version>
 
-        <nightly.version>${pom.version}</nightly.version>
+        <nightly.version>${project.version}</nightly.version>
         <!-- authentication for nightly uploads -->
         <nightly.user.name>${user.name}</nightly.user.name>
         <nightly.password>passw0rd</nightly.password>
@@ -123,7 +136,9 @@
                             <goal>attached</goal>
                         </goals>
                         <configuration>
-                            <descriptor>assembly.xml</descriptor>
+                            <descriptors>
+                                <descriptor>assembly.xml</descriptor>
+                            </descriptors>
                             <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
                             <workDirectory>target/work</workDirectory>
                         </configuration>
@@ -334,6 +349,12 @@
                     </plugin>
                 </plugins>
             </build>
+            <activation>
+                <property>
+                    <name>builddocs</name>
+                    <value>true</value>
+                </property>
+            </activation>
             <pluginRepositories>
                 <pluginRepository>
                     <id>agilejava</id>
@@ -349,7 +370,6 @@
                 </repository>
             </repositories>
         </profile>
-
         <!-- 
           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
@@ -373,34 +393,12 @@
                                 <phase>package</phase>
                                 <configuration>
                                     <tasks>
-                                        <mkdir dir="target/site/tempDocs" />
-                                        <unzip dest="target/site/tempDocs">
-                                            <fileset dir="target/site/downloads">
-                                                <include name="*binary*.zip" />
-                                            </fileset>
-                                            <patternset>
-                                                <include name="**/javadoc/**" />
-                                                <include name="**/manual/**" />
-                                            </patternset>
-                                        </unzip>
-                                        <move todir="target/site/tempDocs/docs">
-                                            <fileset dir="target/site/tempDocs/apache-openjpa-${pom.version}/docs" /> 
-                                        </move>
-                                        <checksum> 
-                                            <fileset dir="target/site/downloads/">
-                                                <include name="*.zip" />
-                                            </fileset>
-                                        </checksum>
-                                        <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/${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/${nightly.version}" trust="true" />
-                                        <delete>
-                                            <fileset dir="target/site/tempDocs" />
-                                        </delete>
+                                        <ant antfile="upload.xml" target="upload" inheritRefs="true">
+                                            <property name="nightly.user.name" value="${nightly.user.name}" />
+                                            <property name="nightly.password" value="${nightly.password}" />
+                                            <property name="nightly.version" value="${nightly.version}" />
+                                            <property name="project.version" value="${project.version}" />
+                                        </ant>
                                     </tasks>
                                 </configuration>
                                 <goals>
@@ -419,12 +417,12 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-all</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- included so we can include it in the distribution -->

Modified: openjpa/branches/1.3.x/openjpa-project/source-assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/source-assembly.xml?rev=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/source-assembly.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/source-assembly.xml Thu Sep  9 15:37:15 2010
@@ -36,6 +36,7 @@
             <excludes>
                 <exclude>**/target/**</exclude>
                 <exclude>**/*.log</exclude>
+                <exclude>**/.*</exclude>
                 <exclude>**/.*/**</exclude>
             </excludes>
         </fileSet>

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=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-slice/pom.xml Thu Sep  9 15:37:15 2010
@@ -7,9 +7,9 @@
  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
@@ -21,140 +21,132 @@
     Maven release plugin requires the project tag to be on a single line. 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.openjpa</groupId>
-	<artifactId>openjpa-slice</artifactId>
-	<packaging>jar</packaging>
-	<name>OpenJPA Slice</name>
-	<description>OpenJPA Slice</description>
-	<url>http://openjpa.apache.org</url>
-	<parent>
-		<groupId>org.apache.openjpa</groupId>
-		<artifactId>openjpa-parent</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
-	</parent>
-	<properties>
-        <test.jvm.arguments>-Xmx500m</test.jvm.arguments>
-		<!-- to set debug arguments, you might set the following at the command line:
-			-Dtest.jvm.args="-Xmx500m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000"
-		-->
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa-kernel</artifactId>
-			<version>${pom.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa-jdbc</artifactId>
-			<version>${pom.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_1.0_spec</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa-persistence</artifactId>
-			<version>${pom.version}</version>
-			<scope>test</scope>
-		</dependency>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa-parent</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-slice</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Slice</name>
+    <description>OpenJPA Slice</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-kernel</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-jdbc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-persistence</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-	</dependencies>
-	<profiles>
-		<!-- Profile for testing with Apache Derby -->
-		<profile>
-			<id>test-derby</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>test-derby</name>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.derby</groupId>
-					<artifactId>derby</artifactId>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-			<properties>
-				<connection.driver.name>
-					org.apache.derby.jdbc.EmbeddedDriver
-				</connection.driver.name>
-				<connection.url>
-					jdbc:derby:target/database/slice-derby-One;create=true
-				</connection.url>
-				<connection.username />
-				<connection.password />
-			</properties>
-		</profile>
-		<profile>
-			<id>test-mysql</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-				<property>
-					<name>test-mysql</name>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>mysql</groupId>
-					<artifactId>mysql-connector-java</artifactId>
-					<version>5.1.5</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-			<properties>
-				<connection.driver.name>
-					com.mysql.jdbc.Driver
-				</connection.driver.name>
-				<connection.url>${openjpa.mysql.url}</connection.url>
-				<connection.username>
-					${openjpa.mysql.username}
-				</connection.username>
-				<connection.password>
-					${openjpa.mysql.password}
-				</connection.password>
-			</properties>
-		</profile>
-
-	</profiles>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>test-compile</phase>
-						<configuration>
-							<tasks>
-								<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
-									<property name="maven.test.skip" value="${maven.test.skip}" />
-									<property name="test" value="${test}" />
-									<property name="outdir" value="${project.build.outputDirectory}" />
-									<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
+    </dependencies>
+
+    <profiles>
+        <!-- Profile for testing with Apache Derby -->
+        <profile>
+            <id>test-derby</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>test-derby</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derby</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>org.apache.derby.jdbc.EmbeddedDriver</connection.driver.name>
+                <connection.url>jdbc:derby:target/database/slice-derby-One;create=true</connection.url>
+                <connection.username />
+                <connection.password />
+            </properties>
+        </profile>
+
+        <!-- Sample profile for testing with MySQL DB -->
+        <profile>
+            <!-- different id, so this doesn't run during automated testing -->
+            <id>test-mysql-slice</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>test-mysql-slice</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                    <version>${mysql.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
+                <connection.url>${openjpa.mysql.url}</connection.url>
+                <connection.username>${openjpa.mysql.username}</connection.username>
+                <connection.password>${openjpa.mysql.password}</connection.password>
+                <!-- DBCP overrides for MySQL testing -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
+            </properties>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>test-compile</phase>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
+                                    <property name="maven.test.skip" value="${maven.test.skip}" />
+                                    <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>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-           
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -172,6 +164,6 @@
                     </systemProperties>
                 </configuration>
             </plugin>
-		</plugins>
-	</build>
+        </plugins>
+    </build>
 </project>

Modified: openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml?rev=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml Thu Sep  9 15:37:15 2010
@@ -40,13 +40,18 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
-            <!-- <classifier>test-base</classifier> -->
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-persistence-jdbc</artifactId>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -54,17 +59,29 @@
 
     <build>
         <plugins>
-            <!-- create *-tests.jar -->
+            <!-- Extract the common test support files from o-p-j-tests.jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>attach-tests</id>
-                        <phase>verify</phase>
+                        <id>unpack</id>
+                        <phase>test-compile</phase>
                         <goals>
-                            <goal>test-jar</goal>
+                            <goal>unpack</goal>
                         </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.openjpa</groupId>
+                                    <artifactId>openjpa-persistence-jdbc</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>test-jar</type>
+                                    <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                                    <includes>org/apache/openjpa/persistence/test/*.class</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -89,11 +106,11 @@
                     </execution>
                 </executions>
                 <dependencies>
+                    <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
                     <dependency>
                         <groupId>org.apache.openjpa</groupId>
-                        <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
                         <artifactId>openjpa-persistence-jdbc</artifactId>
-                        <version>${pom.version}</version>
+                        <version>${project.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: openjpa/branches/1.3.x/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/pom.xml?rev=995467&r1=995466&r2=995467&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa/pom.xml Thu Sep  9 15:37:15 2010
@@ -37,19 +37,21 @@
 
     <build>
         <plugins>
-            <!--
-                 Need to disable source plugin here, as it overwrites the shade
-                 plugin created sources jar.
-            -->
+            <!-- disable creating javadoc for this module -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <!-- disable creating source jars for this module -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>none</phase> 
-                    </execution>
-                </executions>
+                <configuration>
+                    <attach>false</attach>
+                </configuration>
             </plugin>
 
             <!-- Create our aggregate JAR -->
@@ -64,7 +66,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <createSourcesJar>true</createSourcesJar>
+                            <createSourcesJar>${createSources}</createSourcesJar>
                             <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <!--
@@ -116,7 +118,7 @@
                         <!-- OSGi Bundle Metadata -->
                         <Bundle-DocURL>${project.url}</Bundle-DocURL>
                         <Private-Package />
-                        <Export-Package>org.apache.openjpa.*;version=${pom.version}</Export-Package>
+                        <Export-Package>org.apache.openjpa.*;version=${project.version}</Export-Package>
                         <Import-Package>com.ibm.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,org.slf4j.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax.jms.*;version="[1.1.0,1.2)";resolution:=optional,javax.transaction.*;version="[1.1.0,1.2)";resolution:=optional,javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolution:=optional,javax.persistence.*;version="[1.1.0,2.1)",*</Import-Package>
                     </instructions>
                 </configuration>
@@ -129,17 +131,17 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <!--
                  Need to exclude jaxb, so the following will not get included
                  as compile depends in the aggregate JAR by the shade plugin:
@@ -196,22 +198,22 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-xmlstore</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-slice</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>



Mime
View raw message