Ok then, proceed with the change.
Thanks, Jerome
Marina Vatkina wrote:
> Please approve his changes - it fix a known regression that causes NPE when verifier detects
> an error. We synch-ed this up with Sahoo before
> going ahead with the merge.
>
> thanks,
> -marina
>
> ----- Original Message -----
> From: Jerome Dochez <Jerome.Dochez_at_Sun.COM>
> Date: Saturday, January 14, 2006 9:09 pm
> Subject: Re: [Fwd: [IN 84987] entity-persistence INTEGRATED Merge changes from trunk onto branch]
>
>
>> Great, thanks.
>>
>> Sahoo seems to still want to integrate an Oracle change, can this
>> conflict ?
>>
>> Jerome
>>
>> Mitesh Meswani wrote:
>>
>>> The changes from trunk are merged into the beta branch.
>>>
>>> -Mitesh
>>> ------------------------------------------------------------------
>>>
>> -----------
>>
>>> http://inf.central.sun.com/inf/integrationReport.jsp?id=84987
>>>
>>> Subject: Merge changes from trunk onto branch
>>>
>>> Status Changed: Planned to Integrated.
>>> Integrator: Mitesh Meswani
>>>
>>> Product: Sun ONE Application Server
>>> Codeline: java.net{trunk}
>>> Sub Category: entity-persistence
>>> Planned Date: 2006-01-13
>>> Integrated Date: 2006-01-13
>>> Impact: Low Status: Integrated Release: 9
>>> Affects: [ ]
>>>
>>> Related Integration Notice(s):
>>>
>>> Description: This integration merges changes done on trunk as of
>>> 01/11/2006 into the beta
>>> branch. (AS9_BETA_BRANCH)
>>>
>>> The changes to peristence-api also inclunde licensing changes to
>>>
>> trunk.>
>>
>>> Tests run: quicklook test and entity-persitence-tests (obtained
>>>
>> from
>>
>>> trunk)
>>>
>>> M persistence-api/build.properties
>>> M persistence-api/build.xml
>>> M persistence-api/maven.xml
>>> M persistence-api/project.xml
>>> M persistence-api/nbproject/build-impl.xml
>>> M persistence-api/nbproject/genfiles.properties
>>> M persistence-api/nbproject/project.properties
>>> M persistence-api/nbproject/project.xml
>>> M persistence-api/src/java/javax/persistence/AccessMode.java
>>> M persistence-api/src/java/javax/persistence/AccessType.java
>>> M persistence-api/src/java/javax/persistence/AttributeOverride.java
>>> M persistence-api/src/java/javax/persistence/AttributeOverrides.java
>>> M persistence-api/src/java/javax/persistence/Basic.java
>>> M persistence-api/src/java/javax/persistence/CascadeType.java
>>> M persistence-api/src/java/javax/persistence/Column.java
>>> M persistence-api/src/java/javax/persistence/ColumnResult.java
>>> M persistence-
>>>
>> api/src/java/javax/persistence/DiscriminatorColumn.java> M
>> persistence-api/src/java/javax/persistence/DiscriminatorType.java
>>
>>> M persistence-api/src/java/javax/persistence/Embeddable.java
>>> M persistence-
>>>
>> api/src/java/javax/persistence/EmbeddableSuperclass.java> M
>> persistence-api/src/java/javax/persistence/Embedded.java
>>
>>> M persistence-api/src/java/javax/persistence/EmbeddedId.java
>>> M persistence-api/src/java/javax/persistence/Entity.java
>>> M persistence-api/src/java/javax/persistence/EntityListener.java
>>> M persistence-api/src/java/javax/persistence/EntityManager.java
>>> M persistence-
>>>
>> api/src/java/javax/persistence/EntityManagerFactory.java> M
>> persistence-api/src/java/javax/persistence/EntityNotFoundException.java
>>
>>> M persistence-api/src/java/javax/persistence/EntityResult.java
>>> M persistence-api/src/java/javax/persistence/EntityTransaction.java
>>> M persistence-api/src/java/javax/persistence/EntityType.java
>>> A persistence-api/src/java/javax/persistence/EnumType.java
>>> A persistence-api/src/java/javax/persistence/Enumerated.java
>>> M persistence-api/src/java/javax/persistence/FetchType.java
>>> M persistence-api/src/java/javax/persistence/FieldResult.java
>>> M persistence-api/src/java/javax/persistence/FlushMode.java
>>> M persistence-api/src/java/javax/persistence/FlushModeType.java
>>> A persistence-api/src/java/javax/persistence/GeneratedValue.java
>>> A persistence-api/src/java/javax/persistence/GenerationType.java
>>> R persistence-api/src/java/javax/persistence/GeneratorType.java
>>> M persistence-api/src/java/javax/persistence/Id.java
>>> M persistence-api/src/java/javax/persistence/IdClass.java
>>> M persistence-api/src/java/javax/persistence/Inheritance.java
>>> M persistence-api/src/java/javax/persistence/InheritanceType.java
>>> M persistence-api/src/java/javax/persistence/JoinColumn.java
>>> M persistence-api/src/java/javax/persistence/JoinColumns.java
>>> M persistence-api/src/java/javax/persistence/JoinTable.java
>>> M persistence-api/src/java/javax/persistence/Lob.java
>>> R persistence-api/src/java/javax/persistence/LobType.java
>>> M persistence-api/src/java/javax/persistence/ManyToMany.java
>>> M persistence-api/src/java/javax/persistence/ManyToOne.java
>>> M persistence-api/src/java/javax/persistence/MapKey.java
>>> M persistence-api/src/java/javax/persistence/NamedNativeQueries.java
>>> M persistence-api/src/java/javax/persistence/NamedNativeQuery.java
>>> M persistence-api/src/java/javax/persistence/NamedQueries.java
>>> M persistence-api/src/java/javax/persistence/NamedQuery.java
>>> M persistence-api/src/java/javax/persistence/NoResultException.java
>>> M
>>> persistence-
>>>
>> api/src/java/javax/persistence/NonUniqueResultException.java> M
>> persistence-api/src/java/javax/persistence/OneToMany.java
>>
>>> M persistence-api/src/java/javax/persistence/OneToOne.java
>>> M persistence-api/src/java/javax/persistence/OrderBy.java
>>> M persistence-api/src/java/javax/persistence/Persistence.java
>>> M persistence-api/src/java/javax/persistence/PersistenceContext.java
>>> M persistence-
>>>
>> api/src/java/javax/persistence/PersistenceContextType.java> M
>> persistence-api/src/java/javax/persistence/PersistenceContexts.java
>>
>>> M persistence-
>>>
>> api/src/java/javax/persistence/PersistenceException.java> M
>> persistence-api/src/java/javax/persistence/PersistenceUnit.java
>>
>>> M persistence-api/src/java/javax/persistence/PersistenceUnits.java
>>> M persistence-api/src/java/javax/persistence/PostLoad.java
>>> M persistence-api/src/java/javax/persistence/PostPersist.java
>>> M persistence-api/src/java/javax/persistence/PostRemove.java
>>> M persistence-api/src/java/javax/persistence/PostUpdate.java
>>> M persistence-api/src/java/javax/persistence/PrePersist.java
>>> M persistence-api/src/java/javax/persistence/PreRemove.java
>>> M persistence-api/src/java/javax/persistence/PreUpdate.java
>>> M persistence-
>>>
>> api/src/java/javax/persistence/PrimaryKeyJoinColumn.java> M
>> persistence-api/src/java/javax/persistence/PrimaryKeyJoinColumns.java
>>
>>> M persistence-api/src/java/javax/persistence/Query.java
>>> A persistence-api/src/java/javax/persistence/QueryHint.java
>>> M persistence-api/src/java/javax/persistence/SecondaryTable.java
>>> M persistence-api/src/java/javax/persistence/SecondaryTables.java
>>> M persistence-api/src/java/javax/persistence/SequenceGenerator.java
>>> M persistence-
>>>
>> api/src/java/javax/persistence/SqlResultSetMapping.java> M
>> persistence-api/src/java/javax/persistence/Table.java
>>
>>> M persistence-api/src/java/javax/persistence/TableGenerator.java
>>> A persistence-api/src/java/javax/persistence/Temporal.java
>>> M persistence-api/src/java/javax/persistence/TemporalType.java
>>> M
>>> persistence-
>>>
>> api/src/java/javax/persistence/TransactionRequiredException.java
>>
>>> M persistence-api/src/java/javax/persistence/Transient.java
>>> M persistence-api/src/java/javax/persistence/UniqueConstraint.java
>>> M persistence-api/src/java/javax/persistence/Version.java
>>> M persistence-
>>>
>> api/src/java/javax/persistence/spi/PersistenceProvider.java> M
>> persistence-api/src/java/javax/persistence/spi/PersistenceUnitInfo.java
>>
>>> M
>>> persistence-
>>>
>> api/src/java/javax/persistence/spi/PersistenceUnitTransactionType.java
>>
>>> M entity-persistence/src/java/oracle/toplink/essentials/Version.java
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/descriptors/ClassDescriptor.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/descriptors/DescriptorQueryManager.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/descriptors/InheritancePolicy.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/exceptions/ValidationException.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/exceptions/i18n/ValidationExceptionResource.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/expressions/ExpressionBuilder.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/annotations/Accessor.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/annotations/CBListener.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/annotations/DescriptorMetadata.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/annotations/EJBAnnotationsProcessor.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/annotations/SequencingProcessor.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/descriptors/ObjectBuilder.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/JavaSECMPInitializer.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/base/EJBQueryImpl.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataHelper.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/xml/EntityMappingsXMLProcessor.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/xml/JoinTableInfo.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/xml/TableInfo.java
>>
>>> A
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/xml/XMLCBListener.java
>>
>>> A
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/xml/XMLEntityCBListener.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/xml/sequencing/Id.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/xml/sequencing/SequencingProcessor.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/expressions/QueryKeyExpression.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/expressions/SQLSelectStatement.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/expressions/TableExpression.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/helper/DBPlatformHelper.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/identitymaps/CacheKey.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/identitymaps/WeakCacheKey.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/localization/i18n/LoggingLocalizationResource.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/localization/i18n/TraceLocalizationResource.java
>>
>>> A
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/AttributeNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/ConstructorNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/DotNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/EmptyCollectionComparisonNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/FromNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/GenerationContext.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/IdentificationVariableDeclNode.java
>>
>>> R
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/LocalVariableNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/MemberOfNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/Node.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/NodeFactory.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/NodeFactoryImpl.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/OrderByItemNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/OrderByNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/ParameterNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/ParseTreeContext.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/SelectGenerationContext.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/SelectNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/SetNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/SizeNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/VariableNode.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParser.g
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/parsing/ejbql/antlr273/EJBQLParserBuilder.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/sessions/DatabaseSessionImpl.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/internal/weaving/TopLinkWeaver.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/mappings/AggregateCollectionMapping.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/mappings/CollectionMapping.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/mappings/DatabaseMapping.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/mappings/ForeignReferenceMapping.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/mappings/ManyToManyMapping.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/mappings/OneToManyMapping.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/mappings/OneToOneMapping.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/platform/database/DB2Platform.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/queryframework/ObjectLevelReadQuery.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/queryframework/ReadAllQuery.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/queryframework/ReadObjectQuery.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/queryframework/ReportQuery.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/sequencing/TableSequence.java
>>
>>> M
>>> entity-
>>>
>> persistence/src/java/oracle/toplink/essentials/threetier/ServerSession.java
>>
>>>
>>> Bugs/RFE's Fixed:
>>>
>>>
>>>
>>>
>
>