You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2026/08/20 09:14:55 UTC

(openjpa) 01/01: Merge pull request #144 from apache/OPENJPA-2940

This is an automated email from the ASF dual-hosted git repository.

cristof pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git

commit 5e6518eca5a4472e03285469475958dfb2f9e446
Merge: 25afc6770 ba40303b5
Author: Paulo Cristovão de Araújo Silva Filho <pc...@gmail.com>
AuthorDate: Thu Aug 20 06:14:41 2026 -0300

    Merge pull request #144 from apache/OPENJPA-2940
    
    Implements Jakarta Persistence 3.2. Some issues where left to be fixed under OPENJPA-2945.

 .github/workflows/ci.yml                           |   29 +-
 .github/workflows/pr-validation.yml                |   23 +-
 .gitignore                                         |    4 +
 README.adoc                                        |    2 +-
 openjpa-all/pom.xml                                |    2 +-
 openjpa-examples/image-gallery/pom.xml             |    2 +-
 openjpa-examples/openbooks/pom.xml                 |   27 +-
 .../src/main/java/jpa/tools/swing/SwingHelper.java |    3 +-
 .../java/openbook/client/SourceCodeBrowser.java    |    3 +-
 .../openjpa/trader/client/ServerLogPanel.java      |    2 +-
 openjpa-examples/pom.xml                           |    2 +-
 openjpa-examples/simple/pom.xml                    |    2 +-
 openjpa-features/pom.xml                           |    2 +-
 openjpa-integration/daytrader/pom.xml              |   29 +-
 .../openjpa/integration/daytrader/TradeAction.java |    5 +-
 openjpa-integration/examples/pom.xml               |    2 +-
 openjpa-integration/jmx/pom.xml                    |    3 +-
 openjpa-integration/pom.xml                        |    2 +-
 openjpa-integration/slf4j/pom.xml                  |   39 +-
 openjpa-integration/tck/README.md                  |  132 ++
 openjpa-integration/tck/pom.xml                    |  493 +---
 openjpa-integration/tck/run-tck32.sh               |  227 ++
 openjpa-integration/tck/sql/create.openjpa.sql.xml |   65 -
 openjpa-integration/tck/sql/db2.sql                |  207 --
 openjpa-integration/tck/sql/derby.sql              |   36 -
 openjpa-integration/tck/tck2-20091209.xml          |  411 ----
 openjpa-integration/tck/tck2-20101205.xml          |  377 ---
 openjpa-integration/tck/tck2-20110815.xml          |  443 ----
 openjpa-integration/tck/tck32-openjpa-profile.xml  |   79 +
 .../tck/windows-replacefilter.properties           |   18 -
 openjpa-integration/validation/pom.xml             |    2 +-
 .../persistence/provider/DummyProvider1.java       |    7 +
 .../persistence/provider/DummyProvider2.java       |    7 +
 .../provider/TestPersistenceProviderResolver.java  |   21 +-
 .../validation/TestTraversableResolver.java        |   15 +-
 openjpa-jdbc/pom.xml                               |    6 +-
 .../apache/openjpa/jdbc/ant/MappingToolTask.java   |   10 +-
 .../openjpa/jdbc/ant/ReverseMappingToolTask.java   |   20 +-
 .../openjpa/jdbc/conf/JDBCConfiguration.java       |   16 +
 .../openjpa/jdbc/conf/JDBCConfigurationImpl.java   |   13 +
 .../openjpa/jdbc/conf/MappingRepositoryValue.java  |    5 +-
 .../openjpa/jdbc/identifier/DBIdentifier.java      |    7 +-
 .../jdbc/identifier/DBIdentifierUtilImpl.java      |   10 +-
 .../apache/openjpa/jdbc/identifier/Normalizer.java |    3 +-
 .../BatchingPreparedStatementManagerImpl.java      |   37 +-
 .../openjpa/jdbc/kernel/JDBCBrokerFactory.java     |  261 ++-
 .../openjpa/jdbc/kernel/JDBCStoreManager.java      |   29 +-
 .../apache/openjpa/jdbc/kernel/JDBCStoreQuery.java |  177 +-
 .../kernel/MappedQueryResultObjectProvider.java    |  138 +-
 .../apache/openjpa/jdbc/kernel/NativeJDBCSeq.java  |   11 +-
 .../jdbc/kernel/PreparedStatementManagerImpl.java  |   45 +-
 .../openjpa/jdbc/kernel/StoredProcedureQuery.java  |  112 +-
 .../java/org/apache/openjpa/jdbc/kernel/XROP.java  |   81 +-
 .../kernel/exps/BindVariableAndExpression.java     |    8 +-
 .../jdbc/kernel/exps/BindVariableExpression.java   |   51 +-
 .../apache/openjpa/jdbc/kernel/exps/Ceiling.java   |   12 +-
 .../jdbc/kernel/exps/ExtractDateTimeField.java     |   11 +-
 .../jdbc/kernel/exps/ExtractDateTimePart.java      |    1 -
 ...aturalLogarithm.java => GetNativeObjectId.java} |   36 +-
 .../openjpa/jdbc/kernel/exps/GetObjectId.java      |    2 +-
 .../jdbc/kernel/exps/JDBCExpressionFactory.java    |   47 +-
 .../exps/{ExtractDateTimePart.java => Left.java}   |   87 +-
 .../org/apache/openjpa/jdbc/kernel/exps/Lit.java   |   84 +-
 .../jdbc/kernel/exps/MatchesExpression.java        |    5 +-
 .../openjpa/jdbc/kernel/exps/NaturalLogarithm.java |   15 +-
 .../{ExtractDateTimeField.java => Replace.java}    |  121 +-
 .../exps/{ExtractDateTimePart.java => Right.java}  |   87 +-
 .../jdbc/kernel/exps/SelectConstructor.java        |    6 +-
 ...actDateTimeField.java => TypecastAsNumber.java} |   92 +-
 ...actDateTimeField.java => TypecastAsString.java} |   65 +-
 .../apache/openjpa/jdbc/kernel/exps/UnaryOp.java   |   11 +-
 .../org/apache/openjpa/jdbc/kernel/exps/Val.java   |    3 +
 .../exps/{GetObjectId.java => VersionVal.java}     |   93 +-
 .../org/apache/openjpa/jdbc/meta/ClassMapping.java |  133 ++
 .../apache/openjpa/jdbc/meta/ClassMappingInfo.java |   32 +
 .../org/apache/openjpa/jdbc/meta/FieldMapping.java |   23 +-
 .../openjpa/jdbc/meta/MappingDefaultsImpl.java     |    6 +-
 .../org/apache/openjpa/jdbc/meta/MappingInfo.java  |  143 +-
 .../openjpa/jdbc/meta/MappingRepository.java       |  180 +-
 .../org/apache/openjpa/jdbc/meta/MappingTool.java  |  142 +-
 .../openjpa/jdbc/meta/QueryResultMapping.java      |   70 +
 .../openjpa/jdbc/meta/ReverseMappingTool.java      |   23 +-
 .../jdbc/meta/strats/ConverterElementHandler.java  |  142 ++
 .../jdbc/meta/strats/ConverterValueHandler.java    |   82 +
 .../jdbc/meta/strats/EmbedFieldStrategy.java       |   45 +-
 .../jdbc/meta/strats/EmbedValueHandler.java        |  140 +-
 .../openjpa/jdbc/meta/strats/EnumValueHandler.java |  237 +-
 .../jdbc/meta/strats/FullClassStrategy.java        |   11 +
 .../HandlerHandlerMapTableFieldStrategy.java       |   52 +-
 .../HandlerRelationMapTableFieldStrategy.java      |   47 +-
 .../jdbc/meta/strats/HandlerStrategies.java        |   20 +-
 .../jdbc/meta/strats/ImmutableValueHandler.java    |   44 +
 ...onStrategy.java => InstantVersionStrategy.java} |   23 +-
 ...tegy.java => LocalDateTimeVersionStrategy.java} |   23 +-
 .../jdbc/meta/strats/RelationFieldStrategy.java    |   31 +
 .../RelationRelationMapTableFieldStrategy.java     |    4 +-
 .../jdbc/meta/strats/TimestampVersionStrategy.java |    9 +-
 .../openjpa/jdbc/meta/strats/XMLValueHandler.java  |    8 +-
 .../org/apache/openjpa/jdbc/schema/Column.java     |   28 +-
 .../org/apache/openjpa/jdbc/schema/Constraint.java |    4 +-
 .../openjpa/jdbc/schema/DataSourceFactory.java     |    6 +-
 .../openjpa/jdbc/schema/FileSchemaFactory.java     |    5 +-
 .../org/apache/openjpa/jdbc/schema/ForeignKey.java |   39 +-
 .../java/org/apache/openjpa/jdbc/schema/Index.java |   31 +
 .../org/apache/openjpa/jdbc/schema/SchemaTool.java |  291 ++-
 .../org/apache/openjpa/jdbc/schema/Schemas.java    |   14 +
 .../jdbc/schema/SimpleDriverDataSource.java        |    9 +-
 .../java/org/apache/openjpa/jdbc/schema/Table.java |    9 +
 .../openjpa/jdbc/schema/XMLSchemaParser.java       |    4 +-
 .../apache/openjpa/jdbc/sql/AbstractResult.java    |   34 +
 .../jdbc/sql/AbstractSQLServerDictionary.java      |    6 +-
 .../org/apache/openjpa/jdbc/sql/DB2Dictionary.java |   12 +-
 .../org/apache/openjpa/jdbc/sql/DBDictionary.java  |  498 ++--
 .../openjpa/jdbc/sql/DBDictionaryFactory.java      |   17 +-
 .../apache/openjpa/jdbc/sql/DerbyDictionary.java   |    2 +-
 .../org/apache/openjpa/jdbc/sql/H2Dictionary.java  |   21 +
 .../apache/openjpa/jdbc/sql/HSQLDictionary.java    |   48 +-
 .../openjpa/jdbc/sql/InformixDictionary.java       |    4 +-
 .../org/apache/openjpa/jdbc/sql/LogicalUnion.java  |   15 +
 .../apache/openjpa/jdbc/sql/MariaDBDictionary.java |   35 +-
 .../org/apache/openjpa/jdbc/sql/MergedResult.java  |   12 +
 .../apache/openjpa/jdbc/sql/MySQLDictionary.java   |   46 +-
 .../apache/openjpa/jdbc/sql/OracleDictionary.java  |  115 +-
 .../openjpa/jdbc/sql/PostgresDictionary.java       |  356 ++-
 .../org/apache/openjpa/jdbc/sql/PrimaryRow.java    |   33 +-
 .../java/org/apache/openjpa/jdbc/sql/Result.java   |   14 +
 .../apache/openjpa/jdbc/sql/ResultSetResult.java   |   18 +
 .../openjpa/jdbc/sql/SQLServerDictionary.java      |   32 +
 .../java/org/apache/openjpa/jdbc/sql/Select.java   |   19 +
 .../org/apache/openjpa/jdbc/sql/SelectImpl.java    |  202 +-
 .../apache/openjpa/jdbc/sql/StoredProcedure.java   |   22 +-
 .../openjpa/jdbc/kernel/exps/localizer.properties  |    2 +
 .../openjpa/jdbc/meta/strats/localizer.properties  |   17 +
 .../apache/openjpa/jdbc/meta/TestSchemaTool.java   |   89 +
 .../org/apache/openjpa/jdbc/meta/testScript1       |    1 +
 .../org/apache/openjpa/jdbc/meta/testScript2       |    3 +
 .../org/apache/openjpa/jdbc/meta/testScript3       |    1 +
 .../org/apache/openjpa/jdbc/meta/testScript4       |    1 +
 .../apache/openjpa/jdbc/meta/testScriptCommented   |    2 +
 .../org/apache/openjpa/jdbc/meta/testScriptMulti1  |    4 +
 .../org/apache/openjpa/jdbc/meta/testScriptMulti2  |    6 +
 openjpa-jest/pom.xml                               |    2 +-
 .../openjpa/persistence/jest/MetamodelHelper.java  |    3 +-
 .../openjpa/persistence/jest/XMLFormatter.java     |    3 +-
 openjpa-jest/src/test/java/demo/DataLoader.java    |    6 +-
 openjpa-junit5/pom.xml                             |    2 +-
 openjpa-kernel/pom.xml                             |   10 +-
 .../abstractstore/AbstractStoreBrokerFactory.java  |    6 +-
 .../org/apache/openjpa/conf/Compatibility.java     |   23 +
 .../apache/openjpa/conf/OpenJPAConfiguration.java  |   54 +-
 .../openjpa/conf/OpenJPAConfigurationImpl.java     |  106 +-
 .../org/apache/openjpa/conf/OpenJPAVersion.java    |    8 +-
 .../openjpa/datacache/AbstractQueryCache.java      |    6 +-
 .../openjpa/datacache/ClearableScheduler.java      |    6 +-
 .../openjpa/datacache/PartitionedDataCache.java    |    7 +-
 .../apache/openjpa/ee/AutomaticManagedRuntime.java |    9 +-
 .../openjpa/ee/InvocationManagedRuntime.java       |    5 +-
 .../org/apache/openjpa/ee/WLSManagedRuntime.java   |   11 +-
 .../apache/openjpa/enhance/ApplicationIdTool.java  |    7 +-
 .../org/apache/openjpa/enhance/ClassRedefiner.java |   41 +-
 .../openjpa/enhance/InstrumentationFactory.java    |   67 +-
 .../openjpa/enhance/ManagedClassSubclasser.java    |   71 +-
 .../openjpa/enhance/PCClassFileTransformer.java    |   16 +-
 .../org/apache/openjpa/enhance/PCEnhancer.java     |  518 ++++-
 .../apache/openjpa/enhance/PCEnhancerAgent.java    |   18 +-
 .../openjpa/enhance/PCSubclassValidator.java       |   27 +-
 .../openjpa/enhance/RecordPersistenceCapable.java  |  495 ++++
 .../apache/openjpa/enhance/RedefinitionHelper.java |   49 +-
 .../enhance/ReflectingPersistenceCapable.java      |  145 +-
 .../org/apache/openjpa/enhance/Reflection.java     |   39 +-
 .../openjpa/event/BeanLifecycleCallbacks.java      |   18 +-
 .../event/DynamicTCPRemoteCommitProvider.java      |    4 +-
 .../openjpa/event/MethodLifecycleCallbacks.java    |   16 +-
 .../openjpa/event/TCPRemoteCommitProvider.java     |   43 +-
 .../openjpa/kernel/AbstractBrokerFactory.java      |   29 +-
 .../org/apache/openjpa/kernel/AttachStrategy.java  |    2 +
 .../java/org/apache/openjpa/kernel/Bootstrap.java  |    9 +-
 .../org/apache/openjpa/kernel/BrokerFactory.java   |   38 +
 .../java/org/apache/openjpa/kernel/BrokerImpl.java |  104 +-
 .../openjpa/kernel/DelegatingBrokerFactory.java    |   44 +-
 .../openjpa/kernel/ExpressionStoreQuery.java       |   11 +-
 .../org/apache/openjpa/kernel/FillStrategy.java    |   24 +-
 .../java/org/apache/openjpa/kernel/Filters.java    |   27 +-
 .../openjpa/kernel/ObjectIdStateManager.java       |    8 +-
 .../java/org/apache/openjpa/kernel/QueryImpl.java  |  401 ++--
 .../org/apache/openjpa/kernel/QueryLanguages.java  |   15 +-
 .../org/apache/openjpa/kernel/ResultPacker.java    |    9 +-
 .../apache/openjpa/kernel/SingleFieldManager.java  |   67 +-
 .../apache/openjpa/kernel/StateManagerImpl.java    |   38 +-
 .../java/org/apache/openjpa/kernel/StoreQuery.java |    1 +
 .../openjpa/kernel/VersionAttachStrategy.java      |    7 +
 .../kernel/exps/AbstractExpressionBuilder.java     |   81 +
 .../apache/openjpa/kernel/exps/CandidatePath.java  |   16 +-
 .../org/apache/openjpa/kernel/exps/Context.java    |   11 +-
 .../openjpa/kernel/exps/ExpressionFactory.java     |   61 +-
 .../openjpa/kernel/exps/ExtractDateTimePart.java   |    4 +-
 .../kernel/exps/InMemoryExpressionFactory.java     |   35 +
 .../kernel/exps/{ToLowerCase.java => Left.java}    |   34 +-
 .../openjpa/kernel/exps/QueryExpressions.java      |   15 +
 .../kernel/exps/{ToLowerCase.java => Replace.java} |   26 +-
 .../kernel/exps/{ToLowerCase.java => Right.java}   |   33 +-
 .../apache/openjpa/kernel/exps/ToLowerCase.java    |    6 +-
 .../apache/openjpa/kernel/exps/ToUpperCase.java    |   10 +-
 .../openjpa/kernel/exps/TypecastAsNumber.java      |  102 +
 .../openjpa/kernel/exps/TypecastAsNumberPart.java  |   38 +-
 .../openjpa/kernel/exps/TypecastAsString.java      |   96 +
 .../exps/{ToUpperCase.java => VersionVal.java}     |   14 +-
 .../openjpa/kernel/jpql/JPQLExpressionBuilder.java |  344 ++-
 .../openjpa/meta/AbstractCFMetaDataFactory.java    |  180 +-
 .../openjpa/meta/AbstractMetaDataDefaults.java     |    4 +-
 .../java/org/apache/openjpa/meta/AccessCode.java   |    8 +-
 .../org/apache/openjpa/meta/ClassMetaData.java     |   74 +-
 .../apache/openjpa/meta/EntityGraphMetaData.java   |  108 +
 .../org/apache/openjpa/meta/FieldMetaData.java     |  344 ++-
 .../openjpa/meta/InterfaceImplGenerator.java       |   19 +-
 .../java/org/apache/openjpa/meta/JavaTypes.java    |   10 +
 .../apache/openjpa/meta/MetaDataRepository.java    |  213 +-
 .../org/apache/openjpa/meta/QueryMetaData.java     |   51 +-
 .../org/apache/openjpa/meta/SequenceMetaData.java  |    7 +-
 .../org/apache/openjpa/util/ApplicationIds.java    |   76 +-
 .../org/apache/openjpa/util/ClassResolverImpl.java |   15 +-
 .../main/java/org/apache/openjpa/util/DateId.java  |    7 +-
 .../org/apache/openjpa/util/GeneratedClasses.java  |    8 +-
 .../src/main/java/org/apache/openjpa/util/Id.java  |    5 +-
 .../java/org/apache/openjpa/util/ImplHelper.java   |   30 +
 .../openjpa/util/MultiLoaderClassResolver.java     |    6 +-
 .../main/java/org/apache/openjpa/util/Proxies.java |    9 +-
 .../org/apache/openjpa/util/ProxyManagerImpl.java  |   18 +-
 .../org/apache/openjpa/util/Serialization.java     |   25 +-
 .../openjpa/util/proxy/DelayedArrayListProxy.java  |   38 +
 .../util/proxy/DelayedLinkedHashSetProxy.java      |   61 +
 .../openjpa/util/proxy/DelayedLinkedListProxy.java |   29 +-
 .../openjpa/util/proxy/DelayedTreeSetProxy.java    |   43 +
 .../openjpa/util/proxy/DelayedVectorProxy.java     |   38 +
 .../jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt |  176 +-
 .../org/apache/openjpa/meta/localizer.properties   |    4 +-
 .../openjpa/enhance/TestGetDeclaredMethod.java     |    6 +-
 .../event/TestMethodLifecycleCallbacks.java        |  104 +
 .../apache/openjpa/kernel/jpql/TestJPQLParser.java |  484 +++-
 .../apache/openjpa/meta/TestMemberProvider.java    |    3 +-
 .../openjpa/util/TestImplHelperEntityClass.java    |   99 +
 openjpa-kubernetes/pom.xml                         |    2 +-
 .../KubernetesTCPRemoteCommitProviderTest.java     |   15 +-
 openjpa-lib/pom.xml                                |    2 +-
 .../org/apache/openjpa/lib/ant/AbstractTask.java   |   14 +-
 .../apache/openjpa/lib/conf/ClassListValue.java    |    6 +-
 .../apache/openjpa/lib/conf/ConfigurationImpl.java |   10 +-
 .../apache/openjpa/lib/conf/Configurations.java    |   15 +-
 .../org/apache/openjpa/lib/conf/FileValue.java     |    6 +-
 .../org/apache/openjpa/lib/conf/ObjectValue.java   |    8 +-
 .../openjpa/lib/conf/ProductDerivations.java       |   29 +-
 .../openjpa/lib/identifier/IdentifierImpl.java     |    5 +-
 .../openjpa/lib/identifier/IdentifierRule.java     |   11 +-
 .../org/apache/openjpa/lib/jdbc/SQLFormatter.java  |    5 +-
 .../org/apache/openjpa/lib/log/LogFactoryImpl.java |   15 +-
 .../apache/openjpa/lib/meta/CFMetaDataParser.java  |    6 +-
 .../apache/openjpa/lib/meta/ClassArgParser.java    |   11 +-
 .../openjpa/lib/meta/ClassMetaDataIterator.java    |   31 +-
 .../lib/meta/ClasspathMetaDataIterator.java        |   22 +-
 .../openjpa/lib/meta/FileMetaDataIterator.java     |   37 +-
 .../lib/meta/JarFileURLMetaDataIterator.java       |   30 +-
 .../openjpa/lib/meta/ResourceMetaDataIterator.java |   31 +-
 .../apache/openjpa/lib/meta/SourceTrackers.java    |   10 +-
 .../openjpa/lib/meta/URLMetaDataIterator.java      |   17 +-
 .../apache/openjpa/lib/meta/XMLMetaDataParser.java |   15 +-
 .../openjpa/lib/meta/XMLMetaDataSerializer.java    |   22 +-
 .../apache/openjpa/lib/meta/XMLVersionParser.java  |    1 +
 .../openjpa/lib/meta/ZipFileMetaDataIterator.java  |   11 +-
 .../java/org/apache/openjpa/lib/util/Files.java    |   74 +-
 .../apache/openjpa/lib/util/J2DoPrivHelper.java    | 1073 +--------
 .../org/apache/openjpa/lib/util/JavaVendors.java   |    4 +-
 .../org/apache/openjpa/lib/util/JavaVersions.java  |    4 +-
 .../org/apache/openjpa/lib/util/Localizer.java     |    5 +-
 .../apache/openjpa/lib/util/MultiClassLoader.java  |   40 +-
 .../java/org/apache/openjpa/lib/util/Options.java  |   15 +-
 .../apache/openjpa/lib/util/ParameterTemplate.java |    4 +-
 .../java/org/apache/openjpa/lib/util/Services.java |   14 +-
 .../org/apache/openjpa/lib/util/SimpleRegex.java   |    6 +-
 .../lib/util/StreamResourceBundleProvider.java     |    4 +-
 .../lib/util/ZipResourceBundleProvider.java        |    4 +-
 .../openjpa/lib/conf/TestXMLCaseConversions.java   |   20 +-
 .../org/apache/openjpa/lib/util/ClassUtilTest.java |    7 +-
 .../apache/openjpa/lib/util/StringUtilTest.java    |    9 +-
 .../openjpa/lib/util/TestPropertiesParser.java     |   11 +-
 .../apache/openjpa/lib/util/TestUUIDGenerator.java |   76 +-
 openjpa-persistence-jdbc/pom.xml                   |    7 +-
 .../jdbc/AnnotationPersistenceMappingParser.java   |  331 ++-
 .../jdbc/JDBCPersistenceProductDerivation.java     |    8 +-
 .../openjpa/persistence/jdbc/MappingTag.java       |    3 +
 .../jdbc/XMLPersistenceMappingParser.java          |  299 ++-
 .../java/org/apache/openjpa/audit/TestAudit.java   |    8 +-
 .../org/apache/openjpa/conf/TestGetProperty.java   |    4 +
 .../apache/openjpa/conf/TestQueryProperties.java   |    3 +-
 .../conf/TestSpecificationConfiguration.java       |   55 +
 .../enhance/TestEnhancementWithMultiplePUs.java    |   15 +-
 .../openjpa/jdbc/meta/TestJDBCSchemaManager.java   |  152 ++
 .../TimeKeeper.java => jdbc/meta/UUIDEntity.java}  |   52 +-
 .../classcriteria/TestQuerySubclass.java           |    5 +-
 .../procedure/TestStoredProcedureQueryFixes.java   |  217 ++
 .../procedure/TestStoredProcedureXmlOverride.java  |   88 +
 .../openjpa/jdbc/sql/TestDelimitIdentifiers.java   |    6 +-
 .../apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java  |   12 +-
 .../jira2780/TestJira2780ReverseCustomizer.java    |    5 +-
 .../TestEntityManagerFactoryTransactions.java      |   89 +
 .../TestXMLPersistenceMetaDataParser.java          |    5 +-
 .../access/FieldAccessColumnOnGetter.java          |  105 +
 .../access/FieldAccessColumnOnGetterEntity.java    |   69 +
 .../access/PropertyAccessCapitalization.java       |   18 +-
 .../access/TestFieldAccessColumnOnGetter.java      |  176 ++
 .../access/TestPropertyAccessCapitalization.java   |    6 +-
 .../persistence/annotations/TestOneToOne.java      |    4 +-
 .../apps/annotApp/annotype/ContractEmployee.java   |    8 +-
 .../apps/annotApp/annotype/DateValidator.java      |   26 +-
 .../common/apps/annotApp/annotype/Employee.java    |    8 +-
 .../apps/annotApp/annotype/LongNameValidator.java  |   21 +-
 .../apps/annotApp/annotype/NameValidator.java      |   31 +-
 .../apps/annotApp/annotype/StringValidator.java    |   20 +-
 .../apps/annotApp/ddtype/ContractEmployee.java     |   18 +-
 .../common/apps/annotApp/ddtype/DateValidator.java |   23 +-
 .../common/apps/annotApp/ddtype/Employee.java      |   42 +-
 .../apps/annotApp/ddtype/LongNameValidator.java    |   17 +-
 .../common/apps/annotApp/ddtype/NameValidator.java |   27 +-
 .../apps/annotApp/ddtype/StringValidator.java      |   18 +-
 .../batch/exception/TestBatchLimitException.java   |   30 +-
 .../cache/jpa/AbstractCacheModeTestCase.java       |    6 +-
 .../ListenerA.java}                                |   29 +-
 .../ListenerB.java}                                |   26 +-
 .../ListenerC.java}                                |   26 +-
 .../persistence/callbacks/TestEntityListeners.java |    3 +-
 .../callbacks/TestListenerOverride.java            |   99 +
 .../callbacks/TestXmlCallbackDedup.java            |   83 +
 .../UnenhancedListenerOverrideEntity.java}         |   64 +-
 .../XmlCallbackEntity.java}                        |   58 +-
 .../XmlCallbackListener.java}                      |   28 +-
 .../Seller.java => cascade/mx1/CascadeMx1A.java}   |   62 +-
 .../mx1/CascadeMx1BCascadeAll.java}                |   73 +-
 .../mx1/CascadeMx1BCascadePersist.java}            |   73 +-
 .../cascade/mx1/TestCascadePersistManyToOne.java   |  133 ++
 .../cascade/mx1/TestUnenhancedCascadeMx1.java      |   79 +
 .../mx1/UnenhancedCascadeA.java}                   |   62 +-
 .../cascade/mx1/UnenhancedCascadeB.java            |   86 +
 .../persistence/common/apps/CompVerUser.java       |  161 ++
 .../TestContainerSpecCompatibilityOptions.java     |   14 +-
 .../persistence/compat/TestQuerySQLCache.java      |   10 +-
 .../compat/TestSpecCompatibilityOptions.java       |   14 +-
 .../conf/TestOverrideNonJtaDataSource.java         |    2 +-
 .../persistence/convert/CharArrayConverter.java    |   50 +
 .../persistence/convert/CommaSepConverter.java     |   39 +-
 .../persistence/convert/ConvertAddress.java        |   75 +
 .../convert/ConvertCollectionEntity.java           |   75 +
 .../persistence/convert/ConvertEmbedEntity.java    |  107 +
 .../ConvertEntity.java}                            |   56 +-
 .../Seller.java => convert/ConvertFailEntity.java} |   67 +-
 .../persistence/convert/ConvertFullTimeEmp.java    |   90 +
 .../persistence/convert/ConvertFullTimeEmp2.java   |   87 +
 .../ConvertMappedSuper.java}                       |   67 +-
 .../ConvertMappedSuper2.java}                      |   63 +-
 .../convert/ConvertRepeatableEntity.java           |   96 +
 .../openjpa/persistence/convert/DotConverter.java  |   36 +-
 .../openjpa/persistence/convert/DotConverter2.java |   36 +-
 .../persistence/convert/FailingConverter.java      |   49 +
 .../convert/NumberToStateConverter.java            |   58 +
 .../persistence/convert/SalaryConverter.java       |   37 +-
 .../persistence/convert/StringPrefixConverter.java |   42 +-
 .../persistence/convert/StringToIntConverter.java  |   39 +-
 .../convert/TestAttributeConverter.java            |  166 ++
 .../persistence/convert/TestConvertTck.java        |  261 +++
 .../criteria/AbstractCriteriaTestCase.java         |   61 +-
 .../openjpa/persistence/criteria/CriteriaTest.java |    7 +-
 .../persistence/criteria/StringComparison.java     |   21 +-
 .../openjpa/persistence/criteria/TestCriteria.java |    8 +-
 .../openjpa/persistence/criteria/TestEdit.java     |    2 +-
 .../persistence/criteria/TestJPQLSubquery.java     |   20 +-
 .../persistence/criteria/TestMapJoinQuery.java     |  198 ++
 .../persistence/criteria/TestStringCriteria.java   |    2 +-
 .../persistence/criteria/TestSubqueries.java       |    5 +-
 .../criteria/TestTypecastAsCriteria.java           |  122 +
 .../persistence/criteria/TestTypesafeCriteria.java |  210 +-
 .../TestCriteriaMultiselectAliasing.java           |    8 +-
 .../criteria/results/TestMultiselect.java          |   50 +-
 .../criteria/results/TestTypedResults.java         |    4 +-
 .../openjpa/persistence/datacache/CacheTest.java   |    9 +-
 .../datacache/TestBulkJPQLAndDataCache.java        |    9 +
 .../datacache/TestDistributedKodoDataCache.java    |   14 +-
 .../TestJPQL2ResultsAndResultClasses.java          |    9 +-
 .../datacache/TestMutableParameters.java           |    2 +-
 .../datacache/TestPartitionedDataCache.java        |   11 +-
 .../persistence/datacache/TestQueryResultSize.java |   12 +-
 .../persistence/datacache/TestResultShapes.java    |   11 +-
 .../persistence/datacache/TestStatistics.java      |   12 +-
 .../datacache/TestUniteratedQueryResult.java       |    8 +-
 .../datacache/common/apps/M2MEntityE.java          |    6 +-
 .../datacache/common/apps/M2MEntityF.java          |    7 +-
 .../delete/DeleteUnversionedEntity.java            |   47 +-
 .../DeleteVersionedEntity.java}                    |   44 +-
 .../delete/TestDeleteMissingRecord.java            |  153 ++
 .../persistence/detach/IntVersionEntity.java       |    3 -
 .../persistence/distinctjoin/LocalizedText.java    |    2 +-
 .../dynamicschema/TestDynamicSchemas.java          |    4 +-
 .../openjpa/persistence/embed/DID2bDependent.java  |   59 +
 .../persistence/embed/DID2bDependentId.java        |   56 +
 .../embed/{Seller.java => DID2bEmployee.java}      |   64 +-
 .../openjpa/persistence/embed/DID2bEmployeeId.java |   54 +
 .../apache/openjpa/persistence/embed/Seller.java   |   54 +-
 .../persistence/embed/TestDerivedIdEx2b.java       |  110 +
 .../openjpa/persistence/embed/TestEmbeddable.java  |   38 +-
 .../persistence/embed/TestEmbeddedWithQuery.java   |    8 +-
 .../embed/attrOverrides/TestAttrOverrides.java     |    2 +-
 .../embed/attrOverrides/TestAttrOverridesXml.java  |    2 +-
 .../compositepk/TestCompositePrimaryKeys.java      |    2 +-
 .../persistence/embed/lazy/TestLazyEmbeddable.java |    5 +-
 .../record/AddressRecord.java}                     |   23 +-
 .../record/CoordinateRecord.java}                  |   32 +-
 .../record/LocationEntity.java}                    |   60 +-
 .../record/PersonWithRecordAddress.java}           |   62 +-
 .../embed/record/TestRecordEmbeddable.java         |  214 ++
 .../TestRecordEmbeddableAttributeOverride.java     |  174 ++
 .../record/TestRecordEmbeddableWithTypes.java      |  159 ++
 .../persistence/embed/record/WarehouseEntity.java  |  103 +
 .../xmloverride/ComplaintEntity.java}              |   61 +-
 .../xmloverride/TestXmlEmbeddableOverride.java     |   85 +
 .../embed/xmloverride/XmlApplicant.java            |   42 +-
 .../enhance/fieldaccess/FieldAccessOrder.java      |   79 +
 .../TestFieldAccessWithNonStandardAccessors.java   |  112 +
 .../EGDepartment.java}                             |   34 +-
 .../Seller.java => entitygraph/EGEmployee.java}    |   60 +-
 .../persistence/entitygraph/EGEmployee2.java       |   55 +
 .../persistence/entitygraph/EGEmployee3.java       |   88 +
 .../persistence/entitygraph/TestEntityGraph.java   |  306 +++
 .../TestEntityManagerSpecCompliance.java           |  374 +++
 .../entitymanager/UnenhancedCoffee.java            |   80 +
 .../UnenhancedDoesNotExist.java}                   |   63 +-
 .../persistence/entitymanager/UnenhancedOrder.java |   93 +
 .../persistence/event/JMSRemoteEventsTest.java     |   16 +-
 .../event/TestTCPRemoteClassChanges.java           |   20 +-
 .../event/TestTCPRemoteEventsDuration.java         |   14 +-
 .../persistence/event/TestTCPRemoteRecovery.java   |   54 +-
 .../event/TestTCPRemoteRecoveryTransmitAdds.java   |   50 +-
 .../TestEntityManagerFactoryLoading.java           |  231 ++
 .../flush/TestFlushModeAutoNavigation.java         |  132 ++
 .../UnenhancedFlushCustomer.java}                  |   61 +-
 .../persistence/flush/UnenhancedFlushOrder.java    |   81 +
 .../persistence/flush/UnenhancedFlushSpouse.java   |   88 +
 .../persistence/graph/TestPersistentGraph.java     |   22 +-
 .../TestHungarianNotationRemoval.java              |    8 +-
 .../persistence/identity/DateTimeTypesEntity.java  |  122 +
 .../PropertyBigDecimalIdEntity.java}               |   64 +-
 .../PropertyBigIntegerIdEntity.java}               |   64 +-
 .../SharedTableBigDecimalId.java}                  |   62 +-
 .../SharedTableBigIntegerId.java}                  |   68 +-
 .../identity/TestBigDecimalIdSharedTable.java      |  182 ++
 .../persistence/identity/TestIdTypeFixes.java      |  190 ++
 .../Seller.java => identity/UUIDIdEntity.java}     |   64 +-
 .../TestAbstractJoinedAppId.java                   |    2 +-
 .../jointable/TestInheritanceTypeJoinedQuery.java  |    4 +-
 .../persistence/jdbc/TestFKColumnNames.java        |   21 +-
 .../persistence/jdbc/annotations/AnnoTest1.java    |    2 +-
 .../jdbc/annotations/AttrOverrideEmbed.java        |   67 +
 .../jdbc/annotations/AttrOverrideEntity.java       |   98 +
 .../TestAttributeOverrideOnOwnField.java           |  100 +
 .../persistence/jdbc/annotations/TestOneToOne.java |    4 +-
 .../persistence/jdbc/annotations/TestVersion.java  |    2 +-
 .../jdbc/common/apps/mappingApp/SQLMapAddress.java |    4 +-
 .../jdbc/common/apps/mappingApp/SQLMapItem.java    |    2 -
 .../jdbc/common/apps/mappingApp/SQLMapOrder.java   |    4 +-
 .../jdbc/kernel/TestUpdateWithSubSelect.java       |    4 +-
 .../persistence/jdbc/mapping/Authority.java        |    4 +-
 .../mapping/bidi/TestBiDirectionalJoinTable.java   |   21 +-
 .../jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java |    3 +-
 .../jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java   |    3 +-
 .../jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java   |    3 +-
 .../jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java   |    3 +-
 .../maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java |    3 +-
 .../maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java |    3 +-
 .../maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java |    3 +-
 .../persistence/jdbc/meta/TestEagerDistinct.java   |   10 +-
 .../jdbc/meta/TestEagerOuterToManyJoins.java       |   24 +-
 .../persistence/jdbc/meta/TestMappedByKeyMaps.java |    7 +-
 .../persistence/jdbc/meta/TestMultiDFG.java        |    4 +-
 .../jdbc/meta/TestMultiTableMappings.java          |    2 +-
 .../persistence/jdbc/meta/TestNoClassColumn.java   |    2 +-
 .../persistence/jdbc/meta/TestRangeQuery.java      |    2 +-
 .../persistence/jdbc/meta/TestStateImage.java      |    4 +-
 .../jdbc/meta/TestUseSchemaElement.java            |    2 +-
 .../TestQueryAgainstEntireMappedHierarchy.java     |    4 +-
 .../meta/vertical/TestSubclassJoinRelations.java   |    2 +-
 .../jdbc/query/TestAggregateQueryWithNoResult.java |   10 +-
 .../jdbc/query/TestNamedSQLQueries.java            |    2 +-
 .../jdbc/query/TestStringFunctions.java            |    2 +-
 .../query/TestTemporalTypeParameterConversion.java |  203 ++
 .../TestTemporalTypeQueryParameterBinding.java     |    4 +-
 .../{TimeKeeper.java => HireDateEmployee.java}     |   67 +-
 .../persistence/jdbc/query/domain/TimeKeeper.java  |    6 +-
 .../jdbc/schema/TestClassSequenceFactory.java      |    5 +-
 .../jdbc/schema/TestDynamicSchemaFactory.java      |    7 +-
 .../schema/TestSchemaGenerationProperties.java     |   13 +-
 .../jdbc/sqlcache/TestExternalizedParameter.java   |   48 +-
 .../TestMultithreadedReparameterization.java       |    4 +-
 .../jdbc/sqlcache/TestPreparedQueryCache.java      |    9 +-
 .../sqlcache/TestPreparedQueryCacheExclusion.java  |    6 +-
 .../jpql/clauses/TestEJBDeleteUpdateImpl.java      |    6 +-
 .../jpql/expressions/TestEntityTypeExpression.java |    2 +-
 .../expressions/TestJPQLScalarExpressions.java     |    2 +-
 .../jpql/functions/TestEJBQLFunction.java          |  662 +++++-
 .../jpql/functions/TestVersionFunctionOrderBy.java |  137 ++
 .../joins/TestJoinFetchWithQueryDataCache.java     |   12 -
 .../treatjoinon/SeqGenEntity.java}                 |   64 +-
 .../treatjoinon/TCountry.java}                     |   30 +-
 .../treatjoinon/TCustomer.java}                    |   63 +-
 .../treatjoinon/TLineItem.java}                    |   68 +-
 .../Seller.java => jpql/treatjoinon/TOrder.java}   |   62 +-
 .../Seller.java => jpql/treatjoinon/TProduct.java} |   65 +-
 .../treatjoinon/TSoftwareProduct.java}             |   26 +-
 .../treatjoinon/TestSequenceGeneratorsParsing.java |   53 +
 .../persistence/jpql/treatjoinon/TestTckFixes.java |  217 ++
 .../treatjoinon/TestTreatJoinOnEmbeddable.java     |  254 ++
 .../openjpa/persistence/kernel/TestEJBLobs.java    |    8 +-
 .../persistence/kernel/TestEJBTransactions.java    |   12 +-
 .../openjpa/persistence/kernel/TestFieldRange.java |    2 +-
 .../persistence/kernel/TestFieldRange2.java        |    2 +-
 .../openjpa/persistence/kernel/TestPMMemory.java   |   37 +-
 .../persistence/kernel/TestSecurityContext.java    |  250 --
 .../persistence/kernel/common/apps/AppIdSubA.java  |    2 +-
 .../lifecycle/TestEntityLifecycleTCK.java          |  457 ++++
 .../entity/CascadeManyToOneA.java}                 |   69 +-
 .../lifecycle/entity/CascadeManyToOneB.java        |  102 +
 .../lifecycle/entity/CascadeOneToOneA.java         |   91 +
 .../lifecycle/entity/CascadeOneToOneB.java         |  104 +
 .../entity/PersistManyToOneA.java}                 |   69 +-
 .../lifecycle/entity/PersistManyToOneB.java        |  102 +
 .../entity/PersistOneToOneA.java}                  |   66 +-
 .../lifecycle/entity/PersistOneToOneB.java         |   94 +
 .../MKEDepartment.java}                            |   55 +-
 .../openjpa/persistence/mapkey/MKEDepartment4.java |   94 +
 .../openjpa/persistence/mapkey/MKEEmployee.java    |   97 +
 .../DateValidator.java => mapkey/MKENumbers.java}  |   25 +-
 .../DateValidator.java => mapkey/MKEOffices.java}  |   25 +-
 .../persistence/mapkey/MKEmbeddedEmployee.java     |   37 +-
 .../MKTDepartment.java}                            |   56 +-
 .../openjpa/persistence/mapkey/MKTDepartment4.java |   97 +
 .../persistence/mapkey/MKTEmbeddedEmployee.java    |   37 +-
 .../tset/Account.java => mapkey/MKTEmployee.java}  |   72 +-
 .../SharedColDeptOrdinal.java}                     |   67 +-
 .../SharedColDeptString.java}                      |   79 +-
 .../SharedColEmpOrdinal.java}                      |   62 +-
 .../SharedColEmpString.java}                       |   62 +-
 .../SharedColOffices.java}                         |   29 +-
 .../mapkey/TestMapKeyEnumeratedTemporal.java       |  311 +++
 .../mapkey/TestSharedColumnEnumMapKey.java         |  217 ++
 .../mapkey/TestUnenhancedEntityGraphPattern.java   |   74 +
 .../mapkey/TestUnenhancedMapKeyEnumTemporal.java   |  307 +++
 .../persistence/mapkey/TestUnenhancedMappedBy.java |   70 +
 .../UnenhancedEGDepartment.java}                   |   60 +-
 .../UnenhancedEGDepartmentSimple.java}             |   55 +-
 .../persistence/mapkey/UnenhancedEGEmployee.java   |  103 +
 .../UnenhancedMBDepartment.java}                   |   54 +-
 .../persistence/mapkey/UnenhancedMBEmployee.java   |  103 +
 .../UnenhancedMKEDept.java}                        |   63 +-
 .../persistence/mapkey/UnenhancedMKEDept4.java     |  100 +
 .../persistence/mapkey/UnenhancedMKEEmp.java       |  102 +
 .../UnenhancedMKENumbers.java}                     |   29 +-
 .../UnenhancedMKEOffices.java}                     |   29 +-
 .../persistence/mapkey/UnenhancedMKEmbedEmp.java   |   38 +-
 .../UnenhancedMKTDept.java}                        |   64 +-
 .../persistence/mapkey/UnenhancedMKTDept4.java     |  101 +
 .../Account.java => mapkey/UnenhancedMKTEmp.java}  |   78 +-
 .../openjpa/persistence/merge/TestMerge.java       |    6 -
 .../openjpa/persistence/merge/TestMergeNew.java    |    8 +-
 .../openjpa/persistence/meta/TestMetamodel.java    |  153 +-
 .../persistence/meta/TestSequenceAssigned.java     |    2 +-
 .../orderby/TestOrderByDotNotation.java            |  145 ++
 .../persistence/orderby/UnenhancedObAddress.java   |  106 +
 .../orderby/UnenhancedObOwnerField.java            |   93 +
 .../orderby/UnenhancedObOwnerProperty.java         |   87 +
 .../persistence/orderby/UnenhancedObZipCode.java   |   35 +-
 .../delayed/DelayedProxyCollectionsTestCase.java   |   14 +
 .../persistence/proxy/delayed/Location.java        |    2 +-
 .../persistence/proxy/delayed/pqueue/Account.java  |    2 +-
 .../persistence/proxy/delayed/tset/Account.java    |    2 +-
 .../persistence/proxy/entities/Annuity.java        |    4 +-
 .../persistence/proxy/entities/FixedAnnuity.java   |    2 +-
 .../puconf/TestPersistenceUnitConfig.java          |   30 +
 .../EagerChildEntity.java}                         |   63 +-
 .../EagerParentEntity.java}                        |   56 +-
 .../Seller.java => query/ReadOnlyJoinDept.java}    |   60 +-
 .../ReadOnlyJoinEmployee.java}                     |   61 +-
 .../Location.java => query/ShortFieldEntity.java}  |   53 +-
 .../query/Test1x1OrderByResultCollection.java      |    7 +-
 .../persistence/query/TestEJBDeleteUpdateImpl.java |    1 +
 .../persistence/query/TestFlushModeAutoQuery.java  |  113 +
 .../persistence/query/TestJDBCEscapeDate.java      |    3 +-
 .../query/TestOverrideAnnotationFixes.java         |  239 ++
 .../openjpa/persistence/query/TestQueryLock.java   |   71 +
 .../persistence/query/TestQueryParameters.java     |    8 +-
 .../persistence/query/TestQueryResults.java        |   30 +-
 .../persistence/query/TestQueryTimeout.java        |    8 +-
 .../openjpa/persistence/query/TestSubquery.java    |    6 +-
 .../persistence/query/TestTimeoutException.java    |   32 +
 .../constructorresult/CrDto.java}                  |   33 +-
 .../constructorresult/CrEntity.java}               |   75 +-
 .../constructorresult/TestConstructorResult.java   |  106 +
 .../sequence/hsql/TestHSQLSequence.java            |   12 +-
 .../openjpa/persistence/simple/AllFieldTypes.java  |   15 +
 .../CalendarIdEntity.java}                         |   55 +-
 ...ityManagerFactory.java => CallbackTracker.java} |   23 +-
 .../Seller.java => simple/CascadeAEntity.java}     |   55 +-
 .../persistence/simple/CascadeBAllEntity.java      |   65 +
 .../persistence/simple/CascadeBPersistEntity.java  |   65 +
 .../Location.java => simple/CoffeeBean.java}       |   64 +-
 ...ntityManagerFactory.java => CoffeeBeanDTO.java} |   39 +-
 ...tory.java => EnumeratedValueBadTypeEntity.java} |   37 +-
 ...tory.java => EnumeratedValueBadTypeStatus.java} |   29 +-
 ...Factory.java => EnumeratedValueCharEntity.java} |   37 +-
 ...Factory.java => EnumeratedValueCharStatus.java} |   31 +-
 ...rFactory.java => EnumeratedValueDupEntity.java} |   37 +-
 ...rFactory.java => EnumeratedValueDupStatus.java} |   30 +-
 ...agerFactory.java => EnumeratedValueEntity.java} |   37 +-
 ...rFactory.java => EnumeratedValueIntEntity.java} |   37 +-
 ...rFactory.java => EnumeratedValueIntStatus.java} |   31 +-
 ...Factory.java => EnumeratedValueLongEntity.java} |   37 +-
 ...Factory.java => EnumeratedValueLongStatus.java} |   30 +-
 ...actory.java => EnumeratedValueShortEntity.java} |   37 +-
 ...actory.java => EnumeratedValueShortStatus.java} |   31 +-
 ...agerFactory.java => EnumeratedValueStatus.java} |   29 +-
 .../Seller.java => simple/IndexedEntity.java}      |   68 +-
 ...nagerFactory.java => InstantVersionEntity.java} |   43 +-
 .../openjpa/persistence/simple/Java8TimeTypes.java |   22 +-
 ...actory.java => LocalDateTimeVersionEntity.java} |   43 +-
 ...stEntityManagerFactory.java => MapKeyEnum.java} |   21 +-
 .../persistence/simple/MapKeyEnumEntity.java       |   99 +
 .../persistence/simple/MapKeyTemporalEntity.java   |  102 +
 ...ManagerFactory.java => MapValueEmbeddable.java} |   31 +-
 .../MetamodelConstantsEntity.java}                 |   64 +-
 .../simple/MetamodelConstantsEntity_.java          |   48 +
 .../MixedAccessBase.java}                          |   63 +-
 .../MixedAccessChild.java}                         |   41 +-
 .../Account.java => simple/MkeDepartment.java}     |   75 +-
 .../MkeDepartmentOrdinal.java}                     |   76 +-
 .../Location.java => simple/MkeEmployee.java}      |   65 +-
 .../MkeEmployeeOrdinal.java}                       |   65 +-
 .../Account.java => simple/MktDepartment.java}     |   76 +-
 .../MktDeptShared.java}                            |   60 +-
 .../Account.java => simple/MktDeptShared2.java}    |   82 +-
 .../Location.java => simple/MktEmpShared.java}     |   64 +-
 .../Location.java => simple/MktEmpShared2.java}    |   64 +-
 .../Location.java => simple/MktEmployee.java}      |   65 +-
 .../MxOneChild.java}                               |   71 +-
 .../MxOneParent.java}                              |   60 +-
 .../NativeQueryResultEntity.java}                  |   71 +-
 .../openjpa/persistence/simple/NonPublicId.java    |   38 +-
 ...yManagerFactory.java => NonPublicIdEntity.java} |   25 +-
 ...tEntityManagerFactory.java => NotAnEntity.java} |   26 +-
 ...ntityManagerFactory.java => OptionsEntity.java} |   39 +-
 .../persistence/simple/PropertyAccessMember.java   |   95 +
 .../persistence/simple/PropertyAccessOrder.java    |   93 +
 .../persistence/simple/SchemaGenCourse.java        |   61 +
 .../Seller.java => simple/SchemaGenDept.java}      |   62 +-
 .../openjpa/persistence/simple/SchemaGenEmp.java   |   63 +
 .../Seller.java => simple/SchemaGenSecondary.java} |   70 +-
 .../Seller.java => simple/SchemaGenSeqEntity.java} |   53 +-
 .../SchemaGenStudent.java}                         |   56 +-
 .../persistence/simple/SecondPrecisionEntity.java  |   83 +
 .../persistence/simple/SimpleOrderEntity.java      |   63 +
 .../persistence/simple/StaticInnerEntity.java      |   96 +
 .../openjpa/persistence/simple/TckMkDept.java      |   63 +
 .../openjpa/persistence/simple/TckMkEmp.java       |   79 +
 .../openjpa/persistence/simple/TckMkEmp2.java      |   80 +
 .../openjpa/persistence/simple/TckMktDept.java     |   66 +
 .../openjpa/persistence/simple/TckMktDept2.java    |   71 +
 .../openjpa/persistence/simple/TckMktDept4.java    |   81 +
 ...EntityManagerFactory.java => TckMktEmbEmp.java} |   28 +-
 .../openjpa/persistence/simple/TckMktEmp.java      |   60 +
 .../openjpa/persistence/simple/TckMktEmp2.java     |   60 +
 .../openjpa/persistence/simple/TckMktEmp4.java     |   60 +
 .../persistence/simple/TestCalendarIdEntity.java   |   65 +
 .../simple/TestCallbackWithRuntimeEnhancement.java |  114 +
 .../simple/TestCascadeManyToOneAndEM2.java         |  246 ++
 .../simple/TestCascadeOneToOneFlushOrder.java      |  261 +++
 .../simple/TestCriteriaAPIValidation.java          |  119 +
 .../simple/TestCriteriaUpdateDelete.java           |  185 ++
 .../openjpa/persistence/simple/TestDdlOptions.java |   85 +
 .../simple/TestElementCollectionBasic.java         |   76 +
 .../simple/TestEntityAPIValidation.java            |  215 ++
 .../simple/TestEntityLifecycleSpec.java            |  178 ++
 .../simple/TestEntityManagerAfterClose.java        |  215 ++
 ...estEntityManagerCloseWithActiveTransaction.java |  111 +
 .../simple/TestEntityManagerFactory.java           |   31 +-
 .../simple/TestEntityManagerFactoryLifecycle.java  |  195 ++
 .../simple/TestEntityManagerFactoryTCK.java        |  494 ++++
 .../simple/TestEntityManagerTCKCompliance.java     |  242 ++
 .../persistence/simple/TestEnumeratedValue.java    |   95 +
 .../simple/TestEnumeratedValueTypes.java           |  472 ++++
 .../simple/TestGetSingleResultOrNull.java          |  124 +
 .../persistence/simple/TestIndexColumnParsing.java |   88 +
 .../simple/TestInheritedPropertyAccessPersist.java |  125 +
 .../persistence/simple/TestJava8TimeTypes.java     |   78 +-
 .../simple/TestJoinColumnUpdatable.java            |  111 +
 .../simple/TestMapKeyAttributeOverride.java        |  122 +
 .../simple/TestMapKeyEnumeratedTemporal.java       |  301 +++
 .../TestMergeAfterSetWithRuntimeEnhancement.java   |  172 ++
 .../persistence/simple/TestMetamodelConstants.java |   97 +
 .../persistence/simple/TestMissingMetaData.java    |   18 +-
 .../TestMerge.java => simple/TestMixedAccess.java} |   58 +-
 .../persistence/simple/TestMixedAccessRuntime.java |   78 +
 .../simple/TestNamedNativeQueryResultMapping.java  |   75 +
 .../TestNamedNativeQueryResultMappingXml.java      |   78 +
 .../simple/TestNonEntityInPersistenceUnit.java     |  119 +
 .../persistence/simple/TestNonPublicIdClass.java   |   83 +
 .../persistence/simple/TestPropertiesMethods.java  |   11 +-
 .../persistence/simple/TestQueryParameterAPI.java  |  164 ++
 .../openjpa/persistence/simple/TestRefresh.java    |   12 +-
 .../simple/TestRuntimeEnhanceWithEmbeddable.java   |  123 +
 .../simple/TestRuntimeExceptionCausesRollback.java |  286 +++
 .../simple/TestSchemaGenAnnotations.java           |  211 ++
 .../persistence/simple/TestSchemaGenDrop.java      |  124 +
 .../simple/TestSchemaGenerationScripts.java        |  787 +++++++
 .../persistence/simple/TestSecondPrecision.java    |   89 +
 .../persistence/simple/TestStaticInnerClasses.java |   79 +
 .../persistence/simple/TestTckMapKeyFixes.java     |  192 ++
 .../persistence/simple/TestTimeVersionTypes.java   |  200 ++
 .../simple/TestUnenhancedCalendarId.java           |   72 +
 .../simple/TestUnenhancedCascadeAndEM2.java        |  262 +++
 .../simple/TestUnenhancedDerivedId.java            |  367 +++
 .../simple/TestUnenhancedDerivedIdEx2b.java        |   99 +
 .../simple/TestUnenhancedLowercaseGetter.java      |   84 +
 .../simple/TestUnenhancedProtectedConstructor.java |  152 ++
 .../TestUnenhancedRollbackOnNonExistentTable.java  |  124 +
 .../simple/UnenhancedCalendarIdPropertyEntity.java |   75 +
 .../UnenhancedCallbackEntity.java}                 |   54 +-
 .../simple/UnenhancedCallbackListener.java         |   55 +
 .../UnenhancedCascadeAEntity.java}                 |   55 +-
 .../simple/UnenhancedCascadeBAllEntity.java        |   65 +
 .../simple/UnenhancedCascadeBPersistEntity.java    |   65 +
 .../UnenhancedCoffeeEntity.java}                   |   66 +-
 .../simple/UnenhancedDID1Dependent.java            |   86 +
 .../simple/UnenhancedDID1DependentId.java          |   72 +
 .../UnenhancedDID1Employee.java}                   |   57 +-
 .../UnenhancedDID1bDependent.java}                 |   66 +-
 .../simple/UnenhancedDID1bDependentId.java         |   75 +
 .../UnenhancedDID1bEmployee.java}                  |   57 +-
 .../simple/UnenhancedDID2aDependent.java           |   80 +
 .../simple/UnenhancedDID2aDependentId.java         |   79 +
 .../simple/UnenhancedDID2aEmployee.java            |   71 +
 .../simple/UnenhancedDID2aEmployeeId.java          |   79 +
 .../simple/UnenhancedDID2bDependent.java           |   75 +
 .../simple/UnenhancedDID2bDependentId.java         |   81 +
 .../simple/UnenhancedDID2bEmployee.java            |   81 +
 .../simple/UnenhancedDID2bEmployeeId.java          |   78 +
 .../simple/UnenhancedDID3Dependent.java            |  104 +
 .../simple/UnenhancedDID3DependentId.java          |   80 +
 .../persistence/simple/UnenhancedDID3Employee.java |   43 +-
 .../simple/UnenhancedDID3EmployeeId.java           |   81 +
 .../UnenhancedDoesNotExistEntity.java}             |   58 +-
 .../simple/UnenhancedElementCollectionEntity.java  |  113 +
 .../UnenhancedJCDepartment.java}                   |   59 +-
 .../persistence/simple/UnenhancedJCEmployee.java   |   65 +
 .../UnenhancedLowercaseGetterOrder.java}           |   63 +-
 .../simple/UnenhancedMappedSuperclass.java         |   41 +-
 .../simple/UnenhancedMixedAccessEntity.java        |  174 ++
 .../UnenhancedProductEntity.java}                  |   62 +-
 .../UnenhancedPropertyOrderEntity.java}            |   68 +-
 .../persistence/simple/UnenhancedShelfLife.java    |   56 +-
 .../simple/UnenhancedSimpleOrderEntity.java        |   68 +
 .../UnenhancedTCKAddress.java}                     |   77 +-
 .../UnenhancedTCKCountry.java}                     |   42 +-
 .../persistence/simple/UnenhancedTCKCustomer.java  |  108 +
 .../UnenhancedTCKHardwareProduct.java}             |   39 +-
 .../persistence/simple/UnenhancedTCKProduct.java   |   93 +
 .../persistence/spring/LibTestingService.java      |    9 +-
 .../temporal/TestTemporalTimestamp.java            |    3 +-
 .../test/AbstractPersistenceTestCase.java          |   22 +-
 .../test/CombinatorialPersistenceTestCase.java     |   11 +-
 .../openjpa/persistence/test/ContainerEMFTest.java |   12 +-
 .../persistence/test/PersistenceTestCase.java      |   13 +-
 .../persistence/test/SQLListenerTestCase.java      |   11 +-
 .../TestPersistenceProviderFilteringTestCase.java  |    6 +
 .../Eager.java}                                    |   44 +-
 .../openjpa/persistence/util/EagerEntity.java      |   54 +-
 .../persistence/util/TestPersistenceUnitUtil.java  |  555 +++--
 .../persistence/util/TestPersistenceUtil.java      |   10 +-
 .../openjpa/persistence/util/TestProviderUtil.java |    6 +-
 .../persistence/xml/TestToOneLazyXmlOverride.java  |    2 +-
 .../xmlmapping/xmlbindings/myaddress/Address.java  |   10 +-
 .../xmlbindings/myaddress/CANAddress.java          |   10 +-
 .../xmlbindings/myaddress/GBRAddress.java          |   10 +-
 .../xmlbindings/myaddress/ObjectFactory.java       |    6 +-
 .../xmlbindings/myaddress/ShortAddress.java        |    8 +-
 .../xmlbindings/myaddress/USAAddress.java          |   10 +-
 .../persistence/xs/TestMergeComplexKey.java        |    1 -
 .../resources/META-INF/listener-override-orm.xml   |   40 +
 .../META-INF/native-query-inline-result-orm.xml    |   40 +
 .../src/test/resources/META-INF/persistence.xml    |   38 +
 .../test/resources/META-INF/xml-callback-orm.xml   |   32 +
 .../test/resources/META-INF/xml-embeddable-orm.xml |   26 +
 .../conf/META-INF/persistence-3_0-config.xml       |   39 +-
 .../conf/META-INF/persistence-3_1-config.xml       |   39 +-
 .../conf/META-INF/persistence-3_2-config.xml       |   39 +-
 .../org/apache/openjpa/jdbc/procedure/sp-orm.xml   |   42 +
 .../persistence/jdbc/schema/create-postgresql.sql  |    2 +-
 .../persistence/puconf/META-INF/persistence.xml    |   16 +-
 openjpa-persistence-locking/pom.xml                |    2 +-
 .../lock/extended/TestBasicLockScope.java          |    1 -
 .../lockmgr/TestNamedQueryLockMode.java            |    6 +-
 .../lockmgr/TestOptimisticNamedQueryLockMode.java  |    6 +-
 .../persistence/lockmgr/TestPessimisticLocks.java  |   21 +-
 openjpa-persistence/pom.xml                        |    2 +-
 .../apache/openjpa/persistence/AbstractQuery.java  |   85 +-
 .../AnnotationPersistenceMetaDataParser.java       |  316 ++-
 .../AnnotationPersistenceMetaDataSerializer.java   |   15 +-
 .../AnnotationPersistenceXMLMetaDataParser.java    |   92 +-
 .../openjpa/persistence/AttributeNodeImpl.java     |   72 +
 .../openjpa/persistence/EntityGraphImpl.java       |  392 ++++
 .../persistence/EntityManagerFactoryImpl.java      |  537 ++++-
 .../openjpa/persistence/EntityManagerImpl.java     |  718 +++++-
 .../apache/openjpa/persistence/JPAProperties.java  |    4 +-
 .../apache/openjpa/persistence/MetaDataTag.java    |    7 +-
 .../persistence/OpenJPAPersistenceUtil.java        |  139 +-
 .../persistence/PersistenceMetaDataDefaults.java   |  432 +++-
 .../persistence/PersistenceMetaDataFactory.java    |  127 +-
 .../persistence/PersistenceProductDerivation.java  |  132 +-
 .../persistence/PersistenceProviderImpl.java       |   40 +-
 .../persistence/PersistenceUnitInfoImpl.java       |   83 +-
 .../org/apache/openjpa/persistence/QueryImpl.java  |  132 +-
 .../openjpa/persistence/SchemaManagerImpl.java     |   66 +
 .../persistence/StoredProcedureQueryImpl.java      |  165 +-
 .../apache/openjpa/persistence/SubgraphImpl.java   |  316 +++
 .../persistence/XMLPersistenceMetaDataParser.java  |   86 +-
 .../persistence/criteria/CompareByExample.java     |    3 +-
 .../persistence/criteria/CriteriaBuilderImpl.java  |  261 ++-
 .../persistence/criteria/CriteriaDeleteImpl.java   |  214 ++
 .../criteria/CriteriaExpressionBuilder.java        |   41 +-
 .../persistence/criteria/CriteriaQueryImpl.java    |  142 +-
 .../persistence/criteria/CriteriaSelectImpl.java   |  180 ++
 .../persistence/criteria/CriteriaUpdateImpl.java   |  278 +++
 .../persistence/criteria/ExpressionImpl.java       |   36 +
 .../openjpa/persistence/criteria/Expressions.java  |  250 +-
 .../openjpa/persistence/criteria/FromImpl.java     |   58 +-
 .../apache/openjpa/persistence/criteria/Joins.java |  107 +-
 .../openjpa/persistence/criteria/OrderImpl.java    |   13 +
 .../criteria/ParameterExpressionImpl.java          |   13 +-
 .../openjpa/persistence/criteria/PathImpl.java     |   37 +-
 .../persistence/criteria/PredicateImpl.java        |    1 +
 .../openjpa/persistence/criteria/RootImpl.java     |   89 +
 .../openjpa/persistence/criteria/SubqueryImpl.java |   58 +
 .../persistence/meta/AbstractManagedType.java      |   65 +-
 .../persistence/meta/AnnotationProcessor6.java     |  114 +-
 .../apache/openjpa/persistence/meta/Members.java   |   18 +-
 .../openjpa/persistence/meta/MetamodelImpl.java    |   43 +-
 .../openjpa/persistence/query/AliasContext.java    |    3 +-
 .../openjpa/persistence/util/SourceCode.java       |   12 +-
 .../persistence/validation/ValidatorImpl.java      |   14 +-
 .../openjpa/persistence/localizer.properties       |  277 +--
 .../openjpa/persistence/meta/localizer.properties  |    3 +
 .../apache/openjpa/persistence/orm_3_2.xsd.rsrc    | 2449 ++++++++++++++++++++
 .../openjpa/persistence/persistence_3_2.xsd.rsrc   |  383 +++
 .../TestPersistenceProductDerivation.java          |   47 +-
 openjpa-project/checkstyle.xml                     |    5 +-
 openjpa-project/pom.xml                            |    2 +-
 openjpa-project/source-assembly.xml                |    1 +
 .../src/doc/manual/jpa_overview_arch.xml           |    2 +-
 .../src/doc/manual/jpa_overview_criteria.xml       |    4 +-
 openjpa-project/src/doc/manual/jpa_overview_em.xml |    6 +-
 .../src/doc/manual/jpa_overview_intro.xml          |    2 +-
 openjpa-project/src/doc/manual/jpa_overview_pc.xml |   19 +-
 .../src/doc/manual/jpa_overview_persistence.xml    |    4 +-
 .../src/doc/manual/jpa_overview_query.xml          |   75 +-
 openjpa-project/src/doc/manual/jpa_resources.xml   |    6 +-
 openjpa-project/src/doc/manual/manual.xml          |    2 +-
 openjpa-project/src/doc/manual/openjpa_intro.xml   |    5 +-
 openjpa-project/src/doc/manual/openjpa_legal.xml   |   10 +-
 .../src/doc/manual/ref_guide_caching.xml           |    4 +-
 .../src/doc/manual/ref_guide_deploy.xml            |    2 +-
 .../src/doc/manual/ref_guide_instrumentation.xml   |    4 +-
 .../src/doc/manual/ref_guide_logging.xml           |    6 +-
 .../src/doc/manual/ref_guide_optimization.xml      |    2 +-
 .../src/doc/manual/ref_guide_runtime.xml           |    2 +-
 openjpa-project/src/doc/manual/ref_guide_slice.xml |   14 +-
 .../src/doc/manual/supported_databases.xml         |   16 +-
 openjpa-project/suppressions.xml                   |    5 +-
 openjpa-slice/pom.xml                              |   20 +-
 .../slice/jdbc/DistributedJDBCBrokerFactory.java   |    4 +-
 .../jdbc/DistributedJDBCConfigurationImpl.java     |    5 +-
 .../org/apache/openjpa/slice/TestBulkDelete.java   |    6 +-
 openjpa-tools/openjpa-fetch-statistics-was/pom.xml |    2 +-
 openjpa-tools/openjpa-fetch-statistics/pom.xml     |    2 +-
 .../openjpa/enhance/stats/FetchStatsCollector.java |   20 +-
 openjpa-tools/openjpa-maven-plugin/pom.xml         |    2 +-
 .../openjpa-maven-plugin/src/site/site.xml         |    6 +-
 openjpa-tools/pom.xml                              |    2 +-
 openjpa-xmlstore/pom.xml                           |   22 +-
 .../apache/openjpa/xmlstore/XMLFileHandler.java    |   27 +-
 .../openjpa/xmlstore/simple/TestPersistence.java   |   57 +-
 openjpa/pom.xml                                    |    6 +-
 pom.xml                                            |  197 +-
 scripts/run-build-matrix.sh                        |  232 ++
 src/site/site.xml                                  |   14 +-
 src/test/sql/oracle-docker/init.sql                |    8 +-
 897 files changed, 48768 insertions(+), 12804 deletions(-)