================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/BasicAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.3
Report generated at Fri Sep 1 10:54:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.3 Fri Sep 1 09:58:50 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/BasicAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 149,162 ****
return true;
}
- /**
- * INTERNAL:
- * Return true if the class has MappeedSuperclass annotation presented
- */
- public boolean isReferenceClassAMappedSuperclass() {
- return getReferenceClass().isAnnotationPresent(MappedSuperclass.class);
- }
-
/**
* INTERNAL:
--- 149,154 ----
***************
*** 213,219 ****
* Process a basic accessor.
*/
public void process() {
! // Process the @Column or column element if there is one.
DatabaseField field = getDatabaseField();
// Process an @Version or version element if there is one.
--- 205,217 ----
* Process a basic accessor.
*/
public void process() {
!
! //GlassFishBug#940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
! if(isReferenceClassAMappedSuperclass()){
! throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
! }
!
! // Process the @Column or column element if there is one.
DatabaseField field = getDatabaseField();
// Process an @Version or version element if there is one.
***************
*** 258,268 ****
m_logger.logWarningMessage(m_logger.IGNORE_BASIC_FETCH_LAZY, this);
}
- //GlassFishBug#940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
- if(isReferenceClassAMappedSuperclass()){
- throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
- }
-
// Will check for PROPERTY access
setAccessorMethods(mapping);
--- 256,261 ----
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToManyAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.6
Report generated at Fri Sep 1 10:54:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.6 Fri Sep 1 09:59:05 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToManyAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 23,28 ****
--- 23,29 ----
import javax.persistence.ManyToMany;
+ import oracle.toplink.essentials.exceptions.DescriptorException;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.ClassAccessor;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.objects.MetadataAccessibleObject;
***************
*** 66,71 ****
--- 67,78 ----
* mapping.
*/
public void process() {
+
+ //GlassFishBug#925,940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
+ if(isReferenceClassAMappedSuperclass()){
+ throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
+ }
+
// Create and initialize our mapping.
ManyToManyMapping mapping = new ManyToManyMapping();
populateCollectionMapping(mapping, m_logger.MANY_TO_MANY_MAPPING_REFERENCE_CLASS);
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToOneAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.4
Report generated at Fri Sep 1 10:54:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.4 Fri Sep 1 09:59:18 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToOneAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 23,28 ****
--- 23,29 ----
import javax.persistence.ManyToOne;
+ import oracle.toplink.essentials.exceptions.DescriptorException;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.ClassAccessor;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.objects.MetadataAccessibleObject;
***************
*** 64,71 ****
--- 65,78 ----
* mapping.
*/
public void process() {
+
setReferenceClass(m_targetEntity, getLogger().MANY_TO_ONE_MAPPING_REFERENCE_CLASS);
+ //GlassFishBug#925,940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
+ if(isReferenceClassAMappedSuperclass()){
+ throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
+ }
+
// Initialize our mapping now with what we found.
OneToOneMapping mapping = initOneToOneMapping();
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/MetadataAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Fri Sep 1 10:54:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.12 Fri Sep 1 10:00:36 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/MetadataAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 32,37 ****
--- 32,38 ----
import javax.persistence.Column;
import javax.persistence.FetchType;
+ import javax.persistence.MappedSuperclass;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.PrimaryKeyJoinColumns;
import javax.persistence.UniqueConstraint;
***************
*** 269,274 ****
--- 270,284 ----
/**
* INTERNAL:
+ * Return true if the class has MappedSuperclass annotation presented
+ */
+ public boolean isReferenceClassAMappedSuperclass() {
+ return getReferenceClass().isAnnotationPresent(MappedSuperclass.class);
+ }
+
+
+ /**
+ * INTERNAL:
* Return the reference class name for this accessor.
*/
public String getReferenceClassName() {
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToManyAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.7
Report generated at Fri Sep 1 10:54:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.7 Fri Sep 1 10:01:06 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToManyAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 25,30 ****
--- 25,31 ----
import javax.persistence.OneToMany;
+ import oracle.toplink.essentials.exceptions.DescriptorException;
import oracle.toplink.essentials.internal.helper.DatabaseField;
import oracle.toplink.essentials.mappings.OneToOneMapping;
***************
*** 77,82 ****
--- 78,89 ----
*/
public void process() {
String mappedBy = getMappedBy();
+
+ //GlassFishBug#925,940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
+ if(isReferenceClassAMappedSuperclass()){
+ throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
+ }
+
// Should be treated as a uni-directional mapping using a join table.
if (mappedBy.equals("")) {
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToOneAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.5
Report generated at Fri Sep 1 10:54:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.5 Fri Sep 1 10:01:15 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToOneAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 22,29 ****
--- 22,31 ----
package oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors;
import javax.persistence.FetchType;
+ import javax.persistence.MappedSuperclass;
import javax.persistence.OneToOne;
+ import oracle.toplink.essentials.exceptions.DescriptorException;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.objects.MetadataAccessibleObject;
import oracle.toplink.essentials.mappings.OneToOneMapping;
***************
*** 52,58 ****
setTargetEntity(oneToOne.targetEntity());
}
}
!
/**
* INTERNAL:
*/
--- 54,60 ----
setTargetEntity(oneToOne.targetEntity());
}
}
!
/**
* INTERNAL:
*/
***************
*** 67,77 ****
*/
public void process() {
// Figure out the referenceClass and set it on the mapping.
! setReferenceClass(getTargetEntity(), m_logger.ONE_TO_ONE_MAPPING_REFERENCE_CLASS);
! // Initialize our mapping now with what we found.
OneToOneMapping mapping = initOneToOneMapping();
if (m_mappedBy.equals("")) {
// Owning side, look for JoinColumns or PrimaryKeyJoinColumns.
processOwningMappingKeys(mapping);
--- 69,86 ----
*/
public void process() {
// Figure out the referenceClass and set it on the mapping.
! setReferenceClass(getTargetEntity(), m_logger.ONE_TO_ONE_MAPPING_REFERENCE_CLASS);
! //GlassFishBug#925 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
! if(isReferenceClassAMappedSuperclass()){
! throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
! }
!
! // Initialize our mapping now with what we found.
OneToOneMapping mapping = initOneToOneMapping();
+
+
if (m_mappedBy.equals("")) {
// Owning side, look for JoinColumns or PrimaryKeyJoinColumns.
processOwningMappingKeys(mapping);
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/BasicAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.3
Report generated at Fri Sep 1 10:55:22 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.3 Fri Sep 1 09:58:50 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/BasicAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 149,162 ****
return true;
}
- /**
- * INTERNAL:
- * Return true if the class has MappeedSuperclass annotation presented
- */
- public boolean isReferenceClassAMappedSuperclass() {
- return getReferenceClass().isAnnotationPresent(MappedSuperclass.class);
- }
-
/**
* INTERNAL:
--- 149,154 ----
***************
*** 213,219 ****
* Process a basic accessor.
*/
public void process() {
! // Process the @Column or column element if there is one.
DatabaseField field = getDatabaseField();
// Process an @Version or version element if there is one.
--- 205,217 ----
* Process a basic accessor.
*/
public void process() {
!
! //GlassFishBug#940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
! if(isReferenceClassAMappedSuperclass()){
! throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
! }
!
! // Process the @Column or column element if there is one.
DatabaseField field = getDatabaseField();
// Process an @Version or version element if there is one.
***************
*** 258,268 ****
m_logger.logWarningMessage(m_logger.IGNORE_BASIC_FETCH_LAZY, this);
}
- //GlassFishBug#940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
- if(isReferenceClassAMappedSuperclass()){
- throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
- }
-
// Will check for PROPERTY access
setAccessorMethods(mapping);
--- 256,261 ----
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToManyAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.6
Report generated at Fri Sep 1 10:55:22 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.6 Fri Sep 1 09:59:05 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToManyAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 23,28 ****
--- 23,29 ----
import javax.persistence.ManyToMany;
+ import oracle.toplink.essentials.exceptions.DescriptorException;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.ClassAccessor;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.objects.MetadataAccessibleObject;
***************
*** 66,71 ****
--- 67,78 ----
* mapping.
*/
public void process() {
+
+ //GlassFishBug#925,940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
+ if(isReferenceClassAMappedSuperclass()){
+ throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
+ }
+
// Create and initialize our mapping.
ManyToManyMapping mapping = new ManyToManyMapping();
populateCollectionMapping(mapping, m_logger.MANY_TO_MANY_MAPPING_REFERENCE_CLASS);
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToOneAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.4
Report generated at Fri Sep 1 10:55:22 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.4 Fri Sep 1 09:59:18 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToOneAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 23,28 ****
--- 23,29 ----
import javax.persistence.ManyToOne;
+ import oracle.toplink.essentials.exceptions.DescriptorException;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.ClassAccessor;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.objects.MetadataAccessibleObject;
***************
*** 64,71 ****
--- 65,78 ----
* mapping.
*/
public void process() {
+
setReferenceClass(m_targetEntity, getLogger().MANY_TO_ONE_MAPPING_REFERENCE_CLASS);
+ //GlassFishBug#925,940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
+ if(isReferenceClassAMappedSuperclass()){
+ throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
+ }
+
// Initialize our mapping now with what we found.
OneToOneMapping mapping = initOneToOneMapping();
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/MetadataAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Fri Sep 1 10:55:22 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.12 Fri Sep 1 10:00:36 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/MetadataAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 32,37 ****
--- 32,38 ----
import javax.persistence.Column;
import javax.persistence.FetchType;
+ import javax.persistence.MappedSuperclass;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.PrimaryKeyJoinColumns;
import javax.persistence.UniqueConstraint;
***************
*** 269,274 ****
--- 270,284 ----
/**
* INTERNAL:
+ * Return true if the class has MappedSuperclass annotation presented
+ */
+ public boolean isReferenceClassAMappedSuperclass() {
+ return getReferenceClass().isAnnotationPresent(MappedSuperclass.class);
+ }
+
+
+ /**
+ * INTERNAL:
* Return the reference class name for this accessor.
*/
public String getReferenceClassName() {
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToManyAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.7
Report generated at Fri Sep 1 10:55:22 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.7 Fri Sep 1 10:01:06 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToManyAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 25,30 ****
--- 25,31 ----
import javax.persistence.OneToMany;
+ import oracle.toplink.essentials.exceptions.DescriptorException;
import oracle.toplink.essentials.internal.helper.DatabaseField;
import oracle.toplink.essentials.mappings.OneToOneMapping;
***************
*** 77,82 ****
--- 78,89 ----
*/
public void process() {
String mappedBy = getMappedBy();
+
+ //GlassFishBug#925,940 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
+ if(isReferenceClassAMappedSuperclass()){
+ throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
+ }
+
// Should be treated as a uni-directional mapping using a join table.
if (mappedBy.equals("")) {
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToOneAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.5
Report generated at Fri Sep 1 10:55:22 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf925_060901/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.5 Fri Sep 1 10:01:15 2006
--- /ade/xiaosche_tl_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToOneAccessor.java Fri Sep 1 10:54:25 2006
***************
*** 22,29 ****
--- 22,31 ----
package oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors;
import javax.persistence.FetchType;
+ import javax.persistence.MappedSuperclass;
import javax.persistence.OneToOne;
+ import oracle.toplink.essentials.exceptions.DescriptorException;
import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.objects.MetadataAccessibleObject;
import oracle.toplink.essentials.mappings.OneToOneMapping;
***************
*** 52,58 ****
setTargetEntity(oneToOne.targetEntity());
}
}
!
/**
* INTERNAL:
*/
--- 54,60 ----
setTargetEntity(oneToOne.targetEntity());
}
}
!
/**
* INTERNAL:
*/
***************
*** 67,77 ****
*/
public void process() {
// Figure out the referenceClass and set it on the mapping.
! setReferenceClass(getTargetEntity(), m_logger.ONE_TO_ONE_MAPPING_REFERENCE_CLASS);
! // Initialize our mapping now with what we found.
OneToOneMapping mapping = initOneToOneMapping();
if (m_mappedBy.equals("")) {
// Owning side, look for JoinColumns or PrimaryKeyJoinColumns.
processOwningMappingKeys(mapping);
--- 69,86 ----
*/
public void process() {
// Figure out the referenceClass and set it on the mapping.
! setReferenceClass(getTargetEntity(), m_logger.ONE_TO_ONE_MAPPING_REFERENCE_CLASS);
! //GlassFishBug#925 Exception need be thrown if MappedSuperclass is targetted in persistent relationship(JSR220 2.1.9.2)
! if(isReferenceClassAMappedSuperclass()){
! throw DescriptorException.mappedSuperclassTargettedByPersistentRelationship(getReferenceClass());
! }
!
! // Initialize our mapping now with what we found.
OneToOneMapping mapping = initOneToOneMapping();
+
+
if (m_mappedBy.equals("")) {
// Owning side, look for JoinColumns or PrimaryKeyJoinColumns.
processOwningMappingKeys(mapping);