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 @@ + -Release Notes for OpenJPA 1.2.2 +Release Notes for OpenJPA 1.2.3 -

Release Notes for OpenJPA 1.2.2

+

Release Notes for OpenJPA 1.2.3

-

JIRA Issues Fixed in this release

- -

Sub-task -

-
- -

Bug -

- - -

Improvement -

- - -

Test -

- +
+
+

Release Notes

+ +
+

OpenJPA 1.2.3

+ -

Previous Releases -

+

Previous Releases

Release notes for earlier releases of OpenJPA may be found in SVN at the following locations. +
  • OpenJPA 1.2.2 RELEASE-NOTES.html
  • OpenJPA 1.2.1 RELEASE-NOTES.html
  • OpenJPA 1.2.0 RELEASE-NOTES.html
  • 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. --> + 4.0.0 - org.apache.openjpa - openjpa-examples - jar - OpenJPA Persistence Examples - OpenJPA Persistence Examples - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 1.2.3-SNAPSHOT + + org.apache.openjpa + openjpa-examples + jar + OpenJPA Examples + OpenJPA Examples + + + DefaultLevel=WARN + + org.apache.openjpa openjpa-persistence-jdbc - ${pom.version} - compile + ${project.version} org.apache.derby @@ -57,14 +63,27 @@ test + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + none + + jar + + + + org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 4.0.0 - examples - pom - OpenJPA Examples Integration Tests + org.apache.openjpa openjpa-integration 1.2.3-SNAPSHOT + org.apache.openjpa + openjpa-integration-examples + pom + OpenJPA Integration Tests - Examples + OpenJPA Integration Tests - Examples + examples-profile @@ -58,9 +63,10 @@ Running OpenJPA Examples + - + @@ -93,7 +99,7 @@ org.apache.openjpa openjpa - ${pom.version} + ${project.version} 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. --> + 4.0.0 - openjpa-integration - pom - OpenJPA Integration Tests + org.apache.openjpa openjpa-parent 1.2.3-SNAPSHOT + + org.apache.openjpa + openjpa-integration + pom + OpenJPA Integration Tests + examples tck + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + true + + + + 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. --> + 4.0.0 - tck - pom - OpenJPA JPA TCK Integration Tests + org.apache.openjpa openjpa-integration 1.2.3-SNAPSHOT + org.apache.openjpa + openjpa-integration-tck + pom + OpenJPA Integration Tests - JPA TCK + OpenJPA Integration Tests - JPA TCK + + + DefaultLevel=WARN + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + true + + + + + tck-profile @@ -101,7 +123,6 @@ - @@ -114,11 +135,12 @@ - + + @@ -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) @@ -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} + Update directory paths if running on Windows @@ -178,6 +201,10 @@ databaseName=${db.name} + + + + @@ -200,7 +227,7 @@ databaseName=${db.name} - + @@ -234,10 +261,21 @@ databaseName=${db.name} Logging JPA TCK output to ${tck.log} + Calling TCK initdb.xml + TCK initdb.xml returned result=${tsant.result} + Calling TCK build.xml + TCK build.xml returned result=${tsant.result} + + + + + + + Results archive at: ${tck.results.archive} JPA TCK Passed 100%! - - - Results archive at: ${tck.results.archive} - - - - - run - - - + + + + run + + + - - - + + + + org.apache.geronimo.specs geronimo-jpa_1.0_spec 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. --> + 4.0.0 - org.apache.openjpa - openjpa-jdbc - jar - OpenJPA JDBC - OpenJPA JDBC - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 1.2.3-SNAPSHOT + + org.apache.openjpa + openjpa-jdbc + jar + OpenJPA JDBC + OpenJPA JDBC + org.apache.openjpa openjpa-kernel - ${pom.version} - compile + ${project.version} javax.xml.bind jaxb-api + provided + true + + + com.sun.xml.bind + jaxb-impl + provided + true hsqldb hsqldb - compile + provided postgresql postgresql - 8.1-407.jdbc3 + 8.4-701.jdbc3 + provided + + + ant + ant + provided - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - 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. --> + 4.0.0 - org.apache.openjpa - openjpa-kernel - jar - OpenJPA Kernel - OpenJPA Kernel - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 1.2.3-SNAPSHOT + + org.apache.openjpa + openjpa-kernel + jar + OpenJPA Kernel + OpenJPA Kernel + org.apache.openjpa openjpa-lib - ${pom.version} - compile + ${project.version} org.apache.geronimo.specs geronimo-jms_1.1_spec - compile org.apache.geronimo.specs geronimo-jta_1.1_spec - compile commons-pool commons-pool - compile com.ibm.websphere @@ -61,7 +60,13 @@ 0.0.1 provided + + ant + ant + provided + + @@ -144,14 +149,38 @@ org.apache.maven.plugins maven-jar-plugin - - - **/com/ibm/** - - + + + default-jar + + jar + + + + **/com/ibm/** + + + + true + + + ${buildNumber} + org.apache.openjpa.enhance.InstrumentationFactory + + + + + + attach-tests + + test-jar + + + + + 4.0.0 - org.apache.openjpa - openjpa-lib - jar - OpenJPA Utilities - OpenJPA Utilities - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 1.2.3-SNAPSHOT + + org.apache.openjpa + openjpa-lib + jar + OpenJPA Utilities Library + OpenJPA Utilities Library + jakarta-regexp @@ -42,34 +45,32 @@ commons-logging commons-logging - compile + provided log4j log4j - compile + provided commons-lang commons-lang - compile ant ant - compile + provided commons-collections commons-collections - compile net.sourceforge.serp serp - compile + + 4.0.0 - org.apache.openjpa - openjpa-persistence-jdbc - jar - OpenJPA JPA JDBC - OpenJPA JPA JDBC - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 1.2.3-SNAPSHOT - - DefaultLevel=INFO - - -Xmx500m - 10 - 5 - 2 - 10000 - MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait} - 6 - 5 - + + org.apache.openjpa + openjpa-persistence-jdbc + jar + OpenJPA Persistence JDBC + OpenJPA Persistence JDBC + + + + test-dynamic-enhancer + + + false + + + false + -Dopenjpa.RuntimeUnenhancedClasses=unsupported ${test.jvm.arguments} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${surefire.jvm.args} + + org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java + + + + openjpa.Log + ${openjpa.Log} + + + openjpa.ConnectionDriverName + org.apache.commons.dbcp.BasicDataSource + + + derby.stream.error.file + target/derby.log + + + openjpa.ConnectionProperties + DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args} + + + tests.openjpa.allowfailure + ${tests.openjpa.allowfailure} + + + + + + + - + + test-derby true - test-derby + + test-derby + org.apache.derby derby + ${derby.version} test @@ -71,21 +115,66 @@ + + + + test-derbynet + + test-derbynet + + + + org.apache.derby + derbyclient + ${derby.version} + test + + + + jdbc:derby://localhost:1527/openjpa12;create=true;traceDirectory=target;traceFile=derby.log + org.apache.derby.jdbc.ClientDriver + + uid + pwd + ${openjpa.derbynet.driver} + ${openjpa.derbynet.url} + ${openjpa.derbynet.username} + ${openjpa.derbynet.password} + + + test-hsqldb - test-hsqldb + + + test-hsqldb + + hsqldb hsqldb - 1.8.0.7 + ${hsqldb.version} test - + org.hsqldb.jdbcDriver - jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true + + jdbc:hsqldb:mem:openjpa12-hsqldb-database sa @@ -94,12 +183,17 @@ test-mysql - test-mysql + + + test-mysql + + mysql mysql-connector-java - 5.1.6 + ${mysql.version} + test @@ -107,42 +201,127 @@ ${openjpa.mysql.url} ${openjpa.mysql.username} ${openjpa.mysql.password} + + 0 + 0 test-postgresql - test-postgresql + + + test-postgresql + + postgresql postgresql - 8.1-407.jdbc3 + ${postgresql.version} test + 8.4-701.jdbc3 org.postgresql.Driver ${openjpa.postgresql.url} ${openjpa.postgresql.username} ${openjpa.postgresql.password} + + 0 + 0 + 20 + + + + + + + test-mssql + + + test-mssql + + + + + ${mssql.groupid} + ${mssql.artifactid} + ${mssql.version} + test + + + + http://not.real.repository + com.microsoft.sqlserver + sqljdbc + 2.0 + com.microsoft.sqlserver.jdbc.SQLServerDriver + ${openjpa.mssql.url} + ${openjpa.mssql.username} + ${openjpa.mssql.password} + + + mssql.repository + MSSQL Repository + ${mssql.maven.repo} + default + + false + + + true + ignore + + + test-sqlserver - test-sqlserver + + + test-sqlserver + + net.sourceforge.jtds jtds - 1.2 + ${jtds.version} test + 1.2 net.sourceforge.jtds.jdbc.Driver ${openjpa.sqlserver.url} ${openjpa.sqlserver.username} @@ -153,22 +332,52 @@ test-sybase - test-sybase + + + test-sybase + + net.sourceforge.jtds jtds - 1.2 + ${jtds.version} test + 1.2 net.sourceforge.jtds.jdbc.Driver ${openjpa.sybase.url} ${openjpa.sybase.username} ${openjpa.sybase.password} + + + + test-ingres + + + test-ingres + + + + + com.ingres.jdbc + iijdbc + ${ingres.version} + test + + + + 9.2-3.4.8 + com.ingres.jdbc.IngresDriver + ${openjpa.ingres.url} + ${openjpa.ingres.username} + ${openjpa.ingres.password} + + test-custom - test-custom + + + test-custom + + openjpa.customdriver @@ -218,7 +431,11 @@ --> test-custom2 - test-custom2 + + + test-custom2 + + openjpa.customdriver1 @@ -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= -Dopenjpa.db2.password= - 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 --> test-db2-jcc + + + test-db2-jcc + + ${db2.groupid} - jcc-driver + ${db2.driver.artifactid} ${db2.version} test ${db2.groupid} - jcc-license + ${db2.license.artifactid} ${db2.version} test @@ -296,6 +521,8 @@ http://not.a.real.repository com.ibm.db2 + jcc-driver + jcc-license 9.5 com.ibm.db2.jcc.DB2Driver ${openjpa.db2.url} @@ -318,12 +545,146 @@ + + + + test-derbyjcc + + + test-derbyjcc + + + + + ${db2.groupid} + ${db2.driver.artifactid} + ${db2.version} + test + + + ${db2.groupid} + ${db2.license.artifactid} + ${db2.version} + test + + + + http://not.a.real.repository + com.ibm.db2 + jcc-driver + jcc-license + 9.5 + + jdbc:db2://localhost:1527/openjpa12 + + uid + pwd + com.ibm.db2.jcc.DB2Driver + ${openjpa.derbyjcc.url} + ${openjpa.derbyjcc.username} + ${openjpa.derbyjcc.password} + + + + db2.repository + DB2 Repository + ${db2.maven.repo} + default + + false + + + true + ignore + + + + + + + + + test-ids-jcc + + + test-ids-jcc + + + + + ${ids.groupid} + ${ids.driver.artifactid} + ${ids.version} + test + + + ${ids.groupid} + ${ids.license.artifactid} + ${ids.version} + test + + + + http://not.a.real.repository + com.ibm.db2 + jcc-driver + jcc-license + 9.5 + com.ibm.db2.jcc.DB2Driver + ${openjpa.ids.url} + ${openjpa.ids.username} + ${openjpa.ids.password} + + + + ids.repository + Informix Repository + ${ids.maven.repo} + default + + false + + + true + ignore + + + + + + test-oracle + + + test-oracle + + ${oracle.groupid} - jdbc-driver + ${oracle.artifactid} ${oracle.version} test @@ -354,6 +720,7 @@ http://not.a.real.repository com.oracle + jdbc-driver 10g oracle.jdbc.driver.OracleDriver ${openjpa.oracle.url} @@ -376,20 +743,19 @@ + org.apache.openjpa openjpa-jdbc - ${pom.version} - compile + ${project.version} org.apache.openjpa openjpa-persistence - ${pom.version} - compile + ${project.version} commons-dbcp @@ -406,7 +772,19 @@ jakarta-regexp test + + + javax.xml.bind + jaxb-api + test + + + com.sun.xml.bind + jaxb-impl + test + + @@ -423,6 +801,7 @@ + @@ -436,7 +815,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${test.jvm.arguments} + ${surefire.jvm.args} @@ -601,7 +980,12 @@ org/apache/openjpa/persistence/meta/TestSequenceAssigned.java org/apache/openjpa/persistence/meta/TestValueStrategies.java org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java - + + + org/apache/openjpa/persistence/kernel/TestPMMemory.java + + + org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java @@ -628,6 +1012,10 @@ openjpa.ConnectionProperties DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args} + + tests.openjpa.allowfailure + ${tests.openjpa.allowfailure} + 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 _excludedTypes = new HashSet(); + + 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 getPersistentTypeNames(boolean devpath, ClassLoader envLoader) { + Set 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. --> + 4.0.0 - org.apache.openjpa - openjpa-persistence - jar - OpenJPA JPA - OpenJPA JPA - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 1.2.3-SNAPSHOT + + org.apache.openjpa + openjpa-persistence + jar + OpenJPA Persistence + OpenJPA Persistence + org.apache.openjpa @@ -44,16 +47,4 @@ geronimo-jpa_1.0_spec - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - 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 @@ / + .. + / README DISCLAIMER @@ -93,9 +95,11 @@ commons-lang:commons-lang commons-collections:commons-collections commons-pool:commons-pool + commons-logging:commons-logging org.apache.geronimo.specs:geronimo-jta_1.1_spec org.apache.geronimo.specs:geronimo-jpa_1.0_spec + org.apache.geronimo.specs:geronimo-jms_1.1_spec 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 @@ + + + + + + + + + + + + + + Propchange: openjpa/branches/1.2.x/openjpa-project/checkstyle.xml ------------------------------------------------------------------------------ svn:eol-style = native