Temporary rollback of (part of) commit

8c2c39d since it causes a problem with
the JDO TCK, but needs investigation whether the problem is the TCK
itself

Author: andyjefferson

src/main/java/org/datanucleus/store/rdbms/table/ArrayTable.java

@@ -224,11 +224,11 @@ public boolean isEmbeddedElementPC()
             // Serialisation takes precedence over embedding
             return false;
         }
-        if (mmd.getArray().elementIsPersistent() && mmd.getArray().isEmbeddedElement())
+        /*if (mmd.getArray().elementIsPersistent() && mmd.getArray().isEmbeddedElement())
         {
             // Persistable element, and marked as embedded element
             return true;
-        }
+        }*/
         if (mmd.getElementMetaData() != null && mmd.getElementMetaData().getEmbeddedMetaData() != null)
         {
             // Embedded metadata provided for element

src/main/java/org/datanucleus/store/rdbms/table/CollectionTable.java

@@ -334,11 +334,12 @@ public boolean isEmbeddedElementPC()
             // Serialisation takes precedence over embedding
             return false;
         }
-        if (mmd.getCollection().elementIsPersistent() && mmd.getCollection().isEmbeddedElement())
+        // TODO Enable this ... see the comment in javadocs for the method
+/*        if (mmd.getCollection().elementIsPersistent() && mmd.getCollection().isEmbeddedElement())
         {
             // Persistable element, and marked as embedded element
             return true;
-        }
+        }*/
         if (mmd.getElementMetaData() != null && mmd.getElementMetaData().getEmbeddedMetaData() != null)
         {
             // Embedded metadata provided for element

src/main/java/org/datanucleus/store/rdbms/table/MapTable.java

@@ -479,11 +479,11 @@ public boolean isEmbeddedKeyPC()
             // Serialized takes precedence over embedded
             return false;
         }
-        if (mmd.getMap().keyIsPersistent() && mmd.getMap().isEmbeddedKey())
+        /*if (mmd.getMap().keyIsPersistent() && mmd.getMap().isEmbeddedKey())
         {
             // Persistable key, and marked as embedded key
             return true;
-        }
+        }*/
         if (mmd.getKeyMetaData() != null && mmd.getKeyMetaData().getEmbeddedMetaData() != null)
         {
             // Embedded metadata provided for key
@@ -549,11 +549,11 @@ public boolean isEmbeddedValuePC()
             // Serialized takes precedence over embedded
             return false;
         }
-        if (mmd.getMap().valueIsPersistent() && mmd.getMap().isEmbeddedValue())
+        /*if (mmd.getMap().valueIsPersistent() && mmd.getMap().isEmbeddedValue())
         {
             // Persistable value, and marked as embedded value
             return true;
-        }
+        }*/
         if (mmd.getValueMetaData() != null && mmd.getValueMetaData().getEmbeddedMetaData() != null)
         {
             // Embedded metadata provided for value