Attachment 147233 Details for Bug 289163 – patch addressing most of the issues

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

patch addressing most of the issues

289163.patch (text/plain), 63.79 KB, created by Tom Ware

on 2009-09-15 13:37:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Ware

Created: 2009-09-15 13:37:51 EDT

Size: 63.79 KB

patch

obsolete

>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/aggregate/AggregateProject.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/aggregate/AggregateProject.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/aggregate/AggregateProject.java	(working copy)
>@@ -1071,7 +1071,7 @@
>         org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
>         directtofieldmapping1.setAttributeName("language");
>         directtofieldmapping1.setIsReadOnly(false);
>-        directtofieldmapping1.setFieldName("AGG_LAN.LANGUAGE");
>+        directtofieldmapping1.setFieldName("AGG_LAN.LANG");
>         descriptor.addMapping(directtofieldmapping1);
>         addDescriptor(descriptor);
>     }
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/aggregate/Language.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/aggregate/Language.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/aggregate/Language.java	(working copy)
>@@ -85,7 +85,7 @@
>         definition.setName("AGG_LAN");
> 
>         definition.addIdentityField("ID", java.math.BigDecimal.class, 15);
>-        definition.addField("LANGUAGE", String.class, 30);
>+        definition.addField("LANG", String.class, 30);
> 
>         return definition;
>     }
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsProject.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsProject.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsProject.java	(working copy)
>@@ -72,7 +72,7 @@
>         DirectMapMapping directMapMapping = new DirectMapMapping();
>         directMapMapping.setAttributeName("directMap");
>         directMapMapping.setReferenceTableName("DIRECTMAP1");
>-        directMapMapping.setDirectFieldName("DIRECTMAP1.VALUE");
>+        directMapMapping.setDirectFieldName("DIRECTMAP1.VAL");
>         //"KEY" is a reserved keyword for SyBase, it can't be used as a field name
>         directMapMapping.setDirectKeyFieldName("DIRECTMAP1.KEY_FIELD");
>         directMapMapping.addReferenceKeyFieldName("DIRECTMAP1.ID", "DIRECTMAPMAPPINGS.ID");
>@@ -87,7 +87,7 @@
>         DirectMapMapping directMapBatchMapping = new DirectMapMapping();
>         directMapBatchMapping.setAttributeName("directMapForBatchRead");
>         directMapBatchMapping.setReferenceTableName("DIRECTMAP2");
>-        directMapBatchMapping.setDirectFieldName("DIRECTMAP2.VALUE");
>+        directMapBatchMapping.setDirectFieldName("DIRECTMAP2.VAL");
>         directMapBatchMapping.setDirectKeyFieldName("DIRECTMAP2.KEY_FIELD");
>         directMapBatchMapping.addReferenceKeyFieldName("DIRECTMAP2.ID", "DIRECTMAPMAPPINGS.ID");
>         directMapBatchMapping.setReferenceClass(Hashtable.class);
>@@ -101,7 +101,7 @@
>         DirectMapMapping indirectionDirectMapMapping = new DirectMapMapping();
>         indirectionDirectMapMapping.setAttributeName("indirectionDirectMap");
>         indirectionDirectMapMapping.setReferenceTableName("DIRECTMAP3");
>-        indirectionDirectMapMapping.setDirectFieldName("DIRECTMAP3.VALUE");
>+        indirectionDirectMapMapping.setDirectFieldName("DIRECTMAP3.VAL");
>         indirectionDirectMapMapping.setDirectKeyFieldName("DIRECTMAP3.KEY_FIELD");
>         indirectionDirectMapMapping.addReferenceKeyFieldName("DIRECTMAP3.ID", "DIRECTMAPMAPPINGS.ID");
>         indirectionDirectMapMapping.setReferenceClass(Hashtable.class);
>@@ -114,7 +114,7 @@
>         DirectMapMapping directMapBlobMapping = new DirectMapMapping();
>         directMapBlobMapping.setAttributeName("blobDirectMap");
>         directMapBlobMapping.setReferenceTableName("DIRECTMAPBLOB");
>-        directMapBlobMapping.setDirectFieldName("DIRECTMAPBLOB.VALUE");
>+        directMapBlobMapping.setDirectFieldName("DIRECTMAPBLOB.VAL");
>         directMapBlobMapping.setDirectKeyFieldName("DIRECTMAPBLOB.KEY_FIELD");
>         directMapBlobMapping.addReferenceKeyFieldName("DIRECTMAPBLOB.ID", "DIRECTMAPMAPPINGS.ID");
>         directMapBlobMapping.setReferenceClass(Hashtable.class);
>@@ -128,7 +128,7 @@
>         DirectMapMapping directHashMapMapping = new DirectMapMapping();
>         directHashMapMapping.setAttributeName("directHashMap");
>         directHashMapMapping.setReferenceTableName("DIRECTMAP4");
>-        directHashMapMapping.setDirectFieldName("DIRECTMAP4.VALUE");
>+        directHashMapMapping.setDirectFieldName("DIRECTMAP4.VAL");
>         directHashMapMapping.setDirectKeyFieldName("DIRECTMAP4.KEY_FIELD");
>         directHashMapMapping.addReferenceKeyFieldName("DIRECTMAP4.ID", "DIRECTMAPMAPPINGS.ID");
>         directHashMapMapping.setReferenceClass(HashMap.class);
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsTableCreator.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsTableCreator.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsTableCreator.java	(working copy)
>@@ -83,7 +83,7 @@
>         table.addField(fieldKEY);
> 
>         FieldDefinition fieldVALUE = new FieldDefinition();
>-        fieldVALUE.setName("VALUE");
>+        fieldVALUE.setName("VAL");
>         fieldVALUE.setTypeName("VARCHAR2");
>         fieldVALUE.setSize(100);
>         fieldVALUE.setSubSize(0);
>@@ -125,7 +125,7 @@
>         table.addField(fieldKEY);
> 
>         FieldDefinition fieldVALUE = new FieldDefinition();
>-        fieldVALUE.setName("VALUE");
>+        fieldVALUE.setName("VAL");
>         fieldVALUE.setTypeName("BLOB");
>         fieldVALUE.setIsPrimaryKey(false);
>         fieldVALUE.setIsIdentity(false);
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/interfaces/InterfaceHashtableProject.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/interfaces/InterfaceHashtableProject.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/interfaces/InterfaceHashtableProject.java	(working copy)
>@@ -189,7 +189,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS100.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS100.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -232,7 +232,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS10.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS10.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -275,7 +275,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS11.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS11.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -318,7 +318,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS12.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS12.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -361,7 +361,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS13.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS13.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -404,7 +404,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS14.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS14.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -447,7 +447,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS15.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS15.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -490,7 +490,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS16.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS16.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -533,7 +533,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS17.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS17.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -576,7 +576,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS18.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS18.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -619,7 +619,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS19.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS19.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -662,7 +662,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS1.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS1.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -705,7 +705,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS20.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS20.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -748,7 +748,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS21.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS21.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -791,7 +791,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS22.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS22.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -834,7 +834,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS23.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS23.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -877,7 +877,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS24.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS24.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -920,7 +920,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS25.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS25.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -963,7 +963,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS26.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS26.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1006,7 +1006,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS27.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS27.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1049,7 +1049,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS28.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS28.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1092,7 +1092,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS29.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS29.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1135,7 +1135,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS2.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS2.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1178,7 +1178,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS30.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS30.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1221,7 +1221,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS31.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS31.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1264,7 +1264,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS32.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS32.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1307,7 +1307,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS33.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS33.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1350,7 +1350,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS34.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS34.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1393,7 +1393,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS35.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS35.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1436,7 +1436,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS36.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS36.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1479,7 +1479,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS37.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS37.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1522,7 +1522,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS38.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS38.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1565,7 +1565,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS39.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS39.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1608,7 +1608,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS3.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS3.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1651,7 +1651,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS40.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS40.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1694,7 +1694,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS41.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS41.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1737,7 +1737,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS42.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS42.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1780,7 +1780,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS43.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS43.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1823,7 +1823,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS44.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS44.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1866,7 +1866,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS45.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS45.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1909,7 +1909,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS46.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS46.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1952,7 +1952,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS47.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS47.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -1995,7 +1995,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS48.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS48.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2038,7 +2038,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS49.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS49.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2081,7 +2081,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS4.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS4.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2124,7 +2124,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS50.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS50.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2167,7 +2167,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS51.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS51.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2210,7 +2210,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS52.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS52.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2253,7 +2253,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS53.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS53.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2296,7 +2296,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS54.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS54.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2339,7 +2339,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS55.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS55.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2382,7 +2382,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS56.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS56.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2425,7 +2425,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS57.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS57.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2468,7 +2468,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS58.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS58.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2511,7 +2511,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS59.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS59.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2554,7 +2554,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS5.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS5.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2597,7 +2597,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS60.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS60.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2640,7 +2640,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS61.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS61.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2683,7 +2683,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS62.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS62.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2726,7 +2726,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS63.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS63.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2769,7 +2769,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS64.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS64.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2812,7 +2812,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS65.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS65.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2855,7 +2855,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS66.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS66.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2898,7 +2898,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS67.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS67.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2941,7 +2941,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS68.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS68.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -2984,7 +2984,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS69.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS69.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3027,7 +3027,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS6.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS6.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3070,7 +3070,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS70.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS70.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3113,7 +3113,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS71.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS71.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3156,7 +3156,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS72.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS72.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3199,7 +3199,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS73.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS73.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3242,7 +3242,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS74.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS74.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3285,7 +3285,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS75.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS75.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3328,7 +3328,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS76.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS76.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3371,7 +3371,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS77.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS77.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3414,7 +3414,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS78.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS78.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3457,7 +3457,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS79.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS79.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3500,7 +3500,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS7.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS7.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3543,7 +3543,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS80.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS80.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3586,7 +3586,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS81.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS81.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3629,7 +3629,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS82.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS82.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3672,7 +3672,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS83.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS83.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3715,7 +3715,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS84.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS84.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3758,7 +3758,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS85.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS85.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3801,7 +3801,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS86.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS86.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3844,7 +3844,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS87.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS87.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3887,7 +3887,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS88.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS88.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3930,7 +3930,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS89.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS89.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -3973,7 +3973,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS8.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS8.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4016,7 +4016,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS90.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS90.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4059,7 +4059,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS91.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS91.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4102,7 +4102,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS92.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS92.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4145,7 +4145,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS93.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS93.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4188,7 +4188,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS94.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS94.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4231,7 +4231,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS95.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS95.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4274,7 +4274,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS96.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS96.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4317,7 +4317,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS97.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS97.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4360,7 +4360,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS98.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS98.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4403,7 +4403,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS99.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS99.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>@@ -4446,7 +4446,7 @@
> 	org.eclipse.persistence.mappings.DirectToFieldMapping directtofieldmapping1 = new org.eclipse.persistence.mappings.DirectToFieldMapping();
> 	directtofieldmapping1.setAttributeName("value");
> 	directtofieldmapping1.setIsReadOnly(false );
>-	directtofieldmapping1.setFieldName("CLASS9.VALUE");
>+	directtofieldmapping1.setFieldName("CLASS9.VAL");
> 	descriptor.addMapping(directtofieldmapping1);
> 	addDescriptor(descriptor);
> }
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/interfaces/InterfaceWithoutTablesSystem.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/interfaces/InterfaceWithoutTablesSystem.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/interfaces/InterfaceWithoutTablesSystem.java	(working copy)
>@@ -9,6 +9,7 @@
>  *
>  * Contributors:
>  *     Oracle - initial API and implementation from Oracle TopLink
>+ *     Dies Koper - use the default sequence name from the platform
>  ******************************************************************************/  
> package org.eclipse.persistence.testing.models.interfaces;
> 
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchTestCase.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchTestCase.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchTestCase.java	(working copy)
>@@ -93,7 +93,12 @@
>     	try {
>     		// Add expected inserts to sequence
>     		DataModifyQuery modifyQuery = new DataModifyQuery();
>-    		modifyQuery.setSQLString("UPDATE SEQUENCE SET SEQ_COUNT = SEQ_COUNT + 10 WHERE SEQ_NAME = 'EMP_SEQ'");
>+    		
>+            String sequenceTableName = "SEQUENCE";
>+            if (getSession().getPlatform().getDefaultSequence().isTable()) {
>+                sequenceTableName = getSession().getPlatform().getQualifiedSequenceTableName();
>+            }
>+    		modifyQuery.setSQLString("UPDATE " + sequenceTableName + " SET SEQ_COUNT = SEQ_COUNT + 10 WHERE SEQ_NAME = 'EMP_SEQ'");
>     		modifyQuery.setForceBatchStatementExecution(true);
>     		uow.addQuery("modify1", modifyQuery);    		
>     		uow.executeQuery(modifyQuery);
>@@ -101,7 +106,7 @@
>     	
>     		// Get next sequence
>     		DataReadQuery readQuery = new DataReadQuery();
>-    		readQuery.setSQLString("SELECT SEQ_COUNT FROM SEQUENCE WHERE SEQ_NAME = 'EMP_SEQ'");
>+    		readQuery.setSQLString("SELECT SEQ_COUNT FROM " + sequenceTableName + " WHERE SEQ_NAME = 'EMP_SEQ'");
>     		uow.addQuery("read1", readQuery);    		
>     		Object resultFromRead = uow.executeQuery(readQuery);
>     		DatabaseRecord dbRecord = (DatabaseRecord)((Vector)resultFromRead).get(0);
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/SequencingTableQualifierTest.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/SequencingTableQualifierTest.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/feature/SequencingTableQualifierTest.java	(working copy)
>@@ -68,7 +68,11 @@
>     }
>     
>     public Sequence createTableSequence() {
>-        return new TableSequence("", 50, "SEQUENCE", "SEQ_NAME", "SEQ_COUNT"); 
>+        String sequenceTableName = "SEQUENCE";
>+        if (getSession().getPlatform().getDefaultSequence().isTable()) {
>+            sequenceTableName = getSession().getPlatform().getQualifiedSequenceTableName();
>+        }
>+        return new TableSequence("", 50, sequenceTableName, "SEQ_NAME", "SEQ_COUNT"); 
>     }
>     
>     public void test() {
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/proxyindirection/ProxyIndirectionProject.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/proxyindirection/ProxyIndirectionProject.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/proxyindirection/ProxyIndirectionProject.java	(working copy)
>@@ -474,7 +474,7 @@
>         directtofieldmapping.setIsReadOnly(false);
>         directtofieldmapping.setGetMethodName("getDomain");
>         directtofieldmapping.setSetMethodName("setDomain");
>-        directtofieldmapping.setFieldName("PROXY_EMAIL.DOMAIN");
>+        directtofieldmapping.setFieldName("PROXY_EMAIL.EMAIL_DOMAIN");
>         descriptor.addMapping(directtofieldmapping);
> 
>         // SECTION: DIRECTTOFIELDMAPPING
>Index: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/proxyindirection/ProxyIndirectionTableCreator.java
>===================================================================
>--- foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/proxyindirection/ProxyIndirectionTableCreator.java	(revision 5130)
>+++ foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/proxyindirection/ProxyIndirectionTableCreator.java	(working copy)
>@@ -237,7 +237,7 @@
> 
>         // SECTION: FIELD
>         org.eclipse.persistence.tools.schemaframework.FieldDefinition field4 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
>-        field4.setName("DOMAIN");
>+        field4.setName("EMAIL_DOMAIN");
>         field4.setTypeName("VARCHAR");
>         field4.setSize(50);
>         field4.setShouldAllowNull(true);
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-xml-only-model/advanced-entity-mappings.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-xml-only-model/advanced-entity-mappings.xml	(revision 5130)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-xml-only-model/advanced-entity-mappings.xml	(working copy)
>@@ -330,7 +330,7 @@
>                 <column name="NAME"/>
>             </id>
>             <id name="role" >
>-                <column name="ROLE"/>
>+                <column name="DEPT_ROLE"/>
>             </id>
>             <id name="location" >
>                 <column name="LOCATION"/>
>@@ -361,7 +361,7 @@
>             </id>
>             <many-to-one name="department" target-entity="org.eclipse.persistence.testing.models.jpa.xml.advanced.compositepk.Department">
>                 <join-column name="DEPT_NAME" referenced-column-name="NAME"/>
>-                <join-column name="DEPT_ROLE" referenced-column-name="ROLE"/>
>+                <join-column name="DEPT_ROLE" referenced-column-name="DEPT_ROLE"/>
>                 <join-column name="DEPT_LOCATION" referenced-column-name="LOCATION"/>
>             </many-to-one>
>             <one-to-one name="cubicle" target-entity="org.eclipse.persistence.testing.models.jpa.xml.advanced.compositepk.Cubicle">
>@@ -394,7 +394,7 @@
>         <attributes>
>             <one-to-one name="department" target-entity="org.eclipse.persistence.testing.models.jpa.xml.advanced.compositepk.Department" id="true">
>                 <join-column name="DEPT_NAME" referenced-column-name="NAME"/>
>-                <join-column name="DEPT_ROLE" referenced-column-name="ROLE"/>
>+                <join-column name="DEPT_ROLE" referenced-column-name="DEPT_ROLE"/>
>                 <join-column name="DEPT_LOCATION" referenced-column-name="LOCATION"/>
>             </one-to-one>
>             <one-to-one name="admin" target-entity="org.eclipse.persistence.testing.models.jpa.xml.advanced.derivedid.Administrator" id="true"/>
>Index: jpa/eclipselink.jpa.test/resource/eclipselinkorm/eclipselink-xml-extended-model/advanced-extended-entity-mappings.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselinkorm/eclipselink-xml-extended-model/advanced-extended-entity-mappings.xml	(revision 5130)
>+++ jpa/eclipselink.jpa.test/resource/eclipselinkorm/eclipselink-xml-extended-model/advanced-extended-entity-mappings.xml	(working copy)
>@@ -369,7 +369,7 @@
>             </id>
>             <many-to-one name="department" target-entity="org.eclipse.persistence.testing.models.jpa.xml.advanced.compositepk.Department">
>                 <join-column name="DEPT_NAME" referenced-column-name="NAME"/>
>-                <join-column name="DEPT_ROLE" referenced-column-name="ROLE"/>
>+                <join-column name="DEPT_ROLE" referenced-column-name="DEPT_ROLE"/>
>                 <join-column name="DEPT_LOCATION" referenced-column-name="LOCATION"/>
>             </many-to-one>
>             <one-to-one name="cubicle" target-entity="org.eclipse.persistence.testing.models.jpa.xml.advanced.compositepk.Cubicle">
>@@ -402,7 +402,7 @@
>         <attributes>
>             <one-to-one name="department" target-entity="org.eclipse.persistence.testing.models.jpa.xml.advanced.compositepk.Department" id="true">
>                 <join-column name="DEPT_NAME" referenced-column-name="NAME"/>
>-                <join-column name="DEPT_ROLE" referenced-column-name="ROLE"/>
>+                <join-column name="DEPT_ROLE" referenced-column-name="DEPT_ROLE"/>
>                 <join-column name="DEPT_LOCATION" referenced-column-name="LOCATION"/>
>             </one-to-one>
>             <one-to-one name="admin" target-entity="org.eclipse.persistence.testing.models.jpa.xml.advanced.derivedid.Administrator" id="true"/>
>Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/xml/advanced/compositepk/CompositePKTableCreator.java
>===================================================================
>--- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/xml/advanced/compositepk/CompositePKTableCreator.java	(revision 5130)
>+++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/xml/advanced/compositepk/CompositePKTableCreator.java	(working copy)
>@@ -203,7 +203,7 @@
>         fkConstraint2.addSourceField("DEPT_LOCATION");
>         fkConstraint2.setTargetTable("CMP3_XML_DEPARTMENT");
>         fkConstraint2.addTargetField("NAME");
>-        fkConstraint2.addTargetField("ROLE");
>+        fkConstraint2.addTargetField("DEPT_ROLE");
>         fkConstraint2.addTargetField("LOCATION");
>         table.addForeignKeyConstraint(fkConstraint2);
>        
>@@ -278,7 +278,7 @@
>         table.addField(NAME_field);
>     
>         FieldDefinition ROLE_field = new FieldDefinition();
>-        ROLE_field.setName("ROLE");
>+        ROLE_field.setName("DEPT_ROLE");
>         ROLE_field.setTypeName("VARCHAR");
>         ROLE_field.setSize(40);
>         ROLE_field.setShouldAllowNull(false);
>Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java
>===================================================================
>--- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java	(revision 5130)
>+++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java	(working copy)
>@@ -1758,7 +1758,7 @@
>                     
>                     HashMap properties = new HashMap();
>                     properties.put(QueryHints.PESSIMISTIC_LOCK_TIMEOUT, 5);
>-                    Employee employee2 = em2.find(Employee.class, employee.getId(), LockModeType.PESSIMISTIC_READ, properties);
>+                    Employee employee2 = (Employee)em2.find(Employee.class, employee.getId(), LockModeType.PESSIMISTIC_READ, properties);
>                     employee2.setFirstName("Invalid Lock Employee");
>                     commitTransaction(em2);
>                 } catch (PersistenceException ex) {
>@@ -1811,7 +1811,7 @@
>                     
>                     HashMap properties = new HashMap();
>                     properties.put(QueryHints.PESSIMISTIC_LOCK_TIMEOUT, 5);
>-                    Employee employee2 = em2.find(Employee.class, employee.getId(), LockModeType.PESSIMISTIC_WRITE, properties);
>+                    Employee employee2 = (Employee)em2.find(Employee.class, employee.getId(), LockModeType.PESSIMISTIC_WRITE, properties);
>                     employee2.setFirstName("Invalid Lock Employee");
>                     commitTransaction(em2);
>                 } catch (PersistenceException ex) {
>@@ -2563,7 +2563,7 @@
>               Employee e1=em.find(Employee.class,empId);
>               e1.setFirstName("testfind");
>               queryhints.put(QueryHints.REFRESH, "TRUE");
>-              Employee e2= em.find(Employee.class,empId ,queryhints);
>+              Employee e2= (Employee)em.find(Employee.class,empId ,queryhints);
>               assertFalse(e2.getFirstName().equals("testfind"));
>               commitTransaction(em);
>             } catch (IllegalArgumentException iae) {

Actions: View

Attachments on bug 289163: 147233