openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r998283 [3/4] - in /openjpa/branches/1.2.x: ./ openjpa-examples/ openjpa-integration/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc/ openjpa-kernel/ openjpa-lib/ openjpa-persistence-jdbc/ openjpa-persistence-jdbc/src/t...
Date Fri, 17 Sep 2010 19:41:46 GMT
Copied: openjpa/branches/1.2.x/RELEASE-NOTES.html (from r998184, openjpa/branches/1.2.x/openjpa-project/RELEASE-NOTES.html)
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/RELEASE-NOTES.html?p2=openjpa/branches/1.2.x/RELEASE-NOTES.html&p1=openjpa/branches/1.2.x/openjpa-project/RELEASE-NOTES.html&r1=998184&r2=998283&rev=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-project/RELEASE-NOTES.html (original)
+++ openjpa/branches/1.2.x/RELEASE-NOTES.html Fri Sep 17 19:41:45 2010
@@ -1,7 +1,25 @@
+<!--
+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.
+-->
 <html>
-<title>Release Notes for OpenJPA 1.2.2</title>
+<title>Release Notes for OpenJPA 1.2.3</title>
 <body>
-<h1>Release Notes for OpenJPA 1.2.2</h1>
+<h1>Release Notes for OpenJPA 1.2.3</h1>
 
 <ul>
 <li><a href="#Overview">Overview</a></li>
@@ -15,8 +33,8 @@
 
 <h2><a name="Overview"></a>Overview</h2>
 
-<p> These notes describe the difference between OpenJPA release 1.2.2
-and the preceding release: 1.2.1.
+<p> These notes describe the difference between OpenJPA release 1.2.3
+and the preceding release: 1.2.2.
 <P>
 OpenJPA is a feature-rich implementation of the persistence part of 
 Java Community Process JSR-220 (Enterprise JavaBeans 3.0), which is
@@ -51,24 +69,24 @@ specific language governing permissions 
 under the License.
 
 <BR><P>The license may also be found in LICENSE.txt which is included 
-in each release of OpenJPA. 
+in each release of OpenJPA.</P>
+<BR><P>The complete list of notices can be found in NOTICE.txt included in each assembly.</P>
 
 <h2><a name="Prerequisites"></a>Prerequisites</h2>
-<P>
-In normal usage, OpenJPA requires Java 5 or higher and a relational 
-database of some sort.
+<P> In normal usage, OpenJPA requires Java 5 or higher and a relational 
+database of some sort.</P>
 
 <h2><a name="Documentation"></a>Documentation</h2>
 <p>If you have questions about OpenJPA, a good source of information is the 
 online product manual. You can find the manual for the current release as well
 as older releases of OpenJPA at 
 <a href="http://openjpa.apache.org/documentation.html">
-http://openjpa.apache.org/documentation.html</a>
+http://openjpa.apache.org/documentation.html</a></p>
 <p>If you can't find what you're looking for in the manual or would like more
 clarification you please post to the OpenJPA development mailing list.
 Information on all of the OpenJPA mailing lists may be found here:
 <a href="http://openjpa.apache.org/mailing-lists.html">
-http://openjpa.apache.org/mailing-lists.html</a>
+http://openjpa.apache.org/mailing-lists.html</a></p>
 
 <p>
 <h2><a name="GetInvolved"></a>Getting Involved</h2>
@@ -93,101 +111,17 @@ How do I Contribute?
     <li> Bugs and other issues can be posted on the project JIRA. </li>
 </ul>
 
-<h2><a name="JIRA"</a>JIRA Issues Fixed in this release</h2>
-
-<h3>        Sub-task
-</h3>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1023'>OPENJPA-1023</a>] -         Message files contain windows EOL characters
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1210'>OPENJPA-1210</a>] -         Specify derby timeouts via properties.
-</li>
-</ul>
-    
-<h3>        Bug
-</h3>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-466'>OPENJPA-466</a>] -         Primary key constraint violated using (Oracle) sequence to generate ID in multithreaded app
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-714'>OPENJPA-714</a>] -         &quot;Encountered unmanaged object in persistent field&quot; error while merging object tree
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-732'>OPENJPA-732</a>] -         Updates to entities via Lifecycle callback methods 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-873'>OPENJPA-873</a>] -         @MappedSuperClass Cause Null Pointer Exception in Class With IdClass
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-896'>OPENJPA-896</a>] -         Several source files include Windows EoL chars
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1025'>OPENJPA-1025</a>] -         AbstractResultList.subList throws UnsupportedOperationException
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1029'>OPENJPA-1029</a>] -         SQLServerDictionary causes NumberFormatException if MS SQL Server JDBC driver is used
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1061'>OPENJPA-1061</a>] -         Entities extending from a Mapped Superclass that defines the ID fields share the same ObjectID type parameter
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1067'>OPENJPA-1067</a>] -         SetQueryTimeout(x) where x != 0 causes SQLException with DB2 on Z/OS
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1141'>OPENJPA-1141</a>] -         NPE  at org.apache.openjpa.jdbc.meta.MappingInfo.mergeJoinColumn(MappingInfo.java:1400)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1156'>OPENJPA-1156</a>] -         Path length issues on Windows 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1197'>OPENJPA-1197</a>] -         NativeQueries fail with MySQL 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1308'>OPENJPA-1308</a>] -         shouldn't always use CAST with UPPER and LOWER for DB2
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1326'>OPENJPA-1326</a>] -         ReverseMappingTool and SchemaTool failing for Sybase
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1328'>OPENJPA-1328</a>] -         Move cacheable class configuration to ClassMetaData
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1359'>OPENJPA-1359</a>] -         SQLServer driver 2.0 works, but causes exception in SQLServerDictionary on the first connection
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1384'>OPENJPA-1384</a>] -         ClassNotFoundException for custom DBDictionary used by EJB
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1397'>OPENJPA-1397</a>] -         NULL in columns part of an @IdClass composite key leads to &quot;disappearing&quot; (null) returned objects
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1400'>OPENJPA-1400</a>] -         Unable to persist a relationship to a detached Entity 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1421'>OPENJPA-1421</a>] -         Reduce lock contention in JDBCStoreManager
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1441'>OPENJPA-1441</a>] -         NPE when enhancing a Serializable, versioned class
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1457'>OPENJPA-1457</a>] -         Remove Java.net maven repostiory from tck pom.xml
-</li>
-</ul>
-    
-<h3>        Improvement
-</h3>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-250'>OPENJPA-250</a>] -         Reduce synchronization bottlenecks in data cache, metadata repository, and lifecycle event manager
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-975'>OPENJPA-975</a>] -         Oracle needs ability to not have an escape character for search strings.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-991'>OPENJPA-991</a>] -         Implement LockTimeout using db specific server-side lock timeout feature
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1045'>OPENJPA-1045</a>] -         Add opt-in and opt-out configuration for L2 DataCache
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1136'>OPENJPA-1136</a>] -         Add .gitignore for git users
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1171'>OPENJPA-1171</a>] -         Use StringBuilder instead of StringBuffer in SQLBuffer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1172'>OPENJPA-1172</a>] -         Use java.util.concurrent.ConcurrentHashMap rather than a synchronized HashMap in ClassMapping.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1414'>OPENJPA-1414</a>] -         Performance improvements for detach
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1415'>OPENJPA-1415</a>] -         Performance improvement by reduced logging of batched OLE
-</li>
-</ul>
-                                
-<h3>        Test
-</h3>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1071'>OPENJPA-1071</a>] -         Derby test suit speed-up
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1092'>OPENJPA-1092</a>] -         enable test case for jpql
-</li>
-</ul>
+<BR>
+<hr>
+<h2><a name="ReleaseNotes">Release Notes</h2>
+
+<hr>
+<h3><a name="123">OpenJPA 1.2.3</h3>
+<ul><li> TBD </li></ul>
 
-<h2><a name="Previous"></a>         Previous Releases
-</h2>
+<h2><a name="Previous"></a>Previous Releases</h2>
 Release notes for earlier releases of OpenJPA may be found in SVN at the following locations. 
+<li><a href='http://svn.apache.org/viewvc/openjpa/tags/1.2.2/openjpa-project/RELEASE-NOTES.html?view=co'>OpenJPA 1.2.2 RELEASE-NOTES.html</a></li>
 <li><a href='http://svn.apache.org/viewvc/openjpa/tags/1.2.1/openjpa-project/RELEASE-NOTES.html?view=co'>OpenJPA 1.2.1 RELEASE-NOTES.html</a></li>
 <li><a href='http://svn.apache.org/viewvc/openjpa/tags/1.2.0/openjpa-project/RELEASE-NOTES.html?view=co'>OpenJPA 1.2.0 RELEASE-NOTES.html</a></li>
 </body>

Modified: openjpa/branches/1.2.x/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-examples/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-examples/pom.xml Fri Sep 17 19:41:45 2010
@@ -22,24 +22,30 @@
     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 Persistence Examples</name>
-    <description>OpenJPA Persistence Examples</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.2.3-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>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
@@ -57,14 +63,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.2.x/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-integration/examples/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-integration/examples/pom.xml Fri Sep 17 19:41:45 2010
@@ -31,16 +31,21 @@
     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>examples</artifactId>
-    <packaging>pom</packaging>
-    <name>OpenJPA Examples Integration Tests</name>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
         <version>1.2.3-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-integration-examples</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Integration Tests - Examples</name>
+    <description>OpenJPA Integration Tests - Examples</description>
+
     <profiles>
     <profile>
     <id>examples-profile</id>
@@ -58,9 +63,10 @@
                         <echo>Running OpenJPA Examples</echo>
 
                         <property name="examples.base" value="${basedir}/target/examples" />
+                        <delete dir="${examples.base}" quiet="true"/>
                         <mkdir dir="${examples.base}" />
 
-                        <unzip overwrite="false" dest="${examples.base}" src="../../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}">
@@ -93,7 +99,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: openjpa/branches/1.2.x/openjpa-integration/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-integration/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-integration/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-integration/pom.xml Fri Sep 17 19:41:45 2010
@@ -22,17 +22,38 @@
     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-integration</artifactId>
-    <packaging>pom</packaging>
-    <name>OpenJPA Integration Tests</name>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.2.3-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-integration</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Integration Tests</name>
+
     <modules>
         <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.2.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-integration/tck/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-integration/tck/pom.xml Fri Sep 17 19:41:45 2010
@@ -54,16 +54,38 @@
     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>tck</artifactId>
-    <packaging>pom</packaging>
-    <name>OpenJPA JPA TCK Integration Tests</name>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
         <version>1.2.3-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>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <!-- Don't publish these artifacts to central -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
     <profile>
     <id>tck-profile</id>
@@ -101,7 +123,6 @@
                             <!-- use official JPA API instead of GM's -->
                             <fileset dir="${tck.dir}/lib">
                                 <include name="**/*.jar" />
-                                <exclude name="**/geronimo-jpa*" />
                             </fileset>
                             <pathelement path="${java.class.path}" />
                             <pathelement path="${db.jar}" />
@@ -114,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" />
 
@@ -134,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>
@@ -151,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.
@@ -170,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" />
@@ -178,6 +201,10 @@ databaseName=${db.name}
                         <path id="agent.path">
                             <fileset dir="../../openjpa-all/target">
                                 <include name="*.jar" />
+                                <exclude name="*-sources.jar" />
+                                <exclude name="original-*.jar" />
+                                <exclude name="*-tests.jar" />
+                                <exclude name="*-javadoc.jar" />
                             </fileset>
                         </path>
                         <pathconvert dirsep="/" property="agent" refid="agent.path" />
@@ -200,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}" />
@@ -234,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
@@ -249,27 +287,24 @@ 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>
+        <!--  Use the JPA spec from Geronimo -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_1.0_spec</artifactId>

Modified: openjpa/branches/1.2.x/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/pom.xml Fri Sep 17 19:41:45 2010
@@ -21,49 +21,54 @@
     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.2.3-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>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>8.1-407.jdbc3</version>
+            <version>8.4-701.jdbc3</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: openjpa/branches/1.2.x/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/pom.xml Fri Sep 17 19:41:45 2010
@@ -21,39 +21,38 @@
     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.2.3-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>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-pool</groupId>
             <artifactId>commons-pool</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.ibm.websphere</groupId>
@@ -61,7 +60,13 @@
             <version>0.0.1</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -144,14 +149,38 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/com/ibm/**</exclude>
-                    </excludes>
-                </configuration>                
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/com/ibm/**</exclude>
+                            </excludes>
+                            <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.2.x/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-lib/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-lib/pom.xml Fri Sep 17 19:41:45 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</name>
-    <description>OpenJPA Utilities</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.2.3-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>
@@ -42,34 +45,32 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <!--

Modified: openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml Fri Sep 17 19:41:45 2010
@@ -21,45 +21,89 @@
     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-jdbc</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA JPA JDBC</name>
-    <description>OpenJPA JPA JDBC</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.2.3-SNAPSHOT</version>
     </parent>
-    <properties>
-        <openjpa.Log>DefaultLevel=INFO</openjpa.Log>
-        <!-- to set debug arguments, you might set the following at the command line:
-            -Dtest.jvm.arguments="-Xmx500m -agentlib:jdwp=transport=dt_socket,server=y,address=8000"
-        -->
-        <test.jvm.arguments>-Xmx500m</test.jvm.arguments>
-        <dbcp.maxActive>10</dbcp.maxActive>
-        <dbcp.maxIdle>5</dbcp.maxIdle>
-        <dbcp.minIdle>2</dbcp.minIdle>
-        <dbcp.maxWait>10000</dbcp.maxWait>
-        <dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
-        <derby.locks.waitTimeout>6</derby.locks.waitTimeout>        
-        <derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
-    </properties>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-persistence-jdbc</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Persistence JDBC</name>
+    <description>OpenJPA Persistence JDBC</description>
+
     <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>${openjpa.Log}</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>
+                        <property>
+                            <name>tests.openjpa.allowfailure</name>
+                            <value>${tests.openjpa.allowfailure}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+        </build>
+        </profile>
 
-        <!-- Profile for testing with Apache Derby -->
+        <!-- Default profile for testing with embedded Apache Derby -->
         <profile>
+            <!--
+                Optionally, you can override the following properties:
+                    -Dderby.version=10.2.2.0
+            -->
             <id>test-derby</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property><name>test-derby</name></property>
+                <property>
+                    <name>test-derby</name>
+                </property>
             </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.derby</groupId>
                     <artifactId>derby</artifactId>
+                    <version>${derby.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -71,21 +115,66 @@
             </properties>
         </profile>
 
+        <!-- Profile for testing with Apache Derby network server -->
+        <profile>
+            <!--
+                Example Derby Network Server profile.
+                You must manually start a Derby network server instance and
+                also set the following properties:
+                    -Dopenjpa.derbynet.url=jdbc:derby://<HOST>:<PORT>/<DBNAME>;\
+                    	create=true
+
+                Optionally, you can override the following properties:
+                    -Dopenjpa.derbynet.driver=org.apache.derby.jdbc.ClientXADataSource
+                    -Dopenjpa.derbynet.username=
+                    -Dopenjpa.derbynet.password=
+                    -Dderby.version=10.2.2.0
+            -->
+            <id>test-derbynet</id>
+            <activation>
+                <property><name>test-derbynet</name></property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derbyclient</artifactId>
+                    <version>${derby.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <openjpa.derbynet.url>jdbc:derby://localhost:1527/openjpa12;create=true;traceDirectory=target;traceFile=derby.log</openjpa.derbynet.url>
+                <openjpa.derbynet.driver>org.apache.derby.jdbc.ClientDriver</openjpa.derbynet.driver>
+                <!-- Note: commons-dbcp requires dummy values for uid/pwd -->
+                <openjpa.derbynet.username>uid</openjpa.derbynet.username>
+                <openjpa.derbynet.password>pwd</openjpa.derbynet.password>
+                <connection.driver.name>${openjpa.derbynet.driver}</connection.driver.name>
+                <connection.url>${openjpa.derbynet.url}</connection.url>
+                <connection.username>${openjpa.derbynet.username}</connection.username>
+                <connection.password>${openjpa.derbynet.password}</connection.password>
+            </properties>
+        </profile>
+
         <!-- Profile for testing with HSQL DB -->
         <profile>
             <id>test-hsqldb</id>
-            <activation><property><name>test-hsqldb</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-hsqldb</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>hsqldb</groupId>
                     <artifactId>hsqldb</artifactId>
-                    <version>1.8.0.7</version>
+                    <version>${hsqldb.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
-             <properties>
+            <properties>
                 <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
-                <connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>
+                <!--<connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>-->
+                <connection.url>jdbc:hsqldb:mem:openjpa12-hsqldb-database</connection.url>
                 <connection.username>sa</connection.username>
                 <connection.password />
             </properties>
@@ -94,12 +183,17 @@
         <!-- Profile for testing with MySQL DB -->
         <profile>
             <id>test-mysql</id>
-            <activation><property><name>test-mysql</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-mysql</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>mysql</groupId>
                     <artifactId>mysql-connector-java</artifactId>
-                    <version>5.1.6</version>
+                    <version>${mysql.version}</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
@@ -107,42 +201,127 @@
                 <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>
 
         <!-- Profile for testing with PostgreSQL DB -->
         <profile>
             <id>test-postgresql</id>
-            <activation><property><name>test-postgresql</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-postgresql</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>postgresql</groupId>
                     <artifactId>postgresql</artifactId>
-                    <version>8.1-407.jdbc3</version>
+                    <version>${postgresql.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <postgresql.version>8.4-701.jdbc3</postgresql.version>
                 <connection.driver.name>org.postgresql.Driver</connection.driver.name>
                 <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>
+
+        <!-- Profile for testing with SQLServer DB using MS JDBC driver -->
+        <profile>
+            <!--
+                Example MS SQL profile. You can use this profile if you:
+                1) have the MS SQL artifacts installed in a local repo and
+                supply the URL:
+                    -Dmssql.maven.repo=http://my.local.repo
+                2) have a copy of the MS SQL JDBC driver from:
+                    http://msdn.microsoft.com/en-us/data/aa937724.aspx
+                and run the following commands :
+                    mvn install:install-file -Dfile=${path to sqljdbc.jar} \
+                                             -DgroupId=com.microsoft.sqlserver \
+                                             -DartifactId=sqljdbc \
+                                             -Dversion=2.0 \
+                                             -Dpackaging=jar
+
+                You must also set the following properties:
+                    -Dopenjpa.mssql.url=jdbc:sqlserver://<HOST>:<PORT>;\
+                    	DataBaseName=<DBNAME>
+                    -Dopenjpa.mssql.username=<mssql_uid>
+                    -Dopenjpa.mssql.password=<mssql_pwd>
+
+                Optionally, you can override the default groupId and version
+                by also supplying the following properties:
+                    -Dmssql.groupid=com.microsoft.sqlserver
+                    -Dmssql.version=2.0
+            -->
+            <id>test-mssql</id>
+            <activation>
+                <property>
+                    <name>test-mssql</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${mssql.groupid}</groupId>
+                    <artifactId>${mssql.artifactid}</artifactId>
+                    <version>${mssql.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <mssql.maven.repo>http://not.real.repository</mssql.maven.repo>
+                <mssql.groupid>com.microsoft.sqlserver</mssql.groupid>
+                <mssql.artifactid>sqljdbc</mssql.artifactid>
+                <mssql.version>2.0</mssql.version>
+                <connection.driver.name>com.microsoft.sqlserver.jdbc.SQLServerDriver</connection.driver.name>
+                <connection.url>${openjpa.mssql.url}</connection.url>
+                <connection.username>${openjpa.mssql.username}</connection.username>
+                <connection.password>${openjpa.mssql.password}</connection.password>
             </properties>
+            <repositories>
+                <repository>
+                    <id>mssql.repository</id>
+                    <name>MSSQL Repository</name>
+                    <url>${mssql.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 with SQLServer DB using the jTDS driver -->
         <profile>
             <id>test-sqlserver</id>
-            <activation><property><name>test-sqlserver</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-sqlserver</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>net.sourceforge.jtds</groupId>
                     <artifactId>jtds</artifactId>
-                    <version>1.2</version>
+                    <version>${jtds.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <jtds.version>1.2</jtds.version>
                 <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.sqlserver.url}</connection.url>
                 <connection.username>${openjpa.sqlserver.username}</connection.username>
@@ -153,22 +332,52 @@
         <!-- Profile for testing with Sybase DB using the jTDS driver -->
         <profile>
             <id>test-sybase</id>
-            <activation><property><name>test-sybase</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-sybase</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>net.sourceforge.jtds</groupId>
                     <artifactId>jtds</artifactId>
-                    <version>1.2</version>
+                    <version>${jtds.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <jtds.version>1.2</jtds.version>
                 <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.sybase.url}</connection.url>
                 <connection.username>${openjpa.sybase.username}</connection.username>
                 <connection.password>${openjpa.sybase.password}</connection.password>
             </properties>
         </profile>
+        
+        <!-- Profile for testing with Ingres DB -->
+        <profile>
+            <id>test-ingres</id>
+            <activation>
+                <property>
+                    <name>test-ingres</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.ingres.jdbc</groupId>
+                    <artifactId>iijdbc</artifactId>
+                    <version>${ingres.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <ingres.version>9.2-3.4.8</ingres.version>
+                <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name>
+                <connection.url>${openjpa.ingres.url}</connection.url>
+                <connection.username>${openjpa.ingres.username}</connection.username>
+                <connection.password>${openjpa.ingres.password}</connection.password>
+            </properties>
+        </profile>
 
         <!-- Profile for testing with a custom DB using a system jar -->
         <!--
@@ -182,7 +391,11 @@
         -->
         <profile>
             <id>test-custom</id>
-            <activation><property><name>test-custom</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-custom</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>openjpa.customdriver</groupId>
@@ -218,7 +431,11 @@
         -->
         <profile>
             <id>test-custom2</id>
-            <activation><property><name>test-custom2</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-custom2</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>openjpa.customdriver1</groupId>
@@ -253,7 +470,7 @@
                 Example db2 profile. You can use this profile if you:
                 1) have the DB2 artifacts installed in a local repo and supply
                 the URL:
-                    -Ddb2.maven.repo=http://my.local.repo
+	            -Ddb2.maven.repo=http://my.local.repo
                 2) have a copy of the DB2 JCC driver and run the following
                 commands :
                     mvn install:install-file -Dfile=${path to db2jcc.jar} \
@@ -261,7 +478,7 @@
                                              -DartifactId=jcc-driver \
                                              -Dversion=9.5 \
                                              -Dpackaging=jar
-
+                                         
                     mvn install:install-file -Dfile=${path to db2jcc_license.jar} \
                                              -DgroupId=com.ibm.db2 \
                                              -DartifactId=jcc-license \
@@ -273,22 +490,30 @@
                     -Dopenjpa.db2.username=<db2_uid>
                     -Dopenjpa.db2.password=<db2_pwd>
 
-                Optionally, you can override the default DB2 groupId and version
-                by also supplying the following properties:
+                Optionally, you can override the default DB2 groupId,
+                artifactIds and version by also supplying the following
+                properties:
                     -Ddb2.groupid=com.ibm.db2
+                    -Dids.driver.artifactid=jcc-driver
+                    -Dids.license.artifactid=jcc-license
                     -Ddb2.version=9.5
             -->
             <id>test-db2-jcc</id>
+            <activation>
+                <property>
+                    <name>test-db2-jcc</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>${db2.groupid}</groupId>
-                    <artifactId>jcc-driver</artifactId>
+                    <artifactId>${db2.driver.artifactid}</artifactId>
                     <version>${db2.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${db2.groupid}</groupId>
-                    <artifactId>jcc-license</artifactId>
+                    <artifactId>${db2.license.artifactid}</artifactId>
                     <version>${db2.version}</version>
                     <scope>test</scope>
                 </dependency>
@@ -296,6 +521,8 @@
             <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>
                 <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
                 <connection.url>${openjpa.db2.url}</connection.url>
@@ -318,12 +545,146 @@
                 </repository>
             </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/openjpa12</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>
+            <!-- 
+                Example Informix JCC profile. You can use this profile if you:
+                1a) have the DB2 JCC artifacts installed in a local repo and 
+                supply the URL:
+	            -Dids.maven.repo=http://my.local.repo
+                1b) or have a copy of the DB2 JCC driver and run the commands
+                listed above in the test-db2-jcc profile.
+		2) have the DRDA service enabled on the IDS server, which
+                is usually port 9089
+
+                You must also set the following properties:
+                    -Dopenjpa.ids.url=jdbc:ids://<HOST>:<PORT>/<DBNAME>
+                    -Dopenjpa.ids.username=<ids_uid>
+                    -Dopenjpa.ids.password=<ids_pwd>
+
+                Optionally, you can override the default DB2 JCC groupId,
+                artifactIds and version by also supplying the following
+                properties:
+                    -Dids.groupid=com.ibm.db2
+                    -Dids.driver.artifactid=jcc-driver
+                    -Dids.license.artifactid=jcc-license
+                    -Dids.version=9.5
+            -->
+            <id>test-ids-jcc</id>
+            <activation>
+                <property>
+                    <name>test-ids-jcc</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${ids.groupid}</groupId>
+                    <artifactId>${ids.driver.artifactid}</artifactId>
+                    <version>${ids.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${ids.groupid}</groupId>
+                    <artifactId>${ids.license.artifactid}</artifactId>
+                    <version>${ids.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <ids.maven.repo>http://not.a.real.repository</ids.maven.repo>
+                <ids.groupid>com.ibm.db2</ids.groupid>
+                <ids.driver.artifactid>jcc-driver</ids.driver.artifactid>
+                <ids.license.artifactid>jcc-license</ids.license.artifactid>
+                <ids.version>9.5</ids.version>
+                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
+                <connection.url>${openjpa.ids.url}</connection.url>
+                <connection.username>${openjpa.ids.username}</connection.username>
+                <connection.password>${openjpa.ids.password}</connection.password>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>ids.repository</id>
+                    <name>Informix Repository</name>
+                    <url>${ids.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 with Oracle DB -->
         <profile>
             <!-- 
                 Example oracle profile. You can use this profile if you:
                 1) have the Oracle artifacts installed in a local repo and
                 supply the URL:
-                    -Doracle.maven.repo=http://my.local.repo
+	            -Doracle.maven.repo=http://my.local.repo
                 2) have a copy of the Oracle driver and run the following
                 command:
                     mvn install:install-file -Dfile=${path to ojdbc.jar} \
@@ -331,7 +692,7 @@
                                              -DartifactId=jdbc-driver \
                                              -Dversion=10g \
                                              -Dpackaging=jar
-
+                                         
                 You must also set the following properties:
                     -Dopenjpa.oracle.url
                     -Dopenjpa.oracle.username
@@ -343,10 +704,15 @@
                     -Doracle.version=10g
             -->
             <id>test-oracle</id>
+            <activation>
+                <property>
+                    <name>test-oracle</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>${oracle.groupid}</groupId>
-                    <artifactId>jdbc-driver</artifactId>
+                    <artifactId>${oracle.artifactid}</artifactId>
                     <version>${oracle.version}</version>
                     <scope>test</scope>
                 </dependency>
@@ -354,6 +720,7 @@
             <properties>
                 <oracle.maven.repo>http://not.a.real.repository</oracle.maven.repo>
                 <oracle.groupid>com.oracle</oracle.groupid>
+                <oracle.artifactid>jdbc-driver</oracle.artifactid>
                 <oracle.version>10g</oracle.version>
                 <connection.driver.name>oracle.jdbc.driver.OracleDriver</connection.driver.name>
                 <connection.url>${openjpa.oracle.url}</connection.url>
@@ -376,20 +743,19 @@
                 </repository>
             </repositories>
         </profile>  
+          
     </profiles>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -406,7 +772,19 @@
             <artifactId>jakarta-regexp</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Required for org.apache.openjpa.persistence.xmlmapping tests -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -423,6 +801,7 @@
                                     <property name="outdir" value="${project.build.outputDirectory}" />
                                     <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
                                     <property name="openjpa.Log" value="${openjpa.Log}" /> 
+                                    <property name="build.enhance" value="${build.enhance}" />
                                 </ant>
                             </tasks>
                         </configuration>
@@ -436,7 +815,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>${test.jvm.arguments}</argLine>
+                    <argLine>${surefire.jvm.args}</argLine>
                     <excludes>
                         <!-- exclude classes that end with 'Test'; these 
                              are not test cases per OpenJPA standards -->
@@ -601,7 +980,12 @@
                         <exclude>org/apache/openjpa/persistence/meta/TestSequenceAssigned.java</exclude>
                         <exclude>org/apache/openjpa/persistence/meta/TestValueStrategies.java</exclude>
                         <exclude>org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java</exclude>
-                  
+                        
+                        <!-- TestPMMemory creates heapdumps etc and there's no real asserts within the test.  -->
+                        <exclude>org/apache/openjpa/persistence/kernel/TestPMMemory.java</exclude>
+
+                        <!-- TestEJBTransactionalClass tests nothing -->
+                        <exclude>org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java</exclude>
                     </excludes>
                     <systemProperties>
                         <property>
@@ -628,6 +1012,10 @@
                             <name>openjpa.ConnectionProperties</name>
                             <value>DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
                         </property>
+                        <property>
+                            <name>tests.openjpa.allowfailure</name>
+                            <value>${tests.openjpa.allowfailure}</value>
+                        </property>
                     </systemProperties>
                 </configuration>
             </plugin>

Modified: openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java (original)
+++ openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java Fri Sep 17 19:41:45 2010
@@ -159,7 +159,6 @@ public class TestBadJdbcUrl extends Test
 		assertNotNull(actual);
 		Class actualType = actual.getClass();
 		if (!targetType.isAssignableFrom(actualType)) {
-			actual.printStackTrace();
 			fail(targetType.getName() + " is not assignable from "
 					+ actualType.getName());
 		}
@@ -178,7 +177,6 @@ public class TestBadJdbcUrl extends Test
 					nested     = next;
 				}
 			}
-			actual.printStackTrace();
 			fail("No nested type " + nestedTargetType + " in " + actual);
 		}
 	}

Added: openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java?rev=998283&view=auto
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java (added)
+++ openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java Fri Sep 17 19:41:45 2010
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+package org.apache.openjpa.enhance;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.openjpa.meta.MetaDataRepository;
+
+/**
+ * A simple metadata repository wrapper which removes selected types
+ * from the set of names returned by getPersistentTypeNames. 
+ * This MDR provides a simple method to skip extraneous and more important, 
+ * purposefully erroneous classes during enhancement.  This 
+ * especially useful in the case where all pu's are enhanced generically,
+ * automatically picking up all entities in the classpath.
+ */
+@SuppressWarnings("serial")
+public class RestrictedMetaDataRepository extends MetaDataRepository {
+
+    private Set<String> _excludedTypes = new HashSet<String>();
+    
+    public String getExcludedTypes() {
+        return _excludedTypes.toString();
+    }
+    
+    public void setExcludedTypes(String types) {
+        StringTokenizer strTok = new StringTokenizer(types,";");
+        while (strTok.hasMoreTokens()) {
+            _excludedTypes.add(strTok.nextToken());
+        }
+    }
+    
+    public Set<String> getPersistentTypeNames(boolean devpath, ClassLoader envLoader) {
+        Set<String> types = super.getPersistentTypeNames(devpath, envLoader);
+        String[] typeArray = types.toArray(new String[types.size()]);
+        for (String type : typeArray) {
+            if(_excludedTypes.contains(type)) {
+                types.remove(type);
+            }
+        }
+        return types;
+    }
+}

Propchange: openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java (original)
+++ openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java Fri Sep 17 19:41:45 2010
@@ -21,6 +21,7 @@ package org.apache.openjpa.enhance;
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -35,6 +36,11 @@ public class TestDataCachingAndUnenhance
     }
 
     public void testSimpleDataCacheOperation() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+			return;
+		}
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         em.persist(new UnenhancedIdentityIdPropertyAccess());
@@ -43,6 +49,12 @@ public class TestDataCachingAndUnenhance
     }
 
     public void testAccessIdBeforeCommit() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+            return;
+        }
+
         OpenJPAEntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         UnenhancedIdentityIdPropertyAccess o =
@@ -52,4 +64,4 @@ public class TestDataCachingAndUnenhance
         em.getTransaction().commit();
         em.close();
     }
-}
\ No newline at end of file
+}

Modified: openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java (original)
+++ openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java Fri Sep 17 19:41:45 2010
@@ -31,6 +31,8 @@ import org.apache.openjpa.lib.util.Bytec
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.meta.MetaDataRepository;
+import org.apache.openjpa.persistence.jdbc.annotations.UnenhancedInappropriateTransient;
+import org.apache.openjpa.persistence.jdbc.annotations.UnenhancedMixedAccess;
 import org.apache.openjpa.persistence.test.PersistenceTestCase;
 import serp.bytecode.BCClass;
 import serp.bytecode.Project;
@@ -139,6 +141,15 @@ public class TestEnhancementWithMultiple
         };
 
         opts = new Options();
+        // Use a restricted mdr.  This mdr will not hand out metadata for excluded
+        // types.  These are types that have known issues and should not be enhanced.
+        // This test tries to enhance all persistent types in the classpath and that
+        // can be problematic for tests which include entities that this test should
+        // not attempt to enhance.
+        opts.setProperty("MetaDataRepository", 
+            "org.apache.openjpa.enhance.RestrictedMetaDataRepository(ExcludedTypes=" +
+            UnenhancedMixedAccess.class.getCanonicalName() + ";" +
+            UnenhancedInappropriateTransient.class.getCanonicalName() +  ")");
         opts.put(PCEnhancer.class.getName() + "#bytecodeWriter", writer);
         PCEnhancer.run(null, opts);
 

Modified: openjpa/branches/1.2.x/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence/pom.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-persistence/pom.xml Fri Sep 17 19:41:45 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-persistence</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA JPA</name>
-    <description>OpenJPA JPA</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>1.2.3-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>
@@ -44,16 +47,4 @@
             <artifactId>geronimo-jpa_1.0_spec</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: openjpa/branches/1.2.x/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/assembly.xml?rev=998283&r1=998282&r2=998283&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-project/assembly.xml (original)
+++ openjpa/branches/1.2.x/openjpa-project/assembly.xml Fri Sep 17 19:41:45 2010
@@ -29,6 +29,8 @@
             <outputDirectory>/</outputDirectory>
         </fileSet>
         <fileSet>
+            <directory>..</directory>
+            <outputDirectory>/</outputDirectory>
             <includes>
                 <include>README</include>
                 <include>DISCLAIMER</include>
@@ -93,9 +95,11 @@
                 <include>commons-lang:commons-lang</include>
                 <include>commons-collections:commons-collections</include>
                 <include>commons-pool:commons-pool</include>
+                <include>commons-logging:commons-logging</include>
 
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jpa_1.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
             </includes>
         </dependencySet>
     </dependencySets>

Added: openjpa/branches/1.2.x/openjpa-project/checkstyle.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/checkstyle.xml?rev=998283&view=auto
==============================================================================
--- openjpa/branches/1.2.x/openjpa-project/checkstyle.xml (added)
+++ openjpa/branches/1.2.x/openjpa-project/checkstyle.xml Fri Sep 17 19:41:45 2010
@@ -0,0 +1,37 @@
+<?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.2.x/openjpa-project/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message