DataNucleus

Revision: 16456
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16456&view=rev
Author:   andy_jefferson
Date:     2013-01-27 08:41:31 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
[NUCCORE-988] Provide mechanism whereby only updated fields are updated in the L2 cached object

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/Localisation.properties
    platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
    platform/core/trunk/src/java/org/datanucleus/cache/CachedPC.java
    platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java	2013-01-25 19:29:14 UTC (rev 16455)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java	2013-01-27 08:41:31 UTC (rev 16456)
@@ -357,7 +357,7 @@
     /**
      * Method to add the object managed by the specified ObjectProvider to the cache.
      * @param op The ObjectProvider
-     */    
+     */
     void addObjectProvider(ObjectProvider op);
 
     /**
@@ -706,6 +706,13 @@
     void removeObjectFromLevel2Cache(Object id);
 
     /**
+     * Method to mark the object with specifed id to have the supplied fields updated in the L2 cache at commit.
+     * @param id Id of the object
+     * @param fields The fields to update
+     */
+    void markFieldsForUpdateInLevel2Cache(Object id, boolean[] fields);
+
+    /**
      * Whether an object with the specified identity exists in the cache(s).
      * Used as a check on identity (inheritance-level) validity
      * @param id The identity

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-01-25 19:29:14 UTC (rev 16455)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-01-27 08:41:31 UTC (rev 16456)
@@ -23,6 +23,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.BitSet;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -171,6 +172,9 @@
     /** Set of ids to be Level2 cached at commit (if using L2 cache). */
     private Set txCachedIds = null;
 
+    /** Map of fields of object to update in L2 cache (when attached), keyed by the id. */
+    private Map<Object, BitSet> txCachedFieldsToUpdateById = null;
+
     /** Properties controlling runtime behaviour (detach on commit, multithreaded, etc). */
     private BasePropertyStore properties = new BasePropertyStore();
 
@@ -254,6 +258,7 @@
         {
             // Create temporary storage to handle objects needing L2 caching after txn
             txCachedIds = new HashSet();
+            txCachedFieldsToUpdateById = new HashMap<Object, BitSet>();
         }
     }
 
@@ -451,6 +456,10 @@
         {
             txCachedIds.clear();
         }
+        if (txCachedFieldsToUpdateById != null)
+        {
+            txCachedFieldsToUpdateById.clear();
+        }
         if (getReachabilityAtCommit())
         {
             txKnownPersistedIds.clear();
@@ -4315,6 +4324,31 @@
         return false;
     }
 
+    /* (non-Javadoc)
+     * @see org.datanucleus.ExecutionContext#markFieldsForUpdateInLevel2Cache(java.lang.Object, boolean[])
+     */
+    public void markFieldsForUpdateInLevel2Cache(Object id, boolean[] fields)
+    {
+        if (txCachedFieldsToUpdateById == null)
+        {
+            return;
+        }
+
+        BitSet bits = txCachedFieldsToUpdateById.get(id);
+        if (bits == null)
+        {
+            bits = new BitSet();
+            txCachedFieldsToUpdateById.put(id, bits);
+        }
+        for (int i=0;i<fields.length;i++)
+        {
+            if (fields[i])
+            {
+                bits.set(i);
+            }
+        }
+    }
+
     /**
      * Method invoked during commit() to perform updates to the L2 cache.
      * <ul>
@@ -4400,6 +4434,7 @@
         }
 
         txCachedIds.clear();
+        txCachedFieldsToUpdateById.clear();
     }
 
     /**
@@ -4876,6 +4911,10 @@
         {
             txCachedIds.clear();
         }
+        if (txCachedFieldsToUpdateById != null)
+        {
+            txCachedFieldsToUpdateById.clear();
+        }
     }
 
     // -------------------------------------- Cache Management ---------------------------------------
@@ -4943,9 +4982,10 @@
      * Convenience method to convert the object managed by the ObjectProvider into a form suitable for
      * caching in an L2 cache.
      * @param op ObjectProvider for the object
+     * @param currentCachedPC Current L2 cached object (if any) to use for updating
      * @return The cacheable form of the object
      */
-    protected CachedPC getL2CacheableObject(ObjectProvider op)
+    protected CachedPC getL2CacheableObject(ObjectProvider op, CachedPC currentCachedPC)
     {
         int[] loadedFieldNumbers = op.getLoadedFieldNumbers();
         if (loadedFieldNumbers == null || loadedFieldNumbers.length == 0)
@@ -4954,9 +4994,48 @@
             return null;
         }
 
-        CachedPC cachedPC = new CachedPC(op.getObject().getClass(), op.getLoadedFields(), op.getTransactionalVersion());
-        op.provideFields(loadedFieldNumbers, new L2CachePopulateFieldManager(op, cachedPC));
+        CachedPC cachedPC = null;
+        if (currentCachedPC != null)
+        {
+            cachedPC = currentCachedPC.getCopy();
+            cachedPC.setVersion(op.getTransactionalVersion());
+        }
+        else
+        {
+            cachedPC = new CachedPC(op.getObject().getClass(), op.getLoadedFields(), op.getTransactionalVersion());
+        }
 
+        int[] fieldsToUpdate = loadedFieldNumbers;
+        if (currentCachedPC != null)
+        {
+            // Object already L2 cached and we have a set of fields that were updated, so just update those
+            BitSet fieldsToUpdateBitSet = txCachedFieldsToUpdateById.get(op.getInternalObjectId());
+            if (fieldsToUpdateBitSet != null)
+            {
+                int num = 0;
+                for (int i=0;i<fieldsToUpdateBitSet.length();i++)
+                {
+                    if (fieldsToUpdateBitSet.get(i))
+                    {
+                        num++;
+                    }
+                }
+                fieldsToUpdate = new int[num];
+                int j = 0;
+                for (int i=0;i<fieldsToUpdateBitSet.length();i++)
+                {
+                    if (fieldsToUpdateBitSet.get(i))
+                    {
+                        fieldsToUpdate[j++] = i;
+                    }
+                }
+                NucleusLogger.CACHE.debug(LOCALISER.msg("004015", op.getInternalObjectId(), 
+                    StringUtils.intArrayToString(fieldsToUpdate)));
+            }
+        }
+
+        op.provideFields(fieldsToUpdate, new L2CachePopulateFieldManager(op, cachedPC));
+
         return cachedPC;
     }
 
@@ -4973,7 +5052,8 @@
         for (ObjectProvider op : ops)
         {
             Object id = op.getInternalObjectId();
-            CachedPC cachedPC = getL2CacheableObject(op);
+            CachedPC currentCachedPC = l2Cache.get(id);
+            CachedPC cachedPC = getL2CacheableObject(op, currentCachedPC);
             if (cachedPC != null && id != null && !(id instanceof IdentityReference))
             {
                 // Only cache if something to be cached and has identity
@@ -5033,7 +5113,8 @@
             return;
         }
 
-        CachedPC cachedPC = getL2CacheableObject(op);
+        CachedPC currentCachedPC = l2Cache.get(id);
+        CachedPC cachedPC = getL2CacheableObject(op, currentCachedPC);
         if (cachedPC != null)
         {
             // Update/add in the L2 cache

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-01-25 19:29:14 UTC (rev 16455)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-01-27 08:41:31 UTC (rev 16456)
@@ -67,6 +67,7 @@
 004012=Unable to add object with id "{0}" to L2 Cache since it is still attached to a PersistenceManager.
 004013=Object "{0}" (id="{1}") updated in Level 2 cache (fields="{2}", version="{3}")
 004014=Object with id="{0}" removed from Level 2 cache since was updated yet object has been GCed
+004015=Object with id="{0}" updated in Level 2 cached for fields "{1}"
 004016=Object with id="{0}" removed from Level 2 cache
 
 #

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-01-25 19:29:14 UTC (rev 16455)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-01-27 08:41:31 UTC (rev 16456)
@@ -66,6 +66,7 @@
 004012=No se puede a\xF1adir el objeto "{0}" a la Cache de nivel 2 porque esta conectado a un PersistenceManager.
 004013=Objeto "{0}" (id="{1}") cambiado en la Cache de nivel 2 (campos="{2}", version="{3}")
 004014=Objeto con identidad="{0}") borrado de la Cache de nivel 2 porque ha cambiado pero ha sido GCed
+004015=Objeto con identidad="{0}" cambiado en la Cache de nivel 2 para campos "{1}"
 004016=Objeto con identidad="{0}" borrado de la Cache de nivel 2
 
 #

Modified: platform/core/trunk/src/java/org/datanucleus/cache/CachedPC.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/cache/CachedPC.java	2013-01-25 19:29:14 UTC (rev 16455)
+++ platform/core/trunk/src/java/org/datanucleus/cache/CachedPC.java	2013-01-27 08:41:31 UTC (rev 16456)
@@ -84,10 +84,11 @@
         return fieldValues.get(fieldNumber);
     }
 
-    /**
-     * Version accessor.
-     * @return Version of cached object
-     */
+    public void setVersion(Object ver)
+    {
+        this.version = ver;
+    }
+
     public Object getVersion()
     {
         return version;

Modified: platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java	2013-01-25 19:29:14 UTC (rev 16455)
+++ platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java	2013-01-27 08:41:31 UTC (rev 16456)
@@ -3725,6 +3725,7 @@
                     }
                     if (!isEmbedded())
                     {
+                        myEC.markFieldsForUpdateInLevel2Cache(getInternalObjectId(), dirtyFields);
                         myEC.getStoreManager().getPersistenceHandler().updateObject(this, dirtyFieldNumbers);
 
                         // Update the object in the cache(s)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16459
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16459&view=rev
Author:   andy_jefferson
Date:     2013-01-27 19:33:30 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
[NUCCORE-989] Add simple support for TransactionSynchronizationRegistry, doing the JNDI lookup and the register through that (rather than the Transaction way) if it is available.

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/transaction/jta/JTASyncRegistry.java
    platform/core/trunk/src/java/org/datanucleus/transaction/jta/JTASyncRegistryUnavailableException.java

Modified: platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java	2013-01-27 18:34:05 UTC (rev 16458)
+++ platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java	2013-01-27 19:33:30 UTC (rev 16459)
@@ -36,6 +36,8 @@
 import org.datanucleus.store.connection.ConnectionFactory;
 import org.datanucleus.store.connection.ConnectionResourceType;
 import org.datanucleus.transaction.NucleusTransactionException;
+import org.datanucleus.transaction.jta.JTASyncRegistry;
+import org.datanucleus.transaction.jta.JTASyncRegistryUnavailableException;
 import org.datanucleus.util.NucleusLogger;
 
 /**
@@ -59,11 +61,13 @@
         NO_TXN, IMPOSSIBLE, JOINED
     }
 
-    private TransactionManager tm;
+    private TransactionManager jtaTm;
 
     /** Underlying JTA txn we are currently synced with. Null when no JTA transaction active or not yet joined. */
     private javax.transaction.Transaction jtaTx;
 
+    private JTASyncRegistry jtaSyncRegistry;
+
     protected JoinStatus joinStatus = JoinStatus.NO_TXN;
 
     private UserTransaction userTransaction;
@@ -97,8 +101,26 @@
         // tell the TransactionManager to not do anything with the actual datastore connection
         // as it is managed by the JTA (commit(), rollback() etc)
         txnMgr.setContainerManagedConnections(true);
-        tm = obtainTransactionManager();
 
+        // Accessor for the JTA TransactionManager. Unfortunately, before J2EE 5 there is no specified way to do it, 
+        // only appserver-specific ways. Taken from http://www.onjava.com/pub/a/onjava/2005/07/20/transactions.html.
+        // In JavaEE 5, we can use TransactionSynchronizationRegistry
+        jtaTm = ec.getNucleusContext().getJtaTransactionManager();
+        if (jtaTm == null)
+        {
+            throw new NucleusTransactionException(LOCALISER.msg("015030"));
+        }
+
+        // Try to get the TransactionSynchronizationRegistry if supported
+        try
+        {
+            jtaSyncRegistry = new JTASyncRegistry();
+        }
+        catch (JTASyncRegistryUnavailableException jsrue)
+        {
+            jtaSyncRegistry = null;
+        }
+
         if (autoJoin)
         {
             // Join to any UserTransaction if present
@@ -121,8 +143,8 @@
         {
             try
             {
-                javax.transaction.Transaction txn = tm.getTransaction();
-                int txnstat = tm.getStatus();
+                javax.transaction.Transaction txn = jtaTm.getTransaction();
+                int txnstat = jtaTm.getStatus();
                 if (jtaTx != null && !jtaTx.equals(txn))
                 {
                     // changed transaction, clear saved jtaTxn, reset join status and reprocess
@@ -146,7 +168,16 @@
                             joinStatus = JoinStatus.IMPOSSIBLE;
                             try
                             {
-                                jtaTx.registerSynchronization(this);
+                                if (jtaSyncRegistry != null)
+                                {
+                                    // Register via TransactionSynchronizationRegistry
+                                    jtaSyncRegistry.register(this);
+                                }
+                                else
+                                {
+                                    // Register via Transaction
+                                    jtaTx.registerSynchronization(this);
+                                }
                                 boolean was_active = super.isActive();
                                 if (!was_active)
                                 {
@@ -324,29 +355,6 @@
 
     // ------------------- Methods to get the JTA transaction for synchronising --------------------------
 
-    /**
-     * Accessor for the JTA TransactionManager. Unfortunately, before J2EE 5 there is no specified way to do it, only
-     * appserver-specific ways. Taken from http://www.onjava.com/pub/a/onjava/2005/07/20/transactions.html.
-     * <P>
-     * In J2EE 5, we'll be able to use the following
-     * https://glassfish.dev.java.net/nonav/javaee5/api/s1as-javadocs/javax
-     * /transaction/TransactionSynchronizationRegistry.html
-     * @return The TransactionManager
-     * @throws NucleusTransactionException if an error occurs obtaining the transaction manager
-     */
-    private TransactionManager obtainTransactionManager()
-    {
-        TransactionManager tm = ec.getNucleusContext().getJtaTransactionManager();
-        if (tm == null)
-        {
-            throw new NucleusTransactionException(LOCALISER.msg("015030"));
-        }
-        else
-        {
-            return tm;
-        }
-    }
-
     private static boolean INSIDE_JBOSS = System.getProperty("jboss.server.name") != null;
 
     private UserTransaction getUserTransaction() throws NamingException
@@ -355,7 +363,7 @@
         UserTransaction ut;
         if (INSIDE_JBOSS)
         {
-            // JBOSS unfortunately doesn't always provide UserTransaction at the J2EE standard location
+            // JBOSS unfortunately doesn't always provide UserTransaction at the JavaEE standard location
             // see e.g. http://docs.jboss.org/admin-devel/Chap4.html
             ut = (UserTransaction) ctx.lookup("UserTransaction");
         }

Added: platform/core/trunk/src/java/org/datanucleus/transaction/jta/JTASyncRegistry.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/transaction/jta/JTASyncRegistry.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/transaction/jta/JTASyncRegistry.java	2013-01-27 19:33:30 UTC (rev 16459)
@@ -0,0 +1,50 @@
+/**********************************************************************
+Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.transaction.jta;
+
+import javax.naming.InitialContext;
+import javax.transaction.Synchronization;
+import javax.transaction.TransactionSynchronizationRegistry;
+
+/**
+ * Wrapper around TransactionSynchronizationRegistry (only present JTA1.1+).
+ * Grabs hold of the TransactionSynchronizationRegistry (if available), and allows registration of a Synchronization.
+ */
+public class JTASyncRegistry
+{
+    TransactionSynchronizationRegistry registry;
+
+    public JTASyncRegistry()
+    throws JTASyncRegistryUnavailableException
+    {
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            registry = (TransactionSynchronizationRegistry) ctx.lookup("java:comp/TransactionSynchronizationRegistry");
+        }
+        catch (Throwable thr)
+        {
+            throw new JTASyncRegistryUnavailableException();
+        }
+    }
+
+    public void register(Synchronization sync)
+    {
+        registry.registerInterposedSynchronization(sync);
+    }
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/transaction/jta/JTASyncRegistryUnavailableException.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/transaction/jta/JTASyncRegistryUnavailableException.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/transaction/jta/JTASyncRegistryUnavailableException.java	2013-01-27 19:33:30 UTC (rev 16459)
@@ -0,0 +1,26 @@
+/**********************************************************************
+Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.transaction.jta;
+
+/**
+ * Exception thrown by construction of JTATransactionSyncRegistry when it is not available.
+ * This could be because JTA1.0 is being used, or there is no JNDI resource available for it.
+ */
+public class JTASyncRegistryUnavailableException extends Exception
+{
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16461
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16461&view=rev
Author:   andy_jefferson
Date:     2013-01-28 08:24:30 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
add some TODOs to JCA code that don't make sense

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/JTAJCATransactionImpl.java
    platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/JTAJCATransactionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/JTAJCATransactionImpl.java	2013-01-27 19:35:30 UTC (rev 16460)
+++ platform/core/trunk/src/java/org/datanucleus/JTAJCATransactionImpl.java	2013-01-28 08:24:30 UTC (rev 16461)
@@ -35,12 +35,12 @@
  */
 public class JTAJCATransactionImpl extends TransactionImpl implements Synchronization 
 {
-    private TransactionManager tm;
+    private TransactionManager jtaTM;
 
     /** JTA transaction we currently are synchronized with. Null when there is no JTA transaction active or not yet detected. */
     private javax.transaction.Transaction jtaTx;
 
-    private boolean markedForRollback = false;
+    private boolean markedForRollback = false; // TODO This doesn't seem to be ever true, why?
 
     /**
      * Constructor.
@@ -96,16 +96,23 @@
         // try to registerSynchronization()
         try
         {
-            if (tm == null)
+            if (jtaTM == null)
             {
-                tm = obtainTransactionManager();
+                // Retrieve the JTA TransactionManager. Unfortunately, before JavaEE 5 there is no specified way to do it, 
+                // only app-server-specific ways. In JavaEE 5, we can use TransactionSynchronizationRegistry
+                jtaTM = ec.getNucleusContext().getJtaTransactionManager();
+                if (jtaTM == null)
+                {
+                    throw new NucleusTransactionException(LOCALISER.msg("015030"));
+                }
             }
-            jtaTx = tm.getTransaction();
+            jtaTx = jtaTM.getTransaction();
             if (jtaTx != null && jtaTx.getStatus() == Status.STATUS_ACTIVE)
             {
-                if (!ec.getNucleusContext().isJcaMode())
+                if (!ec.getNucleusContext().isJcaMode()) // TODO Aren't we always in JCA mode with this class?
                 {
                     //in JCA mode, we do not register Synchronization
+                    // TODO Use JtaSyncRegistry if available?
                     jtaTx.registerSynchronization(this);
                 }                
 
@@ -145,34 +152,8 @@
     }
 
     /**
-     * Accessor for the JTA TransactionManager. Unfortunately, before J2EE 5 there is no specified way to do it, 
-     * only app-server-specific ways. Taken from http://www.onjava.com/pub/a/onjava/2005/07/20/transactions.html.
-     * <P>
-     * In J2EE 5, we'll be able to use the following
-     * https://glassfish.dev.java.net/nonav/javaee5/api/s1as-javadocs/javax/transaction/TransactionSynchronizationRegistry.html
-     * @return The TransactionManager
-     * @throws NucleusTransactionException if an error occurs obtaining the transaction manager
+     * Called by the transaction manager prior to the start of the two-phase transaction commit process.
      */
-    private TransactionManager obtainTransactionManager()
-    {
-        TransactionManager tm = ec.getNucleusContext().getJtaTransactionManager();
-        if (tm == null)
-        {
-            throw new NucleusTransactionException(LOCALISER.msg("015030"));
-        }
-        else
-        {
-            return tm;
-        }
-    }
-    
-    // --------------------------- methods for javax.transaction.Synchronization -----------------------------
-
-    /**
-     * The beforeCompletion method is called by the transaction manager prior to the start of the two-phase 
-     * transaction commit process.
-     * This is not called in JCA mode
-     */
     public void beforeCompletion()
     {
         try
@@ -195,11 +176,9 @@
     }
 
     /**
-     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * Called by the transaction manager after the transaction is committed or rolled back.
      * Must be synchronised because some callers expect to be owner of this object's monitor (internalPostCommit() 
      * calls closeSQLConnection() which calls notifyAll()).
-     * 
-     * This is not called in JCA mode
      * @param status The status
      */
     public synchronized void afterCompletion(int status)
@@ -216,7 +195,6 @@
             }
             else
             {
-                // this method is called after*Completion*(), so we can expect not to be confronted with intermediate status codes
                 // TODO Localise this
                 NucleusLogger.TRANSACTION.fatal("Received unexpected transaction status + " + status);
             }
@@ -228,8 +206,7 @@
         }
         finally
         {
-            // done with this jtaTx. Make us synchronizeWithJta() again,
-            // as there there is no callback for a newly begun tx
+            // done with this jtaTx. Make us synchronise with JTA again, as there there is no callback for a new tx
             jtaTx = null;
         }
     }   

Modified: platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java	2013-01-27 19:35:30 UTC (rev 16460)
+++ platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java	2013-01-28 08:24:30 UTC (rev 16461)
@@ -61,7 +61,7 @@
         NO_TXN, IMPOSSIBLE, JOINED
     }
 
-    private TransactionManager jtaTm;
+    private TransactionManager jtaTM;
 
     /** Underlying JTA txn we are currently synced with. Null when no JTA transaction active or not yet joined. */
     private javax.transaction.Transaction jtaTx;
@@ -105,8 +105,8 @@
         // Accessor for the JTA TransactionManager. Unfortunately, before J2EE 5 there is no specified way to do it, 
         // only appserver-specific ways. Taken from http://www.onjava.com/pub/a/onjava/2005/07/20/transactions.html.
         // In JavaEE 5, we can use TransactionSynchronizationRegistry
-        jtaTm = ec.getNucleusContext().getJtaTransactionManager();
-        if (jtaTm == null)
+        jtaTM = ec.getNucleusContext().getJtaTransactionManager();
+        if (jtaTM == null)
         {
             throw new NucleusTransactionException(LOCALISER.msg("015030"));
         }
@@ -143,8 +143,8 @@
         {
             try
             {
-                javax.transaction.Transaction txn = jtaTm.getTransaction();
-                int txnstat = jtaTm.getStatus();
+                javax.transaction.Transaction txn = jtaTM.getTransaction();
+                int txnstat = jtaTM.getStatus();
                 if (jtaTx != null && !jtaTx.equals(txn))
                 {
                     // changed transaction, clear saved jtaTxn, reset join status and reprocess

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16463
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16463&view=rev
Author:   andy_jefferson
Date:     2013-01-28 15:14:13 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
[NUCCORE-990] Enable 2-phase flush process.

Add TODO for avoiding multiple EC.markDirty calls

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-01-28 15:13:05 UTC (rev 16462)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-01-28 15:14:13 UTC (rev 16463)
@@ -3873,6 +3873,14 @@
 
             // Perform internal flush
             flushInternal(true);
+
+            if (dirtyOPs.size() > 0 || indirectDirtyOPs.size() > 0)
+            {
+                // If the flush caused the attach of an object it can get registered as dirty, so do second pass
+                NucleusLogger.GENERAL.info("Flush pass 1 resulted in " + (dirtyOPs.size() + indirectDirtyOPs.size()) +
+                    " additional objects being made dirty. Performing flush pass 2");
+                flushInternal(true);
+            }
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java	2013-01-28 15:13:05 UTC (rev 16462)
+++ platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java	2013-01-28 15:14:13 UTC (rev 16463)
@@ -2187,7 +2187,8 @@
             getCallbackHandler().postDirty(myPC);
         }
 
-        if (activity == ActivityState.NONE && ((flags&FLAG_FLUSHING)==0) && 
+        // TODO replaceField typically does a markDirty above, so need to catch those cases and avoid multiple calls to it
+        if (/*!myLC.isDirty && */activity == ActivityState.NONE && ((flags&FLAG_FLUSHING)==0) && 
             !(myLC.isTransactional() && !myLC.isPersistent()))
         {
             // Not during flush, and not transactional-transient, and not inserting - so mark as dirty

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16466
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16466&view=rev
Author:   andy_jefferson
Date:     2013-01-29 11:55:05 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
[NUCCORE-985] Add hack to close the transaction at EC close, so if the JavaEE container has fscked up the order of afterCompletion calls then it won't try to process it. Update JTATransactionImpl to use jtaTxnStatus for getIsActive return ("active" would have been enough for all weird JavaEE envs)

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java
    platform/core/trunk/src/java/org/datanucleus/Localisation.properties
    platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
    platform/core/trunk/src/java/org/datanucleus/NucleusContext.java
    platform/core/trunk/src/java/org/datanucleus/Transaction.java
    platform/core/trunk/src/java/org/datanucleus/TransactionImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-01-29 07:51:08 UTC (rev 16465)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-01-29 11:55:05 UTC (rev 16466)
@@ -469,6 +469,7 @@
         }
 
         closed = true;
+        tx.close(); // Close the transaction
         tx = null;
 
         if (NucleusLogger.PERSISTENCE.isDebugEnabled())

Modified: platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java	2013-01-29 07:51:08 UTC (rev 16465)
+++ platform/core/trunk/src/java/org/datanucleus/JTATransactionImpl.java	2013-01-29 11:55:05 UTC (rev 16466)
@@ -37,7 +37,6 @@
 import org.datanucleus.store.connection.ConnectionResourceType;
 import org.datanucleus.transaction.NucleusTransactionException;
 import org.datanucleus.transaction.jta.JTASyncRegistry;
-import org.datanucleus.transaction.jta.JTASyncRegistryUnavailableException;
 import org.datanucleus.util.NucleusLogger;
 
 /**
@@ -56,6 +55,8 @@
  */
 public class JTATransactionImpl extends TransactionImpl implements Synchronization 
 {
+    private static boolean JBOSS_SERVER = System.getProperty("jboss.server.name") != null;
+
     private enum JoinStatus
     {
         NO_TXN, IMPOSSIBLE, JOINED
@@ -98,31 +99,16 @@
                 " have not been set to JTA; this should have happened automatically.");
         }
 
-        // tell the TransactionManager to not do anything with the actual datastore connection
-        // as it is managed by the JTA (commit(), rollback() etc)
+        // Inform DN TransactionManager to not do anything with the actual datastore connection as managed by JTA
         txnMgr.setContainerManagedConnections(true);
 
-        // Accessor for the JTA TransactionManager. Unfortunately, before J2EE 5 there is no specified way to do it, 
-        // only appserver-specific ways. Taken from http://www.onjava.com/pub/a/onjava/2005/07/20/transactions.html.
-        // In JavaEE 5, we can use TransactionSynchronizationRegistry
         jtaTM = ec.getNucleusContext().getJtaTransactionManager();
         if (jtaTM == null)
         {
             throw new NucleusTransactionException(LOCALISER.msg("015030"));
         }
+        jtaSyncRegistry = ec.getNucleusContext().getJtaSyncRegistry();
 
-        // Try to get the TransactionSynchronizationRegistry if supported
-        try
-        {
-            jtaSyncRegistry = new JTASyncRegistry();
-        }
-        catch (JTASyncRegistryUnavailableException jsrue)
-        {
-            NucleusLogger.TRANSACTION.debug("JTA TransactionSynchronizationRegistry not found at " +
-                "JNDI java:comp/TransactionSynchronizationRegistry so using Transaction to register synchronisation");
-            jtaSyncRegistry = null;
-        }
-
         if (autoJoin)
         {
             // Join to any UserTransaction if present
@@ -135,6 +121,17 @@
         return (joinStatus == JoinStatus.JOINED);
     }
 
+    private int getTransactionStatus()
+    {
+        try
+        {
+            return jtaTM.getStatus();
+        }
+        catch (SystemException se)
+        {
+            throw new NucleusTransactionException(LOCALISER.msg("015026"), se);
+        }
+    }
     /**
      * Method to call if you want to join to the underlying UserTransaction.
      * Will be called by isActive() and constructor if "autoJoin" is set, otherwise has to be called by user code.
@@ -211,6 +208,20 @@
         }
     }
 
+    public boolean getIsActive()
+    {
+        if (closed)
+        {
+            return false;
+        }
+        int txnStatus = getTransactionStatus();
+        if (txnStatus == Status.STATUS_COMMITTED || txnStatus == Status.STATUS_ROLLEDBACK)
+        {
+            return false;
+        }
+        return super.getIsActive();
+    }
+
     /**
      * Accessor for whether the transaction is active. The UserTransaction is considered active if its status is
      * anything other than {@link Status#STATUS_NO_TRANSACTION}, i.e. when the current thread is associated with a
@@ -243,7 +254,7 @@
     /**
      * "16.1.3 Stateless Session Bean with Bean Managed Transactions": "acquiring a PersistenceManager without beginning
      * a UserTransaction results in the PersistenceManager being able to manage transaction boundaries via begin,
-     * commit, and rollback methods on javax. jdo.Transaction. The PersistenceManager will automatically begin the User-
+     * commit, and rollback methods on javax.jdo.Transaction. The PersistenceManager will automatically begin the User-
      * Transaction during javax.jdo.Transaction.begin and automatically commit the UserTransaction during
      * javax.jdo.Transaction.commit"
      */
@@ -258,7 +269,17 @@
         UserTransaction utx;
         try
         {
-            utx = getUserTransaction();
+            Context ctx = new InitialContext();
+            if (JBOSS_SERVER)
+            {
+                // JBoss unfortunately doesn't always provide UserTransaction at the JavaEE standard location
+                // see e.g. http://docs.jboss.org/admin-devel/Chap4.html
+                utx = (UserTransaction) ctx.lookup("UserTransaction");
+            }
+            else
+            {
+                utx = (UserTransaction) ctx.lookup("java:comp/UserTransaction");
+            }
         }
         catch (NamingException e)
         {
@@ -355,28 +376,6 @@
         }
     }
 
-    // ------------------- Methods to get the JTA transaction for synchronising --------------------------
-
-    private static boolean INSIDE_JBOSS = System.getProperty("jboss.server.name") != null;
-
-    private UserTransaction getUserTransaction() throws NamingException
-    {
-        Context ctx = new InitialContext();
-        UserTransaction ut;
-        if (INSIDE_JBOSS)
-        {
-            // JBOSS unfortunately doesn't always provide UserTransaction at the JavaEE standard location
-            // see e.g. http://docs.jboss.org/admin-devel/Chap4.html
-            ut = (UserTransaction) ctx.lookup("UserTransaction");
-        }
-        else
-        {
-            ut = (UserTransaction) ctx.lookup("java:comp/UserTransaction");
-        }
-
-        return ut;
-    }
-
     // ----------------- Implementation of javax.transaction.Synchronization -------------------
 
     /**
@@ -420,12 +419,20 @@
 
     /**
      * This method is called by the transaction manager after the transaction is committed or rolled back.
-     * Must be synchronized because some callees expect to be owner of this object's monitor 
+     * Must be synchronised because some callers expect to be owner of this object's monitor 
      * (internalPostCommit() calls closeSQLConnection() which calls notifyAll()).
      * @param status The status
      */
     public synchronized void afterCompletion(int status)
     {
+        if (closed)
+        {
+            // JavaEE container has closed the ExecutionContext (EntityManager) before calling afterCompletion on the
+            // Synchronisation object we registered with it. No point cleaning anything up here. Take the consequences.
+            NucleusLogger.TRANSACTION.warn(LOCALISER.msg("015048", this));
+            return;
+        }
+
         RuntimeException thr = null;
         boolean success = false;
         try

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-01-29 07:51:08 UTC (rev 16465)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-01-29 11:55:05 UTC (rev 16466)
@@ -286,6 +286,7 @@
 015045=Cannot mark transaction for rollback after exception in beforeCompletion. PersistenceManager/EntityManager might be in inconsistent state
 015046=Exception during afterCompletion in JTA transaction. PersistenceManager/EntityManager might be in inconsistent state
 015047=Received unexpected transaction status "{0}"
+015048=Transaction.afterCompletion called on {0} but is already closed. This is likely because you're using a JavaEE container like JBoss that has closed the EntityManager before calling afterCompletion on the transaction of that EntityManager - go figure. Any statistics gathering is rendered incorrect as a result.
 
 #
 # Types

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-01-29 07:51:08 UTC (rev 16465)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-01-29 11:55:05 UTC (rev 16466)
@@ -287,6 +287,7 @@
 015045=Cannot mark transaction for rollback after exception in beforeCompletion. PersistenceManager/EntityManager might be in inconsistent state
 015046=Exception during afterCompletion in JTA transaction. PersistenceManager/EntityManager might be in inconsistent state
 015047=Received unexpected transaction status "{0}"
+015048=Transaction.afterCompletion called on {0} but is already closed. This is likely because you're using a JavaEE container like JBoss that has closed the EntityManager before calling afterCompletion on the transaction of that EntityManager - go figure. Any statistics gathering is rendered incorrect as a result.
 
 #
 # Types

Modified: platform/core/trunk/src/java/org/datanucleus/NucleusContext.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/NucleusContext.java	2013-01-29 07:51:08 UTC (rev 16465)
+++ platform/core/trunk/src/java/org/datanucleus/NucleusContext.java	2013-01-29 11:55:05 UTC (rev 16466)
@@ -73,6 +73,8 @@
 import org.datanucleus.store.types.TypeManager;
 import org.datanucleus.transaction.NucleusTransactionException;
 import org.datanucleus.transaction.TransactionManager;
+import org.datanucleus.transaction.jta.JTASyncRegistry;
+import org.datanucleus.transaction.jta.JTASyncRegistryUnavailableException;
 import org.datanucleus.transaction.jta.TransactionManagerFinder;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
@@ -147,6 +149,9 @@
     /** JTA Transaction Manager (if using JTA). */
     private transient javax.transaction.TransactionManager jtaTxManager = null;
 
+    /** JTA Synchronization Registry (if using JTA 1.1 and supported). */
+    private transient JTASyncRegistry jtaSyncRegistry = null;
+
     /** Map of the ClassLoaderResolver, keyed by the clr class and the primaryLoader name. */
     private transient Map<String, ClassLoaderResolver> classLoaderResolverMap = new HashMap<String, ClassLoaderResolver>();
 
@@ -1417,6 +1422,24 @@
         return jtaTxManager;
     }
 
+    public JTASyncRegistry getJtaSyncRegistry()
+    {
+        if (jtaSyncRegistry == null)
+        {
+            try
+            {
+                jtaSyncRegistry = new JTASyncRegistry();
+            }
+            catch (JTASyncRegistryUnavailableException jsrue)
+            {
+                NucleusLogger.TRANSACTION.debug("JTA TransactionSynchronizationRegistry not found at " +
+                    "JNDI java:comp/TransactionSynchronizationRegistry so using Transaction to register synchronisation");
+                jtaSyncRegistry = null;
+            }
+        }
+        return jtaSyncRegistry;
+    }
+
     public boolean isStoreManagerInitialised()
     {
         return (storeMgr != null);

Modified: platform/core/trunk/src/java/org/datanucleus/Transaction.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Transaction.java	2013-01-29 07:51:08 UTC (rev 16465)
+++ platform/core/trunk/src/java/org/datanucleus/Transaction.java	2013-01-29 11:55:05 UTC (rev 16466)
@@ -71,6 +71,14 @@
     public static final String TRANSACTION_ISOLATION_OPTION = "transaction.isolation";
 
     /**
+     * Method to inform the transaction that it is closed.
+     * This is only necessary for JBoss usage of JPA where it doesn't bother calling afterCompletion on the JTA txn
+     * until after it closes the EntityManager so we need a hook to inform the transaction that it is closed so ignore
+     * any subsequent afterCompletion.
+     */
+    void close();
+
+    /**
      * Begin a transaction.
      * The type of transaction (datastore/optimistic) is determined by the setting of the Optimistic flag.
      * @throws NucleusUserException if transactions are managed by a container

Modified: platform/core/trunk/src/java/org/datanucleus/TransactionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/TransactionImpl.java	2013-01-29 07:51:08 UTC (rev 16465)
+++ platform/core/trunk/src/java/org/datanucleus/TransactionImpl.java	2013-01-29 11:55:05 UTC (rev 16466)
@@ -61,7 +61,7 @@
     /** Flag for whether we are currently committing. */
     boolean committing;
 
-    /** Synchronisation object, for committing and rolling back. */
+    /** Synchronisation object, for committing and rolling back. Only for JDO. */
     Synchronization sync;
 
     /** Whether retainValues is enabled. */
@@ -99,6 +99,8 @@
     /** start time of the transaction */
     long beginTime;
 
+    boolean closed = false;
+
     /**
      * Constructor for a transaction for the specified ExecutionContext.
      * @param ec ExecutionContext
@@ -137,6 +139,11 @@
         }
     }
 
+    public void close()
+    {
+        closed = true;
+    }
+
     /**
      * Method to begin the transaction.
      */
@@ -677,7 +684,6 @@
     /**
      * Accessor for the "rollback only" flag.
      * @return The rollback only flag
-     * @since 1.1
      */
     public boolean getRollbackOnly()
     {
@@ -744,7 +750,6 @@
 
     /**
      * Mutator for the "rollback only" flag. Sets the transaction as for rollback only.
-     * @since 1.1
      */
     public void setRollbackOnly()
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16520
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16520&view=rev
Author:   andy_jefferson
Date:     2013-02-06 09:10:19 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
[NUCCORE-992] Modularise the flush process

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
    platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java
    platform/core/trunk/src/java/org/datanucleus/FlushProcess.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-02-06 09:09:52 UTC (rev 16519)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-02-06 09:10:19 UTC (rev 16520)
@@ -85,7 +85,6 @@
 import org.datanucleus.store.FieldValues;
 import org.datanucleus.store.PersistenceBatchType;
 import org.datanucleus.store.StoreManager;
-import org.datanucleus.store.StorePersistenceHandler;
 import org.datanucleus.store.query.Query;
 import org.datanucleus.store.types.TypeManager;
 import org.datanucleus.util.Localiser;
@@ -3920,28 +3919,36 @@
                 tx.preFlush();
             }
 
-            List optimisticFailures = null;
+            // Pick the appropriate flush process, and execute it
+            FlushProcess flusher = null;
             Boolean optimisedFlag = 
                 getNucleusContext().getPersistenceConfiguration().getBooleanObjectProperty(PropertyNames.PROPERTY_FLUSH_OPTIMISED);
             if (optimisedFlag != null)
             {
                 // User requested particular flush type
-                optimisticFailures = (optimisedFlag ? flushInternalNonReferential() : flushInternalWithOrdering());
+                if (optimisedFlag)
+                {
+                    flusher = new FlushNonReferential(this);
+                }
+                else
+                {
+                    flusher = new FlushOrdered(this);
+                }
             }
             else
             {
                 if (!getStoreManager().getPersistenceHandler().useReferentialIntegrity())
                 {
-                    // Datastore doesn't use referential integrity, or user requests we do flushing as "optimised"
-                    // Means we can send all deletes at once, then all inserts, then the rest
-                    optimisticFailures = flushInternalNonReferential();
+                    // Datastore doesn't use referential integrity
+                    flusher = new FlushNonReferential(this);
                 }
                 else
                 {
-                    // Flush all dirty, new, deleted instances to the datastore when transaction is active
-                    optimisticFailures = flushInternalWithOrdering();
+                    // Use ordered flush maintaining the order they came in on
+                    flusher = new FlushOrdered(this);
                 }
             }
+            List<NucleusOptimisticException> optimisticFailures = flusher.execute(dirtyOPs, indirectDirtyOPs);
 
             if (flushToDatastore)
             {
@@ -3953,7 +3960,7 @@
             {
                 // Throw a single NucleusOptimisticException containing all optimistic failures
                 throw new NucleusOptimisticException(LOCALISER.msg("010031"), 
-                    (Throwable[])optimisticFailures.toArray(new Throwable[optimisticFailures.size()]));
+                    optimisticFailures.toArray(new Throwable[optimisticFailures.size()]));
             }
         }
         finally
@@ -3967,263 +3974,6 @@
     }
 
     /**
-     * Flush process that takes the objects in the order that they became dirty.
-     * If a datastore uses referential integrity this is typically the best way of maintaining
-     * a valid update process.
-     * @return Any optimistic exception(s) thrown by the update
-     */
-    protected List<NucleusOptimisticException> flushInternalWithOrdering()
-    {
-        if (NucleusLogger.PERSISTENCE.isDebugEnabled())
-        {
-            NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("010003", (dirtyOPs.size() + indirectDirtyOPs.size())));
-        }
-        List<NucleusOptimisticException> optimisticFailures = null;
-
-        // Flush all dirty, new, deleted instances to the datastore when transaction is active
-        Object[] toFlushDirect;
-        Object[] toFlushIndirect;
-        try
-        {
-            if (getMultithreaded())
-            {
-                lock.lock();
-            }
-
-            toFlushDirect = dirtyOPs.toArray();
-            dirtyOPs.clear();
-
-            toFlushIndirect = indirectDirtyOPs.toArray();
-            indirectDirtyOPs.clear();
-        }
-        finally
-        {
-            if (getMultithreaded())
-            {
-                lock.unlock();
-            }
-        }
-
-        Set<Class> classesToFlush = null;
-        if (getNucleusContext().getStoreManager().getQueryManager().getQueryResultsCache() != null)
-        {
-            classesToFlush = new HashSet();
-        }
-
-        // a). direct dirty objects
-        for (int i = 0; i < toFlushDirect.length; i++)
-        {
-            ObjectProvider op = (ObjectProvider) toFlushDirect[i];
-            try
-            {
-                op.flush();
-                if (classesToFlush != null)
-                {
-                    classesToFlush.add(op.getObject().getClass());
-                }
-            }
-            catch (NucleusOptimisticException oe)
-            {
-                if (optimisticFailures == null)
-                {
-                    optimisticFailures = new ArrayList();
-                }
-                optimisticFailures.add(oe);
-            }
-        }
-
-        // b). indirect dirty objects
-        for (int i = 0; i < toFlushIndirect.length; i++)
-        {
-            ObjectProvider sm = (ObjectProvider) toFlushIndirect[i];
-            try
-            {
-                sm.flush();
-                if (classesToFlush != null)
-                {
-                    classesToFlush.add(sm.getObject().getClass());
-                }
-            }
-            catch (NucleusOptimisticException oe)
-            {
-                if (optimisticFailures == null)
-                {
-                    optimisticFailures = new ArrayList();
-                }
-                optimisticFailures.add(oe);
-            }
-        }
-
-        if (classesToFlush != null)
-        {
-            // Flush any query results from cache for these types
-            Iterator<Class> queryClsIter = classesToFlush.iterator();
-            while (queryClsIter.hasNext())
-            {
-                Class cls = queryClsIter.next();
-                getNucleusContext().getStoreManager().getQueryManager().evictQueryResultsForType(cls);
-            }
-        }
-
-        return optimisticFailures;
-    }
-
-    /**
-     * Flush method for cases where the datastore doesn't use referential integrity so we can send batches
-     * of deletes, then batches of inserts, then any updates to optimise the persistence.
-     * @return Any optimistic exceptions during the deletes/inserts/updates
-     */
-    protected List<NucleusOptimisticException> flushInternalNonReferential()
-    {
-        List<NucleusOptimisticException> optimisticFailures = null;
-        StorePersistenceHandler persistenceHandler = getStoreManager().getPersistenceHandler();
-
-        // No referential integrity so we can send all deletes at once, then all inserts, then the rest
-        Set<ObjectProvider> opsToFlush = new HashSet<ObjectProvider>();
-        opsToFlush.addAll(dirtyOPs);
-        dirtyOPs.clear();
-        opsToFlush.addAll(indirectDirtyOPs);
-        indirectDirtyOPs.clear();
-
-        Set<Class> classesToFlush = null;
-        if (getNucleusContext().getStoreManager().getQueryManager().getQueryResultsCache() != null)
-        {
-            classesToFlush = new HashSet();
-        }
-
-        Set<ObjectProvider> opsToDelete = new HashSet<ObjectProvider>();
-        Set<ObjectProvider> opsToInsert = new HashSet<ObjectProvider>();
-        Iterator<ObjectProvider> opIter = opsToFlush.iterator();
-        while (opIter.hasNext())
-        {
-            ObjectProvider op = opIter.next();
-            if (op.isEmbedded())
-            {
-                op.markAsFlushed(); // Embedded have nothing to flush since the owner manages it
-                opIter.remove();
-            }
-            else
-            {
-                if (classesToFlush != null)
-                {
-                    classesToFlush.add(op.getObject().getClass());
-                }
-                if (op.getLifecycleState().isNew() && !op.isFlushedToDatastore() && !op.isFlushedNew())
-                {
-                    // P_NEW and not yet flushed to datastore
-                    opsToInsert.add(op);
-                    opIter.remove();
-                }
-                else if (op.getLifecycleState().isDeleted() && !op.isFlushedToDatastore())
-                {
-                    if (!op.getLifecycleState().isNew())
-                    {
-                        // P_DELETED
-                        opsToDelete.add(op);
-                        opIter.remove();
-                    }
-                    else if (op.getLifecycleState().isNew() && op.isFlushedNew())
-                    {
-                        // P_NEW_DELETED already persisted
-                        opsToDelete.add(op);
-                        opIter.remove();
-                    }
-                }
-            }
-        }
-
-        if (NucleusLogger.PERSISTENCE.isDebugEnabled())
-        {
-            NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("010046", opsToDelete.size(), opsToInsert.size(), opsToFlush.size()));
-        }
-
-        if (!opsToDelete.isEmpty())
-        {
-            // Perform preDelete - deleteAll - postDelete, and mark all ObjectProviders as flushed
-            // TODO This omits some parts of sm.internalDeletePersistent
-            for (ObjectProvider op : opsToDelete)
-            {
-                op.setFlushing(true);
-                getCallbackHandler().preDelete(op.getObject());
-            }
-            try
-            {
-                persistenceHandler.deleteObjects(opsToDelete.toArray(new ObjectProvider[opsToDelete.size()]));
-            }
-            catch (NucleusOptimisticException noe)
-            {
-                // TODO Could get multiple failures from the deletions
-                if (optimisticFailures == null)
-                {
-                    optimisticFailures = new ArrayList();
-                }
-                optimisticFailures.add(noe);
-            }
-            for (ObjectProvider op : opsToDelete)
-            {
-                getCallbackHandler().postDelete(op.getObject());
-                op.setFlushedNew(false);
-                op.markAsFlushed();
-                op.setFlushing(false);
-            }
-        }
-
-        if (!opsToInsert.isEmpty())
-        {
-            // Perform preStore - insertAll - postStore, and mark all ObjectProviders as flushed
-            // TODO This omits some parts of sm.internalMakePersistent
-            for (ObjectProvider op : opsToInsert)
-            {
-                op.setFlushing(true);
-                getCallbackHandler().preStore(op.getObject());
-                // TODO Make sure identity is set since user could have updated fields in preStore
-            }
-            persistenceHandler.insertObjects(opsToInsert.toArray(new ObjectProvider[opsToInsert.size()]));
-            for (ObjectProvider op : opsToInsert)
-            {
-                getCallbackHandler().postStore(op.getObject());
-                op.setFlushedNew(true);
-                op.markAsFlushed();
-                op.setFlushing(false);
-                putObjectIntoLevel1Cache(op); // Update the object in the cache(s) now that version/id are set
-            }
-        }
-
-        if (!opsToFlush.isEmpty())
-        {
-            // Objects to update
-            for (ObjectProvider op : opsToFlush)
-            {
-                try
-                {
-                    op.flush();
-                }
-                catch (NucleusOptimisticException oe)
-                {
-                    if (optimisticFailures == null)
-                    {
-                        optimisticFailures = new ArrayList();
-                    }
-                    optimisticFailures.add(oe);
-                }
-            }
-        }
-
-        if (classesToFlush != null)
-        {
-            // Flush any query results from cache for these types
-            Iterator<Class> queryClsIter = classesToFlush.iterator();
-            while (queryClsIter.hasNext())
-            {
-                Class cls = queryClsIter.next();
-                getNucleusContext().getStoreManager().getQueryManager().evictQueryResultsForType(cls);
-            }
-        }
-
-        return optimisticFailures;
-    }
-
-    /**
      * Method to perform any post-begin checks.
      */
     public void postBegin()

Added: platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-02-06 09:10:19 UTC (rev 16520)
@@ -0,0 +1,196 @@
+/**********************************************************************
+Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.datanucleus.exceptions.NucleusOptimisticException;
+import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.store.StorePersistenceHandler;
+import org.datanucleus.util.NucleusLogger;
+
+/**
+ * Flush method for cases where the datastore doesn't use referential integrity so we can send batches
+ * of deletes, then batches of inserts, then any updates to optimise the persistence.
+ */
+public class FlushNonReferential implements FlushProcess
+{
+    ExecutionContextImpl ec;
+
+    public FlushNonReferential(ExecutionContextImpl ec)
+    {
+        this.ec = ec;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.FlushProcess#execute(java.util.List, java.util.List)
+     */
+    public List<NucleusOptimisticException> execute(List<ObjectProvider> dirtyOPs, List<ObjectProvider> indirectDirtyOPs)
+    {
+        List<NucleusOptimisticException> optimisticFailures = null;
+
+        // No referential integrity so we can send all deletes at once, then all inserts, then the rest
+        Set<ObjectProvider> opsToFlush = new HashSet<ObjectProvider>();
+        opsToFlush.addAll(dirtyOPs);
+        dirtyOPs.clear();
+        opsToFlush.addAll(indirectDirtyOPs);
+        indirectDirtyOPs.clear();
+
+        Set<Class> classesToFlush = null;
+        if (ec.getNucleusContext().getStoreManager().getQueryManager().getQueryResultsCache() != null)
+        {
+            classesToFlush = new HashSet();
+        }
+
+        Set<ObjectProvider> opsToDelete = new HashSet<ObjectProvider>();
+        Set<ObjectProvider> opsToInsert = new HashSet<ObjectProvider>();
+        Iterator<ObjectProvider> opIter = opsToFlush.iterator();
+        while (opIter.hasNext())
+        {
+            ObjectProvider op = opIter.next();
+            if (op.isEmbedded())
+            {
+                op.markAsFlushed(); // Embedded have nothing to flush since the owner manages it
+                opIter.remove();
+            }
+            else
+            {
+                if (classesToFlush != null)
+                {
+                    classesToFlush.add(op.getObject().getClass());
+                }
+                if (op.getLifecycleState().isNew() && !op.isFlushedToDatastore() && !op.isFlushedNew())
+                {
+                    // P_NEW and not yet flushed to datastore
+                    opsToInsert.add(op);
+                    opIter.remove();
+                }
+                else if (op.getLifecycleState().isDeleted() && !op.isFlushedToDatastore())
+                {
+                    if (!op.getLifecycleState().isNew())
+                    {
+                        // P_DELETED
+                        opsToDelete.add(op);
+                        opIter.remove();
+                    }
+                    else if (op.getLifecycleState().isNew() && op.isFlushedNew())
+                    {
+                        // P_NEW_DELETED already persisted
+                        opsToDelete.add(op);
+                        opIter.remove();
+                    }
+                }
+            }
+        }
+
+        if (NucleusLogger.PERSISTENCE.isDebugEnabled())
+        {
+            NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("010046", opsToDelete.size(), opsToInsert.size(), opsToFlush.size()));
+        }
+
+        StorePersistenceHandler persistenceHandler = ec.getStoreManager().getPersistenceHandler();
+        if (!opsToDelete.isEmpty())
+        {
+            // Perform preDelete - deleteAll - postDelete, and mark all ObjectProviders as flushed
+            // TODO This omits some parts of sm.internalDeletePersistent
+            for (ObjectProvider op : opsToDelete)
+            {
+                op.setFlushing(true);
+                ec.getCallbackHandler().preDelete(op.getObject());
+            }
+            try
+            {
+                persistenceHandler.deleteObjects(opsToDelete.toArray(new ObjectProvider[opsToDelete.size()]));
+            }
+            catch (NucleusOptimisticException noe)
+            {
+                // TODO Could get multiple failures from the deletions
+                if (optimisticFailures == null)
+                {
+                    optimisticFailures = new ArrayList();
+                }
+                optimisticFailures.add(noe);
+            }
+            for (ObjectProvider op : opsToDelete)
+            {
+                ec.getCallbackHandler().postDelete(op.getObject());
+                op.setFlushedNew(false);
+                op.markAsFlushed();
+                op.setFlushing(false);
+            }
+        }
+
+        if (!opsToInsert.isEmpty())
+        {
+            // Perform preStore - insertAll - postStore, and mark all ObjectProviders as flushed
+            // TODO This omits some parts of sm.internalMakePersistent
+            for (ObjectProvider op : opsToInsert)
+            {
+                op.setFlushing(true);
+                ec.getCallbackHandler().preStore(op.getObject());
+                // TODO Make sure identity is set since user could have updated fields in preStore
+            }
+            persistenceHandler.insertObjects(opsToInsert.toArray(new ObjectProvider[opsToInsert.size()]));
+            for (ObjectProvider op : opsToInsert)
+            {
+                ec.getCallbackHandler().postStore(op.getObject());
+                op.setFlushedNew(true);
+                op.markAsFlushed();
+                op.setFlushing(false);
+                ec.putObjectIntoLevel1Cache(op); // Update the object in the cache(s) now that version/id are set
+            }
+        }
+
+        if (!opsToFlush.isEmpty())
+        {
+            // Objects to update
+            for (ObjectProvider op : opsToFlush)
+            {
+                try
+                {
+                    op.flush();
+                }
+                catch (NucleusOptimisticException oe)
+                {
+                    if (optimisticFailures == null)
+                    {
+                        optimisticFailures = new ArrayList();
+                    }
+                    optimisticFailures.add(oe);
+                }
+            }
+        }
+
+        if (classesToFlush != null)
+        {
+            // Flush any query results from cache for these types
+            Iterator<Class> queryClsIter = classesToFlush.iterator();
+            while (queryClsIter.hasNext())
+            {
+                Class cls = queryClsIter.next();
+                ec.getNucleusContext().getStoreManager().getQueryManager().evictQueryResultsForType(cls);
+            }
+        }
+        
+        return optimisticFailures;
+    }
+}

Added: platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java	2013-02-06 09:10:19 UTC (rev 16520)
@@ -0,0 +1,143 @@
+/**********************************************************************
+Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.datanucleus.FlushProcess;
+import org.datanucleus.exceptions.NucleusOptimisticException;
+import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.util.NucleusLogger;
+
+/**
+ * Flush process that processes the objects in the order that they became dirty.
+ * If a datastore uses referential integrity this is typically the best way of maintaining a valid update process.
+ */
+public class FlushOrdered implements FlushProcess
+{
+    ExecutionContextImpl ec;
+
+    public FlushOrdered(ExecutionContextImpl ec)
+    {
+        this.ec = ec;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.FlushProcess#execute(java.util.List, java.util.List)
+     */
+    public List<NucleusOptimisticException> execute(List<ObjectProvider> dirtyOPs, List<ObjectProvider> indirectDirtyOPs)
+    {
+        List<NucleusOptimisticException> optimisticFailures = null;
+
+        // Flush all dirty, new, deleted instances to the datastore when transaction is active
+        Object[] toFlushDirect;
+        Object[] toFlushIndirect;
+        try
+        {
+            if (ec.getMultithreaded())
+            {
+                ec.getLock().lock();
+            }
+
+            toFlushDirect = dirtyOPs.toArray();
+            dirtyOPs.clear();
+
+            toFlushIndirect = indirectDirtyOPs.toArray();
+            indirectDirtyOPs.clear();
+        }
+        finally
+        {
+            if (ec.getMultithreaded())
+            {
+                ec.getLock().unlock();
+            }
+        }
+
+        if (NucleusLogger.PERSISTENCE.isDebugEnabled())
+        {
+            NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("010003", (dirtyOPs.size() + indirectDirtyOPs.size())));
+        }
+
+        Set<Class> classesToFlush = null;
+        if (ec.getNucleusContext().getStoreManager().getQueryManager().getQueryResultsCache() != null)
+        {
+            classesToFlush = new HashSet();
+        }
+
+        // a). direct dirty objects
+        for (int i = 0; i < toFlushDirect.length; i++)
+        {
+            ObjectProvider op = (ObjectProvider) toFlushDirect[i];
+            try
+            {
+                op.flush();
+                if (classesToFlush != null)
+                {
+                    classesToFlush.add(op.getObject().getClass());
+                }
+            }
+            catch (NucleusOptimisticException oe)
+            {
+                if (optimisticFailures == null)
+                {
+                    optimisticFailures = new ArrayList();
+                }
+                optimisticFailures.add(oe);
+            }
+        }
+
+        // b). indirect dirty objects
+        for (int i = 0; i < toFlushIndirect.length; i++)
+        {
+            ObjectProvider sm = (ObjectProvider) toFlushIndirect[i];
+            try
+            {
+                sm.flush();
+                if (classesToFlush != null)
+                {
+                    classesToFlush.add(sm.getObject().getClass());
+                }
+            }
+            catch (NucleusOptimisticException oe)
+            {
+                if (optimisticFailures == null)
+                {
+                    optimisticFailures = new ArrayList();
+                }
+                optimisticFailures.add(oe);
+            }
+        }
+
+        if (classesToFlush != null)
+        {
+            // Flush any query results from cache for these types
+            Iterator<Class> queryClsIter = classesToFlush.iterator();
+            while (queryClsIter.hasNext())
+            {
+                Class cls = queryClsIter.next();
+                ec.getNucleusContext().getStoreManager().getQueryManager().evictQueryResultsForType(cls);
+            }
+        }
+
+        return optimisticFailures;
+    }
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/FlushProcess.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushProcess.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/FlushProcess.java	2013-02-06 09:10:19 UTC (rev 16520)
@@ -0,0 +1,42 @@
+/**********************************************************************
+Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus;
+
+import java.util.List;
+
+import org.datanucleus.exceptions.NucleusOptimisticException;
+import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.util.Localiser;
+
+/**
+ * Representation of a persistence flush process.
+ */
+public interface FlushProcess
+{
+    /** Localisation utility for output messages */
+    static final Localiser LOCALISER = Localiser.getInstance("org.datanucleus.Localisation",
+        org.datanucleus.ClassConstants.NUCLEUS_CONTEXT_LOADER);
+
+    /**
+     * Execute the flush.
+     * @param dirtyOPs ObjectProviders that were made dirty by direct API calls. Cleared during this method
+     * @param indirectDirtyOPs ObjectProviders that were made dirty by reachability. Cleared during this method
+     * @return Any optimistic exceptions during the deletes/inserts/updates
+     */
+    List<NucleusOptimisticException> execute(List<ObjectProvider> dirtyOPs, List<ObjectProvider> indirectDirtyOPs);
+}
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16521
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16521&view=rev
Author:   andy_jefferson
Date:     2013-02-06 09:46:21 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
cleanup

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
    platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java

Modified: platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-02-06 09:10:19 UTC (rev 16520)
+++ platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-02-06 09:46:21 UTC (rev 16521)
@@ -48,7 +48,7 @@
     {
         List<NucleusOptimisticException> optimisticFailures = null;
 
-        // No referential integrity so we can send all deletes at once, then all inserts, then the rest
+        // Make copy of ObjectProviders so we don't have ConcurrentModification issues
         Set<ObjectProvider> opsToFlush = new HashSet<ObjectProvider>();
         opsToFlush.addAll(dirtyOPs);
         dirtyOPs.clear();
@@ -193,4 +193,4 @@
         
         return optimisticFailures;
     }
-}
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java	2013-02-06 09:10:19 UTC (rev 16520)
+++ platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java	2013-02-06 09:46:21 UTC (rev 16521)
@@ -48,19 +48,18 @@
     {
         List<NucleusOptimisticException> optimisticFailures = null;
 
-        // Flush all dirty, new, deleted instances to the datastore when transaction is active
+        // Make copy of ObjectProviders so we don't have ConcurrentModification issues
         Object[] toFlushDirect;
         Object[] toFlushIndirect;
         try
         {
-            if (ec.getMultithreaded())
+            if (ec.getMultithreaded()) // Why lock here? should be on overall flush
             {
                 ec.getLock().lock();
             }
 
             toFlushDirect = dirtyOPs.toArray();
             dirtyOPs.clear();
-
             toFlushIndirect = indirectDirtyOPs.toArray();
             indirectDirtyOPs.clear();
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16530
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16530&view=rev
Author:   andy_jefferson
Date:     2013-02-07 08:41:45 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
add cause exception in some situations

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/enhancer/DataNucleusEnhancer.java
    platform/core/trunk/src/java/org/datanucleus/exceptions/NucleusException.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/DataNucleusEnhancer.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/DataNucleusEnhancer.java	2013-02-06 19:20:34 UTC (rev 16529)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/DataNucleusEnhancer.java	2013-02-07 08:41:45 UTC (rev 16530)
@@ -387,7 +387,7 @@
                 }
                 catch (ClassNotResolvedException cnre)
                 {
-                    addMessage("Class " + classNames[i] + " not found in CLASSPATH!", true);
+                    addMessage("Class " + classNames[i] + " not found in CLASSPATH! : " + cnre.getMessage(), true);
                 }
                 names.add(classNames[i]);
             }

Modified: platform/core/trunk/src/java/org/datanucleus/exceptions/NucleusException.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/exceptions/NucleusException.java	2013-02-06 19:20:34 UTC (rev 16529)
+++ platform/core/trunk/src/java/org/datanucleus/exceptions/NucleusException.java	2013-02-07 08:41:45 UTC (rev 16530)
@@ -138,6 +138,11 @@
         return failed;
     }
 
+    public void setNestedException(Throwable nested)
+    {
+        this.nested = new Throwable[] {nested};
+    }
+
     /**
      * The exception may have been caused by multiple exceptions in the runtime.
      * If multiple objects caused the problem, each failed object will have its

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2013-02-06 19:20:34 UTC (rev 16529)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2013-02-07 08:41:45 UTC (rev 16530)
@@ -571,7 +571,9 @@
         catch (ClassNotResolvedException cnre)
         {
             NucleusLogger.METADATA.error(LOCALISER.msg("044080",fullName));
-            throw new InvalidClassMetaDataException(LOCALISER, "044080", fullName);
+            NucleusException ne = new InvalidClassMetaDataException(LOCALISER, "044080", fullName);
+            ne.setNestedException(cnre);
+            throw ne;
         }
         return cls;
     }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2013-02-06 19:20:34 UTC (rev 16529)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2013-02-07 08:41:45 UTC (rev 16530)
@@ -479,7 +479,9 @@
                 catch (ClassNotResolvedException cnre2)
                 {
                     NucleusLogger.METADATA.error(LOCALISER.msg("044113", getClassName(), getName(), className));
-                    throw new InvalidMemberMetaDataException(LOCALISER, "044113", getClassName(), getName(), className);
+                    NucleusException ne = new InvalidMemberMetaDataException(LOCALISER, "044113", getClassName(), getName(), className);
+                    ne.setNestedException(cnre);
+                    throw ne;
                 }
             }
             if (fieldClass != null && !fieldClass.isAssignableFrom(thisClass))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16545
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16545&view=rev
Author:   andy_jefferson
Date:     2013-02-08 11:56:55 +0000 (Fri, 08 Feb 2013)
Log Message:
-----------
some cleanup of properties

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
    platform/core/trunk/src/java/org/datanucleus/PropertyNames.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-02-08 11:53:16 UTC (rev 16544)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-02-08 11:56:55 UTC (rev 16545)
@@ -3714,7 +3714,7 @@
         boolean isInDirty = dirtyOPs.contains(op);
         boolean isInIndirectDirty = indirectDirtyOPs.contains(op);
         if (!isDelayDatastoreOperationsEnabled() && !isInDirty && !isInIndirectDirty && 
-            dirtyOPs.size() >= getNucleusContext().getPersistenceConfiguration().getIntProperty(PropertyNames.PROPERTY_TRANSACTION_FLUSH_LIMIT))
+            dirtyOPs.size() >= getNucleusContext().getPersistenceConfiguration().getIntProperty(PropertyNames.PROPERTY_FLUSH_AUTO_OBJECT_LIMIT))
         {
             // Reached flush limit so flush
             flushInternal(false);

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-02-08 11:53:16 UTC (rev 16544)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-02-08 11:56:55 UTC (rev 16545)
@@ -100,7 +100,7 @@
      */
     public PersistenceConfiguration(PluginManager pluginMgr)
     {
-        // Add basic properties
+        // NucleusContext level features
         addDefaultBooleanProperty(PropertyNames.PROPERTY_IGNORE_CACHE, null, false, false, true);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_OPTIMISTIC, null, false, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_MULTITHREADED, null, false, false, true);
@@ -115,119 +115,44 @@
             CorePropertyValidator.class.getName(), false, false);
         addDefaultProperty(PropertyNames.PROPERTY_PROPERTIES_FILE, null, null, null, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_PERSISTENCE_UNIT_LOAD_CLASSES, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_PERSISTENCE_BY_REACHABILITY_AT_COMMIT, null, true, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_MANAGE_RELATIONSHIPS, null, true, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_MANAGE_RELATIONSHIPS_CHECKS, null, true, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_SERIALIZE_READ, null, false, false, true);;
-        addDefaultProperty(PropertyNames.PROPERTY_DELETION_POLICY, null, "JDO2", 
-            CorePropertyValidator.class.getName(), false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_DEFAULT_INHERITANCE_STRATEGY, null, "JDO2", 
-            CorePropertyValidator.class.getName(), false, false);
-        // TODO Would be nice to set the default here to "false" but JDO TCK "instanceCallbacks" fails
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_FIND_OBJECT_VALIDATE_WHEN_CACHED, null, true, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_ALLOW_CALLBACKS, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_EXECUTION_CONTEXT_REAPER_THREAD, null, false, false, false);
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_EXECUTION_CONTEXT_MAX_IDLE, null, 20, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_REAPER_THREAD, null, false, false, false);
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_MAX_IDLE, null, 100, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_DATASTORE_IDENTITY_TYPE, null, "datanucleus", null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_IDENTITY_STRING_TRANSLATOR_TYPE, null, null, null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_IDENTITY_KEY_TRANSLATOR_TYPE, null, null, null, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_USE_IMPLEMENTATION_CREATOR, null, true, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CLASSLOADER_RESOLVER_NAME, null, "datanucleus", null, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CLASSLOADER_PRIMARY, null, null, null, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_LOCALISE_MESSAGECODES, null, false, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_LOCALISE_LANGUAGE, null, null, null, false, false);
 
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_EXECUTION_CONTEXT_REAPER_THREAD, null, false, false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_EXECUTION_CONTEXT_MAX_IDLE, null, 20, false, false);
-
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_REAPER_THREAD, null, false, false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_MAX_IDLE, null, 100, false, false);
-
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_READ, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_WRITE, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_ATOMIC, null, true, false, false);
-
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_DETACH_ALL_ON_COMMIT, null, false, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_DETACH_ALL_ON_ROLLBACK, null, false, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_DETACH_ON_CLOSE, null, false, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_COPY_ON_ATTACH, null, true, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_ATTACH_SAME_DATASTORE, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_ALLOW_ATTACH_OF_TRANSIENT, null, false, false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_DETACH_AS_WRAPPED, null, false, false, true);
-        addDefaultProperty(PropertyNames.PROPERTY_DETACH_DETACHMENT_FIELDS, null, "load-fields", 
+        // Plugin management
+        addDefaultProperty(PropertyNames.PROPERTY_PLUGIN_REGISTRY_CLASSNAME, null, null, null, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_PLUGIN_ALLOW_USER_BUNDLES, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_PLUGIN_VALIDATEPLUGINS, null, false, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_PLUGIN_REGISTRYBUNDLECHECK, null, "EXCEPTION", 
             CorePropertyValidator.class.getName(), false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_DETACH_DETACHED_STATE, null, "fetch-groups", 
-            CorePropertyValidator.class.getName(), false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_MAX_FETCH_DEPTH, null, 1, false, true);
 
+        // Transactions
         addDefaultProperty(PropertyNames.PROPERTY_TRANSACTION_TYPE, null, null,
             CorePropertyValidator.class.getName(), false, false);
         addDefaultProperty(PropertyNames.PROPERTY_TRANSACTION_JTA_LOCATOR, null, null, null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_TRANSACTION_JTA_JNDI_LOCATION, null, null, null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_TRANSACTION_ISOLATION, null, "read-committed", 
             CorePropertyValidator.class.getName(), false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_TRANSACTION_FLUSH_LIMIT, null, 1, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_READ, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_WRITE, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_NONTX_ATOMIC, null, true, false, false);
 
+        // Flush process
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_FLUSH_AUTO_OBJECT_LIMIT, null, 1, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_FLUSH_MODE, null, null, 
             CorePropertyValidator.class.getName(), false, true);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_FLUSH_OPTIMISED, null, null, false, false);
 
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_URL, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_DRIVER_NAME, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_USER_NAME, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_PASSWORD, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_PASSWORD_DECRYPTER, null, null, null, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_FACTORY_NAME, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_FACTORY2_NAME, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_FACTORY, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_FACTORY2, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_RESOURCETYPE, null, null, 
-            CorePropertyValidator.class.getName(), true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_RESOURCETYPE2, null, null,
-            CorePropertyValidator.class.getName(), true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_POOLINGTYPE, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_POOLINGTYPE2, null, null, null, true, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_CONNECTION_NONTX_RELEASE_AFTER_USE, null, true, true, false);
-
-        addDefaultProperty(PropertyNames.PROPERTY_PLUGIN_REGISTRY_CLASSNAME, null, null, null, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_PLUGIN_ALLOW_USER_BUNDLES, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_PLUGIN_VALIDATEPLUGINS, null, false, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_PLUGIN_REGISTRYBUNDLECHECK, null, "EXCEPTION", 
-            CorePropertyValidator.class.getName(), false, false);
-
-        addDefaultProperty(PropertyNames.PROPERTY_CLASSLOADER_RESOLVER_NAME, null, "datanucleus", null, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CLASSLOADER_PRIMARY, null, null, null, false, false);
-
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_LOCALISE_MESSAGECODES, null, false, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_LOCALISE_LANGUAGE, null, null, null, false, false);
-
-        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L1_TYPE, null, "soft", null, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L2_TYPE, null, "soft", null, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L2_MODE, null, "UNSPECIFIED", 
-            CorePropertyValidator.class.getName(), false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L2_NAME, null, "datanucleus", null, false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_L2_MAXSIZE, null, -1, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_LOADFIELDS, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_CLEARATCLOSE, null, true, false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_L2_TIMEOUT, null, -1, false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_L2_BATCHSIZE, null, 100, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_CACHE_EMBEDDED, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_COLLECTIONS, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_COLLECTIONS_LAZY, null, null, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYCOMPILE_TYPE, null, "soft", null, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYCOMPILEDATASTORE_TYPE, null, "soft", null, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYRESULTS_TYPE, null, "soft", null, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYRESULTS_NAME, null, "datanucleus-query", null, false, false);
-        addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_QUERYRESULTS_MAXSIZE, null, -1, false, false);
-
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_SQL_ALLOWALL, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_JDOQL_ALLOWALL, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_FLUSH_BEFORE_EXECUTE, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_USE_FETCHPLAN, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_CHECK_UNUSED_PARAMS, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_COMPILE_OPTIMISED, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_LOAD_RESULTS_AT_COMMIT, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_COMPILATION_CACHED, null, true, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_RESULTS_CACHED, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_EVALUATE_IN_MEMORY, null, false, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_RESULTCACHE_VALIDATEOBJECTS, null, true, false, false);
-        addDefaultProperty(PropertyNames.PROPERTY_QUERY_RESULT_SIZE_METHOD, null, "last", null, false, false);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_COMPILE_NAMED_QUERIES_AT_STARTUP, null, false, false, false);
-
+        // MetaData
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_ALWAYS_DETACHABLE, null, false, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_VALIDATE, null, false, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_AUTOREGISTER, null, true, false, false);
@@ -239,6 +164,7 @@
         addDefaultProperty(PropertyNames.PROPERTY_METADATA_ORM_SUFFIX, null, "orm", null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_METADATA_JDOQUERY_SUFFIX, null, "jdoquery", null, false, false);
 
+        // Value Generation
         addDefaultProperty(PropertyNames.PROPERTY_VALUEGEN_TXN_ISOLATION, null, "read-committed", 
             CorePropertyValidator.class.getName(), false, false);
         addDefaultProperty(PropertyNames.PROPERTY_VALUEGEN_TXN_ATTRIBUTE, null, "New", 
@@ -246,6 +172,7 @@
         addDefaultIntegerProperty(PropertyNames.PROPERTY_VALUEGEN_SEQUENCE_ALLOCSIZE, null, 10, false, false);
         addDefaultIntegerProperty(PropertyNames.PROPERTY_VALUEGEN_INCREMENT_ALLOCSIZE, null, 10, false, false);
 
+        // Bean Validation
         addDefaultProperty(PropertyNames.PROPERTY_VALIDATION_MODE, null, "auto", 
             CorePropertyValidator.class.getName(), false, false);
         addDefaultProperty(PropertyNames.PROPERTY_VALIDATION_GROUP_PREPERSIST, null, null, null, false, false);
@@ -253,6 +180,7 @@
         addDefaultProperty(PropertyNames.PROPERTY_VALIDATION_GROUP_PREREMOVE, null, null, null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_VALIDATION_FACTORY, null, null, null, false, false);
 
+        // Auto-Start Mechanism
         addDefaultProperty(PropertyNames.PROPERTY_AUTOSTART_MECHANISM, null, "None", null, true, false);
         addDefaultProperty(PropertyNames.PROPERTY_AUTOSTART_MODE, null, "Quiet", 
             CorePropertyValidator.class.getName(), true, false);
@@ -260,6 +188,7 @@
         addDefaultProperty(PropertyNames.PROPERTY_AUTOSTART_CLASSNAMES, null, null, null, true, false);
         addDefaultProperty(PropertyNames.PROPERTY_AUTOSTART_METADATAFILES, null, null, null, true, false);
 
+        // Schema Generation
         addDefaultProperty(PropertyNames.PROPERTY_SCHEMA_GENERATE_MODE, null, "none",
             CorePropertyValidator.class.getName(), false, false);
         addDefaultProperty(PropertyNames.PROPERTY_SCHEMA_GENERATE_TARGET, null, "database", 
@@ -268,7 +197,6 @@
             null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_SCHEMA_GENERATE_TARGET_DROP_SCRIPT, null, "datanucleus-schema.ddl", 
             null, false, false);
-
         addDefaultBooleanProperty(PropertyNames.PROPERTY_AUTOCREATE_SCHEMA, null, false, true, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_AUTOCREATE_TABLES, null, false, true, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_AUTOCREATE_COLUMNS, null, false, true, false);
@@ -279,6 +207,15 @@
         addDefaultBooleanProperty(PropertyNames.PROPERTY_VALIDATE_CONSTRAINTS, null, false, true, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_AUTOCREATE_WARNONERROR, null, false, true, false);
 
+        // Schema and identifier naming
+        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_CASE, null, null,
+            CorePropertyValidator.class.getName(), true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_TABLE_PREFIX, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_TABLE_SUFFIX, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_WORD_SEPARATOR, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_FACTORY, null, "datanucleus2", null, true, false);
+
+        // Datastore
         addDefaultProperty(PropertyNames.PROPERTY_STORE_MANAGER_TYPE, null, null, null, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_STORE_ALLOW_REFS_WITHOUT_IMPLS, null, false, false, true);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_DATASTORE_READONLY, null, false, true, false);
@@ -287,20 +224,90 @@
             CorePropertyValidator.class.getName(), true, false);
         addDefaultIntegerProperty(PropertyNames.PROPERTY_DATASTORE_READ_TIMEOUT, null, null, true, true);
         addDefaultIntegerProperty(PropertyNames.PROPERTY_DATASTORE_WRITE_TIMEOUT, null, null, true, true);
-
-        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_CASE, null, null,
-            CorePropertyValidator.class.getName(), true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_TABLE_PREFIX, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_TABLE_SUFFIX, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_WORD_SEPARATOR, null, null, null, true, false);
-        addDefaultProperty(PropertyNames.PROPERTY_IDENTIFIER_FACTORY, null, "datanucleus2", null, true, false);
-
         addDefaultProperty(PropertyNames.PROPERTY_MAPPING, null, null, 
             StringPropertyValidator.class.getName(), true, false);
         addDefaultProperty(PropertyNames.PROPERTY_MAPPING_CATALOG, null, null, null, true, false);
         addDefaultProperty(PropertyNames.PROPERTY_MAPPING_SCHEMA, null, null, null, true, false);
         addDefaultProperty(PropertyNames.PROPERTY_TENANT_ID, null, null, null, true, false);
 
+        // ExecutionContext level features
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_PERSISTENCE_BY_REACHABILITY_AT_COMMIT, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_MANAGE_RELATIONSHIPS, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_MANAGE_RELATIONSHIPS_CHECKS, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_SERIALIZE_READ, null, false, false, true);;
+        addDefaultProperty(PropertyNames.PROPERTY_DELETION_POLICY, null, "JDO2", 
+            CorePropertyValidator.class.getName(), false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_DEFAULT_INHERITANCE_STRATEGY, null, "JDO2", 
+            CorePropertyValidator.class.getName(), false, false);
+        // TODO Would be nice to set the default here to "false" but JDO TCK "instanceCallbacks" fails
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_FIND_OBJECT_VALIDATE_WHEN_CACHED, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_ALLOW_CALLBACKS, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_DETACH_ALL_ON_COMMIT, null, false, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_DETACH_ALL_ON_ROLLBACK, null, false, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_DETACH_ON_CLOSE, null, false, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_COPY_ON_ATTACH, null, true, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_ATTACH_SAME_DATASTORE, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_ALLOW_ATTACH_OF_TRANSIENT, null, false, false, true);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_DETACH_AS_WRAPPED, null, false, false, true);
+        addDefaultProperty(PropertyNames.PROPERTY_DETACH_DETACHMENT_FIELDS, null, "load-fields", 
+            CorePropertyValidator.class.getName(), false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_DETACH_DETACHED_STATE, null, "fetch-groups", 
+            CorePropertyValidator.class.getName(), false, false);
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_MAX_FETCH_DEPTH, null, 1, false, true);
+
+        // Connection
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_URL, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_DRIVER_NAME, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_USER_NAME, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_PASSWORD, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_PASSWORD_DECRYPTER, null, null, null, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_FACTORY_NAME, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_FACTORY2_NAME, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_FACTORY, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_FACTORY2, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_RESOURCETYPE, null, null, 
+            CorePropertyValidator.class.getName(), true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_RESOURCETYPE2, null, null,
+            CorePropertyValidator.class.getName(), true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_POOLINGTYPE, null, null, null, true, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CONNECTION_POOLINGTYPE2, null, null, null, true, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_CONNECTION_NONTX_RELEASE_AFTER_USE, null, true, true, false);
+
+        // Cache
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L1_TYPE, null, "soft", null, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L2_TYPE, null, "soft", null, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L2_MODE, null, "UNSPECIFIED", 
+            CorePropertyValidator.class.getName(), false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_L2_NAME, null, "datanucleus", null, false, false);
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_L2_MAXSIZE, null, -1, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_LOADFIELDS, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_CLEARATCLOSE, null, true, false, false);
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_L2_TIMEOUT, null, -1, false, false);
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_L2_BATCHSIZE, null, 100, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_L2_CACHE_EMBEDDED, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_COLLECTIONS, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_CACHE_COLLECTIONS_LAZY, null, null, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYCOMPILE_TYPE, null, "soft", null, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYCOMPILEDATASTORE_TYPE, null, "soft", null, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYRESULTS_TYPE, null, "soft", null, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_CACHE_QUERYRESULTS_NAME, null, "datanucleus-query", null, false, false);
+        addDefaultIntegerProperty(PropertyNames.PROPERTY_CACHE_QUERYRESULTS_MAXSIZE, null, -1, false, false);
+
+        // Queries
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_SQL_ALLOWALL, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_JDOQL_ALLOWALL, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_FLUSH_BEFORE_EXECUTE, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_USE_FETCHPLAN, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_CHECK_UNUSED_PARAMS, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_COMPILE_OPTIMISED, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_LOAD_RESULTS_AT_COMMIT, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_COMPILATION_CACHED, null, true, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_RESULTS_CACHED, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_EVALUATE_IN_MEMORY, null, false, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_RESULTCACHE_VALIDATEOBJECTS, null, true, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_QUERY_RESULT_SIZE_METHOD, null, "last", null, false, false);
+        addDefaultBooleanProperty(PropertyNames.PROPERTY_QUERY_COMPILE_NAMED_QUERIES_AT_STARTUP, null, false, false, false);
+
         // Add properties from plugins
         ConfigurationElement[] propElements =
             pluginMgr.getConfigurationElementsForExtension("org.datanucleus.persistence_properties", null, null);

Modified: platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-02-08 11:53:16 UTC (rev 16544)
+++ platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-02-08 11:56:55 UTC (rev 16545)
@@ -46,29 +46,48 @@
     public static final String PROPERTY_IDENTITY_KEY_TRANSLATOR_TYPE = "datanucleus.identityKeyTranslatorType";
     public static final String PROPERTY_USE_IMPLEMENTATION_CREATOR = "datanucleus.useImplementationCreator";
 
-    public static final String PROPERTY_EXECUTION_CONTEXT_REAPER_THREAD = "datanucleus.executionContext.reaperThread";
-    public static final String PROPERTY_EXECUTION_CONTEXT_MAX_IDLE = "datanucleus.executionContext.maxIdle";
+    public static final String PROPERTY_PLUGIN_REGISTRY_CLASSNAME = "datanucleus.plugin.pluginRegistryClassName";
+    public static final String PROPERTY_PLUGIN_ALLOW_USER_BUNDLES = "datanucleus.plugin.allowUserBundles";
+    public static final String PROPERTY_PLUGIN_VALIDATEPLUGINS = "datanucleus.plugin.validatePlugins";
+    public static final String PROPERTY_PLUGIN_REGISTRYBUNDLECHECK = "datanucleus.plugin.pluginRegistryBundleCheck";
 
-    public static final String PROPERTY_OBJECT_PROVIDER_REAPER_THREAD = "datanucleus.objectProvider.reaperThread";
-    public static final String PROPERTY_OBJECT_PROVIDER_MAX_IDLE = "datanucleus.objectProvider.maxIdle";
+    public static final String PROPERTY_CLASSLOADER_RESOLVER_NAME = "datanucleus.classLoaderResolverName";
+    public static final String PROPERTY_CLASSLOADER_PRIMARY = "datanucleus.primaryClassLoader";
+    public static final String PROPERTY_LOCALISE_MESSAGECODES = "datanucleus.localisation.messageCodes";
+    public static final String PROPERTY_LOCALISE_LANGUAGE = "datanucleus.localisation.language";
 
     public static final String PROPERTY_JMX_TYPE = "datanucleus.jmxType";
     public static final String PROPERTY_ENABLE_STATISTICS = "datanucleus.enableStatistics";
 
+    public static final String PROPERTY_EXECUTION_CONTEXT_REAPER_THREAD = "datanucleus.executionContext.reaperThread";
+    public static final String PROPERTY_EXECUTION_CONTEXT_MAX_IDLE = "datanucleus.executionContext.maxIdle";
+    public static final String PROPERTY_OBJECT_PROVIDER_REAPER_THREAD = "datanucleus.objectProvider.reaperThread";
+    public static final String PROPERTY_OBJECT_PROVIDER_MAX_IDLE = "datanucleus.objectProvider.maxIdle";
+
     public static final String PROPERTY_TRANSACTION_TYPE = "datanucleus.TransactionType";
     public static final String PROPERTY_TRANSACTION_JTA_LOCATOR = "datanucleus.jtaLocator";
     public static final String PROPERTY_TRANSACTION_JTA_JNDI_LOCATION = "datanucleus.jtaJndiLocation";
     public static final String PROPERTY_TRANSACTION_ISOLATION = "datanucleus.transactionIsolation";
-    public static final String PROPERTY_TRANSACTION_FLUSH_LIMIT = "datanucleus.datastoreTransactionFlushLimit";
-    public static final String PROPERTY_TRANSACTION_DELAY_OPERATIONS = "datanucleus.datastoreTransactionDelayOperations";
-
-    public static final String PROPERTY_FLUSH_OPTIMISED = "datanucleus.flush.optimised";
-    public static final String PROPERTY_FLUSH_MODE = "datanucleus.flush.mode";
-
     public static final String PROPERTY_NONTX_READ = "datanucleus.NontransactionalRead";
     public static final String PROPERTY_NONTX_WRITE = "datanucleus.NontransactionalWrite";
     public static final String PROPERTY_NONTX_ATOMIC = "datanucleus.nontx.atomic";
 
+    public static final String PROPERTY_FLUSH_MODE = "datanucleus.flush.mode";
+    public static final String PROPERTY_FLUSH_AUTO_OBJECT_LIMIT = "datanucleus.datastoreTransactionFlushLimit";
+    public static final String PROPERTY_FLUSH_OPTIMISED = "datanucleus.flush.optimised";
+
+    public static final String PROPERTY_METADATA_ALWAYS_DETACHABLE = "datanucleus.metadata.alwaysDetachable";
+    public static final String PROPERTY_METADATA_VALIDATE = "datanucleus.metadata.validate";
+    public static final String PROPERTY_METADATA_AUTOREGISTER = "datanucleus.metadata.autoregistration";
+    public static final String PROPERTY_METADATA_ALLOW_XML = "datanucleus.metadata.allowXML";
+    public static final String PROPERTY_METADATA_ALLOW_ANNOTATIONS = "datanucleus.metadata.allowAnnotations";
+    public static final String PROPERTY_METADATA_ALLOW_LOAD_AT_RUNTIME = "datanucleus.metadata.allowLoadAtRuntime";
+    public static final String PROPERTY_METADATA_SUPPORT_ORM = "datanucleus.metadata.supportORM";
+    public static final String PROPERTY_METADATA_JDO_SUFFIX = "datanucleus.metadata.jdoFileExtension";
+    public static final String PROPERTY_METADATA_ORM_SUFFIX = "datanucleus.metadata.ormFileExtension";
+    public static final String PROPERTY_METADATA_JDOQUERY_SUFFIX = "datanucleus.metadata.jdoqueryFileExtension";
+    public static final String PROPERTY_METADATA_SCANNER = "datanucleus.metadata.scanner";
+
     public static final String PROPERTY_ATTACH_SAME_DATASTORE = "datanucleus.attachSameDatastore";
     public static final String PROPERTY_DETACH_ALL_ON_COMMIT = "datanucleus.DetachAllOnCommit";
     public static final String PROPERTY_DETACH_ALL_ON_ROLLBACK = "datanucleus.DetachAllOnRollback";
@@ -80,17 +99,6 @@
     public static final String PROPERTY_ALLOW_ATTACH_OF_TRANSIENT = "datanucleus.allowAttachOfTransient";
     public static final String PROPERTY_MAX_FETCH_DEPTH = "datanucleus.maxFetchDepth";
 
-    public static final String PROPERTY_PLUGIN_REGISTRY_CLASSNAME = "datanucleus.plugin.pluginRegistryClassName";
-    public static final String PROPERTY_PLUGIN_ALLOW_USER_BUNDLES = "datanucleus.plugin.allowUserBundles";
-    public static final String PROPERTY_PLUGIN_VALIDATEPLUGINS = "datanucleus.plugin.validatePlugins";
-    public static final String PROPERTY_PLUGIN_REGISTRYBUNDLECHECK = "datanucleus.plugin.pluginRegistryBundleCheck";
-
-    public static final String PROPERTY_CLASSLOADER_RESOLVER_NAME = "datanucleus.classLoaderResolverName";
-    public static final String PROPERTY_CLASSLOADER_PRIMARY = "datanucleus.primaryClassLoader";
-
-    public static final String PROPERTY_LOCALISE_MESSAGECODES = "datanucleus.localisation.messageCodes";
-    public static final String PROPERTY_LOCALISE_LANGUAGE = "datanucleus.localisation.language";
-
     public static final String PROPERTY_CONNECTION_URL = "datanucleus.ConnectionURL";
     public static final String PROPERTY_CONNECTION_DRIVER_NAME = "datanucleus.ConnectionDriverName";
     public static final String PROPERTY_CONNECTION_USER_NAME = "datanucleus.ConnectionUserName";
@@ -124,18 +132,6 @@
     public static final String PROPERTY_CACHE_QUERYRESULTS_NAME = "datanucleus.cache.queryResults.cacheName";
     public static final String PROPERTY_CACHE_QUERYRESULTS_MAXSIZE = "datanucleus.cache.queryResults.maxSize";
 
-    public static final String PROPERTY_METADATA_ALWAYS_DETACHABLE = "datanucleus.metadata.alwaysDetachable";
-    public static final String PROPERTY_METADATA_VALIDATE = "datanucleus.metadata.validate";
-    public static final String PROPERTY_METADATA_AUTOREGISTER = "datanucleus.metadata.autoregistration";
-    public static final String PROPERTY_METADATA_ALLOW_XML = "datanucleus.metadata.allowXML";
-    public static final String PROPERTY_METADATA_ALLOW_ANNOTATIONS = "datanucleus.metadata.allowAnnotations";
-    public static final String PROPERTY_METADATA_ALLOW_LOAD_AT_RUNTIME = "datanucleus.metadata.allowLoadAtRuntime";
-    public static final String PROPERTY_METADATA_SUPPORT_ORM = "datanucleus.metadata.supportORM";
-    public static final String PROPERTY_METADATA_JDO_SUFFIX = "datanucleus.metadata.jdoFileExtension";
-    public static final String PROPERTY_METADATA_ORM_SUFFIX = "datanucleus.metadata.ormFileExtension";
-    public static final String PROPERTY_METADATA_JDOQUERY_SUFFIX = "datanucleus.metadata.jdoqueryFileExtension";
-    public static final String PROPERTY_METADATA_SCANNER = "datanucleus.metadata.scanner";
-
     public static final String PROPERTY_MAPPING = "datanucleus.mapping";
     public static final String PROPERTY_MAPPING_CATALOG = "datanucleus.mapping.Catalog";
     public static final String PROPERTY_MAPPING_SCHEMA = "datanucleus.mapping.Schema";
@@ -159,7 +155,6 @@
     public static final String PROPERTY_SCHEMA_GENERATE_TARGET = "datanucleus.generateSchema.target";
     public static final String PROPERTY_SCHEMA_GENERATE_TARGET_CREATE_SCRIPT = "datanucleus.generateSchema.target.createScript";
     public static final String PROPERTY_SCHEMA_GENERATE_TARGET_DROP_SCRIPT = "datanucleus.generateSchema.target.dropScript";
-
     public static final String PROPERTY_AUTOCREATE_SCHEMA = "datanucleus.autoCreateSchema";
     public static final String PROPERTY_AUTOCREATE_TABLES = "datanucleus.autoCreateTables";
     public static final String PROPERTY_AUTOCREATE_COLUMNS = "datanucleus.autoCreateColumns";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16608
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16608&view=rev
Author:   andy_jefferson
Date:     2013-02-17 16:08:45 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
javadocs

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/evaluator/InMemoryQueryResult.java
    platform/core/trunk/src/java/org/datanucleus/store/query/AbstractJavaQuery.java
    platform/core/trunk/src/java/org/datanucleus/store/query/AbstractQueryResult.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/InMemoryQueryResult.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/InMemoryQueryResult.java	2013-02-17 15:52:58 UTC (rev 16607)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/InMemoryQueryResult.java	2013-02-17 16:08:45 UTC (rev 16608)
@@ -25,8 +25,6 @@
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import javax.jdo.JDOUserException;
-
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.store.query.QueryResult;
 import org.datanucleus.util.Localiser;
@@ -285,7 +283,7 @@
             String msg = LOCALISER.msg("052600");
             if (api.equalsIgnoreCase("JDO"))
             {
-                throw new JDOUserException(msg);
+                throw new javax.jdo.JDOUserException(msg);
             }
             else
             {

Modified: platform/core/trunk/src/java/org/datanucleus/store/query/AbstractJavaQuery.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/query/AbstractJavaQuery.java	2013-02-17 15:52:58 UTC (rev 16607)
+++ platform/core/trunk/src/java/org/datanucleus/store/query/AbstractJavaQuery.java	2013-02-17 16:08:45 UTC (rev 16608)
@@ -52,7 +52,6 @@
      * Set the candidate Extent to query.
      * Passing in null clears off the current candidate Extent.
      * @param pcs the Candidate Extent.
-     * @see javax.jdo.Query#setCandidates(javax.jdo.Extent)
      */
     public void setCandidates(Extent pcs)
     {
@@ -72,7 +71,6 @@
      * Set the candidate collection to query.
      * Passing in null clears off the current candidate collection.
      * @param pcs the Candidate collection.
-     * @see javax.jdo.Query#setCandidates(java.util.Collection)
      */
     public void setCandidates(Collection pcs)
     {

Modified: platform/core/trunk/src/java/org/datanucleus/store/query/AbstractQueryResult.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/query/AbstractQueryResult.java	2013-02-17 15:52:58 UTC (rev 16607)
+++ platform/core/trunk/src/java/org/datanucleus/store/query/AbstractQueryResult.java	2013-02-17 16:08:45 UTC (rev 16608)
@@ -26,8 +26,6 @@
 import java.util.ListIterator;
 import java.util.Map;
 
-import javax.jdo.JDOUserException;
-
 import org.datanucleus.ExecutionContext;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.store.connection.ManagedConnectionResourceListener;
@@ -191,7 +189,7 @@
             String msg = LOCALISER.msg("052600");
             if (api.equalsIgnoreCase("JDO"))
             {
-                throw new JDOUserException(msg);
+                throw new javax.jdo.JDOUserException(msg);
             }
             else
             {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16615
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16615&view=rev
Author:   andy_jefferson
Date:     2013-02-18 09:51:20 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
[NUCCORE-1001] Clean up of enhancer methods

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/enhancer/AbstractClassEnhancer.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/ClassEnhancer.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/ClassMethod.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassAdapter.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassChecker.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassEnhancer.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOImplementationGenerator.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOPropertyGetterAdapter.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOPropertySetterAdapter.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/PrimaryKeyGenerator.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/DefaultConstructor.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitClass.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldFlags.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldNames.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldTypes.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitPersistenceCapableSuperclass.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyField.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyFields.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyKeyFieldsFromObjectId.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyKeyFieldsFromObjectId2.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyKeyFieldsToObjectId.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyKeyFieldsToObjectId2.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetInheritedFieldCount.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetManagedFieldCount.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetNormal.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetObjectId.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetPersistenceManager.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetTransactionalObjectId.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetVersion.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetViaCheck.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoGetViaMediate.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoIsDeleted.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoIsDetached.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoIsDirty.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoIsNew.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoIsPersistent.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoIsTransactional.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoIsXXX.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoMakeDirty.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoNewInstance1.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoNewInstance2.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoNewObjectIdInstance1.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoNewObjectIdInstance2.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoPreSerialize.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoProvideField.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoProvideFields.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoReplaceDetachedState.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoReplaceField.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoReplaceFields.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoReplaceFlags.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoReplaceStateManager.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoSetNormal.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoSetViaCheck.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoSetViaMediate.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoSuperClone.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/LoadClass.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/WriteObject.java
    platform/core/trunk/src/java/org/datanucleus/util/JavaUtils.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/enhancer/EnhanceUtils.java

Removed Paths:
-------------
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassMethod.java
    platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOUtils.java

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/AbstractClassEnhancer.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/AbstractClassEnhancer.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/AbstractClassEnhancer.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -101,6 +101,14 @@
         initialised = true;
     }
 
+    /* (non-Javadoc)
+     * @see org.datanucleus.enhancer.ClassEnhancer#getClassName()
+     */
+    public String getClassName()
+    {
+        return className;
+    }
+
     /**
      * Method to initialise the list of methods to add.
      */

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/ClassEnhancer.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/ClassEnhancer.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/ClassEnhancer.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -106,4 +106,28 @@
     void setNamer(EnhancementNamer namer);
 
     EnhancementNamer getNamer();
+
+    /**
+     * Accessor for the class being enhanced.
+     * @return Class being enhanced
+     */
+    Class getClassBeingEnhanced();
+
+    /**
+     * Accessor for the name of the class being enhanced.
+     * @return Class name
+     */
+    String getClassName();
+
+    /**
+     * Accessor for the ASM class name for the class being enhanced.
+     * @return ASM class name
+     */
+    public String getASMClassName();
+
+    /**
+     * Accessor for the class descriptor for the class being enhanced
+     * @return class descriptor
+     */
+    public String getClassDescriptor();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/ClassMethod.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/ClassMethod.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/ClassMethod.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -19,6 +19,9 @@
 
 import java.util.Arrays;
 
+import org.datanucleus.asm.ClassVisitor;
+import org.datanucleus.asm.MethodVisitor;
+import org.datanucleus.asm.Type;
 import org.datanucleus.util.Localiser;
 
 /**
@@ -51,6 +54,9 @@
     /** Exceptions that can be thrown. */
     protected String[] exceptions;
 
+    /** Visitor for use in updating the method of the class (set in initialise). */
+    protected MethodVisitor visitor;
+
     /**
      * Constructor.
      * @param enhancer ClassEnhancer
@@ -88,6 +94,82 @@
         this.exceptions = exceptions;
     }
 
+    /**
+     * Default implementation of initialise, specifying the method based on the ClassMethod info.
+     */
+    public void initialise()
+    {
+        // Do nothing. Already set up in initialise(ClassVisitor)
+    }
+
+    /**
+     * Method to initialise the class method.
+     * @param classVisitor Visitor for the class
+     */
+    public void initialise(ClassVisitor classVisitor)
+    {
+        // Add the method to the class using the ClassMethod info
+        Type type = null;
+        Type[] argtypes = null;
+        if (returnType != null)
+        {
+            type = Type.getType((Class)returnType);
+        }
+        else
+        {
+            type = Type.VOID_TYPE;
+        }
+        if (argTypes != null)
+        {
+            argtypes = new Type[argTypes.length];
+            for (int i=0;i<argTypes.length;i++)
+            {
+                argtypes[i] = Type.getType((Class)argTypes[i]);
+            }
+        }
+        else
+        {
+            argtypes = new Type[0];
+        }
+        String methodDesc = Type.getMethodDescriptor(type, argtypes);
+        this.visitor = classVisitor.visitMethod(access, methodName, methodDesc, null, exceptions);
+    }
+
+    /**
+     * Convenience accessor for the ClassEnhancer
+     * @return ClassEnhancer
+     */
+    protected ClassEnhancer getClassEnhancer()
+    {
+        return enhancer;
+    }
+
+    /**
+     * Accessor for the descriptor of the method.
+     * @return The descriptor
+     */
+    public String getDescriptor()
+    {
+        StringBuffer str = new StringBuffer("(");
+        if (argTypes != null && argTypes.length > 0)
+        {
+            for (int i=0;i<argTypes.length;i++)
+            {
+                str.append(Type.getDescriptor((Class)argTypes[i]));
+            }
+        }
+        str.append(")");
+        if (returnType != null)
+        {
+            str.append(Type.getDescriptor((Class)returnType));
+        }
+        else
+        {
+            str.append("V");
+        }
+        return str.toString();
+    }
+
     public EnhancementNamer getNamer()
     {
         return enhancer.getNamer();
@@ -112,11 +194,6 @@
     }
 
     /**
-     * Method to initialise the class method.
-     */
-    public abstract void initialise();
-
-    /**
      * Method to add the contents of the class method.
      */
     public abstract void execute();

Copied: platform/core/trunk/src/java/org/datanucleus/enhancer/EnhanceUtils.java (from rev 16486, platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOUtils.java)
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/EnhanceUtils.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/EnhanceUtils.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -0,0 +1,433 @@
+/**********************************************************************
+Copyright (c) 2007 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.enhancer;
+
+import org.datanucleus.ClassConstants;
+import org.datanucleus.ClassNameConstants;
+import org.datanucleus.asm.MethodVisitor;
+import org.datanucleus.asm.Opcodes;
+import org.datanucleus.asm.Type;
+import org.datanucleus.util.Localiser;
+
+/**
+ * Utility class for JDO bytecode enhancement contract using ASM.
+ * ASM operates around two basic pieces of information about any type.
+ * <ul>
+ * <li><b>ASM class name</b> : this is the normal fully qualified class name but replacing
+ * the dots with slashes. So java.lang.String will have an ASM class name of java/lang/String</li>
+ * <li><b>Class descriptor</b> : this is used where a type is referred to in a calling sequence etc.
+ * and for object types is typically things like "Ljava.lang.String;", but there are variants for primitives.</li>
+ * </ul>
+ */
+public final class EnhanceUtils
+{
+    /** Localiser for messages. */
+    protected static Localiser LOCALISER = Localiser.getInstance("org.datanucleus.Localisation",
+        ClassConstants.NUCLEUS_CONTEXT_LOADER);
+
+    /** ASM class name for boolean. */
+    public final static String ACN_boolean = ClassNameConstants.BOOLEAN;
+
+    /** ASM class name for byte. */
+    public final static String ACN_byte = ClassNameConstants.BYTE;
+
+    /** ASM class name for char. */
+    public final static String ACN_char = ClassNameConstants.CHAR;
+
+    /** ASM class name for double. */
+    public final static String ACN_double = ClassNameConstants.DOUBLE;
+
+    /** ASM class name for float. */
+    public final static String ACN_float = ClassNameConstants.FLOAT;
+
+    /** ASM class name for int. */
+    public final static String ACN_int = ClassNameConstants.INT;
+
+    /** ASM class name for long. */
+    public final static String ACN_long = ClassNameConstants.LONG;
+
+    /** ASM class name for short. */
+    public final static String ACN_short = ClassNameConstants.SHORT;
+
+    /** ASM class name for Boolean. */
+    public final static String ACN_Boolean = ClassNameConstants.JAVA_LANG_BOOLEAN.replace('.', '/');
+
+    /** ASM class name for Byte. */
+    public final static String ACN_Byte = ClassNameConstants.JAVA_LANG_BYTE.replace('.', '/');
+
+    /** ASM class name for Character. */
+    public final static String ACN_Character = ClassNameConstants.JAVA_LANG_CHARACTER.replace('.', '/');
+
+    /** ASM class name for Double. */
+    public final static String ACN_Double = ClassNameConstants.JAVA_LANG_DOUBLE.replace('.', '/');
+
+    /** ASM class name for Float. */
+    public final static String ACN_Float = ClassNameConstants.JAVA_LANG_FLOAT.replace('.', '/');
+
+    /** ASM class name for Integer. */
+    public final static String ACN_Integer = ClassNameConstants.JAVA_LANG_INTEGER.replace('.', '/');
+
+    /** ASM class name for Long. */
+    public final static String ACN_Long = ClassNameConstants.JAVA_LANG_LONG.replace('.', '/');
+
+    /** ASM class name for Short. */
+    public final static String ACN_Short = ClassNameConstants.JAVA_LANG_SHORT.replace('.', '/');
+
+    /** ASM class name for java.lang.String. */
+    public final static String ACN_String = ClassNameConstants.JAVA_LANG_STRING.replace('.', '/');
+
+    /** ASM class name for java.lang.Object. */
+    public final static String ACN_Object = Object.class.getName().replace('.', '/');
+
+    /** Class descriptor for String. */
+    public final static String CD_String = Type.getDescriptor(String.class);
+
+    /** Descriptor for java.lang.Object. */
+    public final static String CD_Object = Type.getDescriptor(Object.class);
+
+    /**
+     * private constructor to prevent instantiation.
+     */
+    private EnhanceUtils()
+    {
+    }
+
+    /**
+     * Convenience method to add a BIPUSH-type int to the visitor.
+     * @param visitor The MethodVisitor
+     * @param i number
+     */
+    public static void addBIPUSHToMethod(MethodVisitor visitor, final int i)
+    {
+        if (i < 6)
+        {
+            switch (i)
+            {
+                case 0 :
+                    visitor.visitInsn(Opcodes.ICONST_0);
+                    break;
+                case 1 :
+                    visitor.visitInsn(Opcodes.ICONST_1);
+                    break;
+                case 2 :
+                    visitor.visitInsn(Opcodes.ICONST_2);
+                    break;
+                case 3 :
+                    visitor.visitInsn(Opcodes.ICONST_3);
+                    break;
+                case 4 :
+                    visitor.visitInsn(Opcodes.ICONST_4);
+                    break;
+                case 5 :
+                    visitor.visitInsn(Opcodes.ICONST_5);
+                    break;
+            }
+        }
+        else if (i < Byte.MAX_VALUE)
+        {
+            visitor.visitIntInsn(Opcodes.BIPUSH, i);
+        }
+        else if (i < Short.MAX_VALUE)
+        {
+            visitor.visitIntInsn(Opcodes.SIPUSH, i);
+        }
+    }
+
+    /**
+     * Convenience method to add a return statement based on the type to be returned.
+     * @param visitor The MethodVisitor
+     * @param type The type to return
+     */
+    public static void addReturnForType(MethodVisitor visitor, Class type)
+    {
+        if (type == int.class || type == boolean.class || type == byte.class || type == char.class || type == short.class)
+        {
+            visitor.visitInsn(Opcodes.IRETURN);
+        }
+        else if (type == double.class)
+        {
+            visitor.visitInsn(Opcodes.DRETURN);
+        }
+        else if (type == float.class)
+        {
+            visitor.visitInsn(Opcodes.FRETURN);
+        }
+        else if (type == long.class)
+        {
+            visitor.visitInsn(Opcodes.LRETURN);
+        }
+        else
+        {
+            visitor.visitInsn(Opcodes.ARETURN);
+        }
+    }
+
+    /**
+     * Convenience method to add a load statement based on the type to be loaded.
+     * @param visitor The MethodVisitor
+     * @param type The type to load
+     * @param number Number to load
+     */
+    public static void addLoadForType(MethodVisitor visitor, Class type, int number)
+    {
+        if (type == int.class || type == boolean.class || type == byte.class || type == char.class || type == short.class)
+        {
+            visitor.visitVarInsn(Opcodes.ILOAD, number);
+        }
+        else if (type == double.class)
+        {
+            visitor.visitVarInsn(Opcodes.DLOAD, number);
+        }
+        else if (type == float.class)
+        {
+            visitor.visitVarInsn(Opcodes.FLOAD, number);
+        }
+        else if (type == long.class)
+        {
+            visitor.visitVarInsn(Opcodes.LLOAD, number);
+        }
+        else
+        {
+            visitor.visitVarInsn(Opcodes.ALOAD, number);
+        }
+    }
+
+    /**
+     * Convenience method to give the JDO method name given the type.
+     * This is for the assorted methods on the JDO StateManager called things like "replacingStringField",
+     * "replacingObjectField", "providedIntField", etc. Just returns the "type" part of the name.
+     * <ul>
+     * <li>Boolean, bool : returns "Boolean"</li>
+     * <li>Byte, byte : returns "Byte"</li>
+     * <li>Character, char : returns "Char"</li>
+     * <li>Double, double : returns "Double"</li>
+     * <li>Float, float : returns "Float"</li>
+     * <li>Integer, int : returns "Int"</li>
+     * <li>Long, long : returns "Long"</li>
+     * <li>Short, short : returns "Short"</li>
+     * <li>String : returns "String"</li>
+     * <li>all others : returns "Object"</li>
+     * </ul>
+     * @param cls The type of the field
+     * @return Name for the method
+     */
+    public static String getTypeNameForJDOMethod(Class cls)
+    {
+        if (cls == null)
+        {
+            return null;
+        }
+        else if (cls == ClassConstants.BOOLEAN)
+        {
+            return "Boolean";
+        }
+        else if (cls == ClassConstants.BYTE)
+        {
+            return "Byte";
+        }
+        else if (cls == ClassConstants.CHAR)
+        {
+            return "Char";
+        }
+        else if (cls == ClassConstants.DOUBLE)
+        {
+            return "Double";
+        }
+        else if (cls == ClassConstants.FLOAT)
+        {
+            return "Float";
+        }
+        else if (cls == ClassConstants.INT)
+        {
+            return "Int";
+        }
+        else if (cls == ClassConstants.LONG)
+        {
+            return "Long";
+        }
+        else if (cls == ClassConstants.SHORT)
+        {
+            return "Short";
+        }
+        else if (cls == ClassConstants.JAVA_LANG_STRING)
+        {
+            return "String";
+        }
+        // Byte, Boolean, Character, Double, Float, Integer, Long, Short go through Object too
+        return "Object";
+    }
+
+    /**
+     * Return the ASM type descriptor for the input class.
+     * @param clsName The input class name
+     * @return The ASM type descriptor name
+     */
+    public static String getTypeDescriptorForType(String clsName)
+    {
+        if (clsName == null)
+        {
+            return null;
+        }
+        else if (clsName.equals(ClassNameConstants.BOOLEAN))
+        {
+            return Type.BOOLEAN_TYPE.getDescriptor();
+        }
+        else if (clsName.equals(ClassNameConstants.BYTE))
+        {
+            return Type.BYTE_TYPE.getDescriptor();
+        }
+        else if (clsName.equals(ClassNameConstants.CHAR))
+        {
+            return Type.CHAR_TYPE.getDescriptor();
+        }
+        else if (clsName.equals(ClassNameConstants.DOUBLE))
+        {
+            return Type.DOUBLE_TYPE.getDescriptor();
+        }
+        else if (clsName.equals(ClassNameConstants.FLOAT))
+        {
+            return Type.FLOAT_TYPE.getDescriptor();
+        }
+        else if (clsName.equals(ClassNameConstants.INT))
+        {
+            return Type.INT_TYPE.getDescriptor();
+        }
+        else if (clsName.equals(ClassNameConstants.LONG))
+        {
+            return Type.LONG_TYPE.getDescriptor();
+        }
+        else if (clsName.equals(ClassNameConstants.SHORT))
+        {
+            return Type.SHORT_TYPE.getDescriptor();
+        }
+        else if (clsName.equals(ClassNameConstants.JAVA_LANG_STRING))
+        {
+            return CD_String;
+        }
+        else
+        {
+            return "L" + clsName.replace('.', '/') + ";";
+        }
+    }
+    /**
+     * Convenience method to give the descriptor for use in a JDO "field" method.
+     * This is for the assorted methods on the JDO StateManager called things like "replacingStringField",
+     * "replacingObjectField", "providedIntField", etc. Returns the ASM descriptor equivalent for the method used
+     * <ul>
+     * <li>Boolean, bool : returns "Boolean"</li>
+     * <li>Byte, byte : returns "Byte"</li>
+     * <li>Character, char : returns "Char"</li>
+     * <li>Double, double : returns "Double"</li>
+     * <li>Float, float : returns "Float"</li>
+     * <li>Integer, int : returns "Int"</li>
+     * <li>Long, long : returns "Long"</li>
+     * <li>Short, short : returns "Short"</li>
+     * <li>String : returns "String"</li>
+     * <li>all others : returns "Object"</li>
+     * </ul>
+     * TODO Cache these descriptors/classes etc
+     * @param cls The type of the field
+     * @return Name for the method
+     */
+    public static String getTypeDescriptorForJDOMethod(Class cls)
+    {
+        if (cls == null)
+        {
+            return null;
+        }
+        else if (cls == ClassConstants.BOOLEAN)
+        {
+            return Type.BOOLEAN_TYPE.getDescriptor();
+        }
+        else if (cls == ClassConstants.BYTE)
+        {
+            return Type.BYTE_TYPE.getDescriptor();
+        }
+        else if (cls == ClassConstants.CHAR)
+        {
+            return Type.CHAR_TYPE.getDescriptor();
+        }
+        else if (cls == ClassConstants.DOUBLE)
+        {
+            return Type.DOUBLE_TYPE.getDescriptor();
+        }
+        else if (cls == ClassConstants.FLOAT)
+        {
+            return Type.FLOAT_TYPE.getDescriptor();
+        }
+        else if (cls == ClassConstants.INT)
+        {
+            return Type.INT_TYPE.getDescriptor();
+        }
+        else if (cls == ClassConstants.LONG)
+        {
+            return Type.LONG_TYPE.getDescriptor();
+        }
+        else if (cls == ClassConstants.SHORT)
+        {
+            return Type.SHORT_TYPE.getDescriptor();
+        }
+        else if (cls == ClassConstants.JAVA_LANG_STRING)
+        {
+            return CD_String;
+        }
+        return CD_Object;
+    }
+
+    /**
+     * Convenience method to return the ASM class name to use as input via the SingleFieldIdentity constructor.
+     * Means that if the fieldType is primitive we return the ASM class name of the object wrapper.
+     * @param fieldType Type of the field
+     * @return ASM class name to use as input in the constructor
+     */
+    public static String getASMClassNameForSingleFieldIdentityConstructor(Class fieldType)
+    {
+        if (fieldType == null)
+        {
+            return null;
+        }
+        else if (fieldType == ClassConstants.BYTE || fieldType == ClassConstants.JAVA_LANG_BYTE)
+        {
+            return ACN_Byte;
+        }
+        else if (fieldType == ClassConstants.CHAR || fieldType == ClassConstants.JAVA_LANG_CHARACTER)
+        {
+            return ACN_Character;
+        }
+        else if (fieldType == ClassConstants.INT || fieldType == ClassConstants.JAVA_LANG_INTEGER)
+        {
+            return ACN_Integer;
+        }
+        else if (fieldType == ClassConstants.LONG || fieldType == ClassConstants.JAVA_LANG_LONG)
+        {
+            return ACN_Long;
+        }
+        else if (fieldType == ClassConstants.SHORT || fieldType == ClassConstants.JAVA_LANG_SHORT)
+        {
+            return ACN_Short;
+        }
+        else if (fieldType == ClassConstants.JAVA_LANG_STRING)
+        {
+            return ACN_String;
+        }
+        else
+        {
+            return ACN_Object;
+        }
+    }
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassAdapter.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassAdapter.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassAdapter.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -33,9 +33,9 @@
 import org.datanucleus.asm.Type;
 import org.datanucleus.enhancer.ClassEnhancer;
 import org.datanucleus.enhancer.ClassField;
+import org.datanucleus.enhancer.ClassMethod;
 import org.datanucleus.enhancer.DataNucleusEnhancer;
 import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
 import org.datanucleus.enhancer.jdo.JDOMethodAdapter;
 import org.datanucleus.enhancer.jdo.JDOPropertyGetterAdapter;
 import org.datanucleus.enhancer.jdo.JDOPropertySetterAdapter;
@@ -323,11 +323,10 @@
 
             // Add any new methods
             List methods = enhancer.getMethodsList();
-            Iterator methodsIter = methods.iterator();
+            Iterator<ClassMethod> methodsIter = methods.iterator();
             while (methodsIter.hasNext())
             {
-                JDOClassMethod method = (JDOClassMethod)methodsIter.next();
-
+                ClassMethod method = methodsIter.next();
                 method.initialise(cv);
                 method.execute();
                 method.close();
@@ -346,7 +345,7 @@
                         {
                             public Object run()
                             {
-                                return Long.valueOf(ObjectStreamClass.lookup(enhancer.getClassEnhanced()).getSerialVersionUID());
+                                return Long.valueOf(ObjectStreamClass.lookup(enhancer.getClassBeingEnhanced()).getSerialVersionUID());
                             }
                         });
                     }
@@ -365,7 +364,7 @@
                 }
                 if (!hasWriteObject)
                 {
-                    JDOClassMethod method = WriteObject.getInstance(enhancer);
+                    ClassMethod method = WriteObject.getInstance(enhancer);
                     method.initialise(cv);
                     method.execute();
                     method.close();
@@ -383,8 +382,8 @@
                 }
 
                 byte jdoFlag = fmds[i].getPersistenceFlags();
-                JDOClassMethod getMethod = null;
-                JDOClassMethod setMethod = null;
+                ClassMethod getMethod = null;
+                ClassMethod setMethod = null;
                 if (fmds[i] instanceof PropertyMetaData)
                 {
                     // jdoGetXXX, jdoSetXXX for property are generated when processing existing getXXX, setXXX methods

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassChecker.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassChecker.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassChecker.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -31,7 +31,6 @@
 import org.datanucleus.enhancer.ClassMethod;
 import org.datanucleus.enhancer.DataNucleusEnhancer;
 import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
 import org.datanucleus.metadata.ClassPersistenceModifier;
 import org.datanucleus.util.Localiser;
 
@@ -274,10 +273,10 @@
      */
     public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions)
     {
-        Iterator iter = methodsRequired.iterator();
+        Iterator<ClassMethod> iter = methodsRequired.iterator();
         while (iter.hasNext())
         {
-            JDOClassMethod method = (JDOClassMethod)iter.next();
+            ClassMethod method = iter.next();
             if (method.getName().equals(name) && method.getDescriptor().equals(desc))
             {
                 if (method.getAccess() != access)

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassEnhancer.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassEnhancer.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassEnhancer.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -80,7 +80,6 @@
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.InvalidMetaDataException;
 import org.datanucleus.metadata.MetaDataManager;
-import org.datanucleus.util.JavaUtils;
 import org.datanucleus.util.Localiser;
 
 /**
@@ -186,15 +185,6 @@
         }
     }
 
-    public static boolean useFrames()
-    {
-        if (JavaUtils.getJREMajorVersion() == 1 && JavaUtils.getJREMinorVersion() <= 6)
-        {
-            return false;
-        }
-        return true;
-    }
-
     /** Convenience class to look up the class name for a file. */
     public static class MyClassVisitor extends ClassVisitor
     {
@@ -237,7 +227,7 @@
      * Accessor for the class being enhanced.
      * @return Class being enhanced
      */
-    public Class getClassEnhanced()
+    public Class getClassBeingEnhanced()
     {
         return cls;
     }

Deleted: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassMethod.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassMethod.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOClassMethod.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -1,141 +0,0 @@
-/**********************************************************************
-Copyright (c) 2007 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus.enhancer.jdo;
-
-import org.datanucleus.asm.ClassVisitor;
-import org.datanucleus.asm.MethodVisitor;
-import org.datanucleus.asm.Type;
-import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.ClassMethod;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-
-/**
- * Representation of a method required by an enhanced class, for use by ASM.
- */
-public abstract class JDOClassMethod extends ClassMethod
-{
-    /** Visitor for use in updating the method of the class (set in initialise). */
-    protected MethodVisitor visitor;
-
-    /**
-     * Constructor.
-     * @param enhancer Class Enhancer
-     * @param name method name
-     * @param access Access type for the method
-     * @param returnType return type
-     * @param argTypes argment types
-     * @param argNames argment names
-     */
-    public JDOClassMethod(ClassEnhancer enhancer, String name, int access, Object returnType, 
-            Object[] argTypes, String[] argNames)
-    {
-        super(enhancer, name, access, returnType, argTypes, argNames);
-    }
-
-    /**
-     * Constructor.
-     * @param enhancer Class Enhancer
-     * @param name method name
-     * @param access Access type for the method
-     * @param returnType return type
-     * @param argTypes argment types
-     * @param argNames argment names
-     * @param exceptions Exceptions that can be thrown
-     */
-    public JDOClassMethod(ClassEnhancer enhancer, String name, int access, Object returnType, 
-            Object[] argTypes, String[] argNames, String[] exceptions)
-    {
-        super(enhancer, name, access, returnType, argTypes, argNames, exceptions);
-    }
-
-    /**
-     * Convenience accessor for the ASMClassEnhancer
-     * @return ClassEnhancer for ASM
-     */
-    protected JDOClassEnhancer getClassEnhancer()
-    {
-        return (JDOClassEnhancer)enhancer;
-    }
-
-    /**
-     * Default implementation of initialise, specifying the method based on the ClassMethod info.
-     */
-    public void initialise()
-    {
-        // Do nothing. Already set up in initialise(ClassVisitor)
-    }
-
-    /**
-     * Method to initialise the class method.
-     * @param classVisitor Visitor for the class
-     */
-    public void initialise(ClassVisitor classVisitor)
-    {
-        // Add the method to the class using the ClassMethod info
-        Type type = null;
-        Type[] argtypes = null;
-        if (returnType != null)
-        {
-            type = Type.getType((Class)returnType);
-        }
-        else
-        {
-            type = Type.VOID_TYPE;
-        }
-        if (argTypes != null)
-        {
-            argtypes = new Type[argTypes.length];
-            for (int i=0;i<argTypes.length;i++)
-            {
-                argtypes[i] = Type.getType((Class)argTypes[i]);
-            }
-        }
-        else
-        {
-            argtypes = new Type[0];
-        }
-        String methodDesc = Type.getMethodDescriptor(type, argtypes);
-        this.visitor = classVisitor.visitMethod(access, methodName, methodDesc, null, exceptions);
-    }
-
-    /**
-     * Accessor for the descriptor of the method.
-     * @return The descriptor
-     */
-    public String getDescriptor()
-    {
-        StringBuffer str = new StringBuffer("(");
-        if (argTypes != null && argTypes.length > 0)
-        {
-            for (int i=0;i<argTypes.length;i++)
-            {
-                str.append(Type.getDescriptor((Class)argTypes[i]));
-            }
-        }
-        str.append(")");
-        if (returnType != null)
-        {
-            str.append(Type.getDescriptor((Class)returnType));
-        }
-        else
-        {
-            str.append("V");
-        }
-        return str.toString();
-    }
-}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOImplementationGenerator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOImplementationGenerator.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOImplementationGenerator.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -33,10 +33,10 @@
 import org.datanucleus.asm.Type;
 import org.datanucleus.enhancer.ClassEnhancer;
 import org.datanucleus.enhancer.DataNucleusEnhancer;
+import org.datanucleus.enhancer.EnhanceUtils;
 import org.datanucleus.enhancer.EnhancementNamer;
 import org.datanucleus.enhancer.EnhancerClassLoader;
 import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOUtils;
 import org.datanucleus.enhancer.jdo.JDOPropertyGetterAdapter;
 import org.datanucleus.enhancer.jdo.JDOPropertySetterAdapter;
 import org.datanucleus.metadata.AbstractClassMetaData;
@@ -338,7 +338,7 @@
             visitor.visitLabel(l0);
             visitor.visitVarInsn(Opcodes.ALOAD, 0);
             visitor.visitFieldInsn(Opcodes.GETFIELD, asmClassName, mmd.getName(), fieldDesc);
-            JDOUtils.addReturnForType(visitor, mmd.getType());
+            EnhanceUtils.addReturnForType(visitor, mmd.getType());
             Label l1 = new Label();
             visitor.visitLabel(l1);
             visitor.visitLocalVariable("this", asmTypeDescriptor, null, l0, l1, 0);
@@ -366,7 +366,7 @@
             visitor.visitLabel(l0);
             visitor.visitVarInsn(Opcodes.ALOAD, 0);
             visitor.visitFieldInsn(Opcodes.GETFIELD, asmClassName, mmd.getName(), fieldDesc);
-            JDOUtils.addReturnForType(visitor, mmd.getType());
+            EnhanceUtils.addReturnForType(visitor, mmd.getType());
             Label l1 = new Label();
             visitor.visitLabel(l1);
             visitor.visitLocalVariable("this", asmTypeDescriptor, null, l0, l1, 0);
@@ -393,7 +393,7 @@
             Label l0 = new Label();
             visitor.visitLabel(l0);
             visitor.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addLoadForType(visitor, mmd.getType(), 1);
+            EnhanceUtils.addLoadForType(visitor, mmd.getType(), 1);
             visitor.visitFieldInsn(Opcodes.PUTFIELD, asmClassName, mmd.getName(), fieldDesc);
             visitor.visitInsn(Opcodes.RETURN);
             Label l2 = new Label();
@@ -423,7 +423,7 @@
             Label l0 = new Label();
             visitor.visitLabel(l0);
             visitor.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addLoadForType(visitor, mmd.getType(), 1);
+            EnhanceUtils.addLoadForType(visitor, mmd.getType(), 1);
             visitor.visitFieldInsn(Opcodes.PUTFIELD, asmClassName, mmd.getName(), fieldDesc);
             visitor.visitInsn(Opcodes.RETURN);
             Label l2 = new Label();

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOPropertyGetterAdapter.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOPropertyGetterAdapter.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOPropertyGetterAdapter.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -29,11 +29,12 @@
 import org.datanucleus.enhancer.ClassEnhancer;
 import org.datanucleus.enhancer.ClassMethod;
 import org.datanucleus.enhancer.DataNucleusEnhancer;
+import org.datanucleus.enhancer.EnhanceUtils;
 import org.datanucleus.enhancer.EnhancementNamer;
 import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOUtils;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.util.JavaUtils;
 import org.datanucleus.util.Localiser;
 
 /**
@@ -132,7 +133,7 @@
         {
             // Property is not abstract so generate the getXXX method to use the aaaGetXXX we just added
             generateGetXXXMethod(mv, mmd, enhancer.getASMClassName(), enhancer.getClassDescriptor(), false, 
-                JDOClassEnhancer.useFrames(), enhancer.getNamer());
+                JavaUtils.useStackMapFrames(), enhancer.getNamer());
         }
     }
 
@@ -170,7 +171,7 @@
             mv.visitFieldInsn(Opcodes.GETFIELD, asmClassName,
                 namer.getStateManagerFieldName(), "L" + namer.getStateManagerAsmClassName() + ";");
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+            EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
             if (cmd.getPersistenceCapableSuperclass() != null)
             {
                 mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName, namer.getInheritedFieldCountFieldName(), "I");
@@ -184,7 +185,7 @@
             mv.visitFieldInsn(Opcodes.GETFIELD, asmClassName,
                 namer.getStateManagerFieldName(), "L" + namer.getStateManagerAsmClassName() + ";");
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+            EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
             if (cmd.getPersistenceCapableSuperclass() != null)
             {
                 mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName, namer.getInheritedFieldCountFieldName(), "I");
@@ -194,11 +195,11 @@
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName, 
                 namer.getGetMethodPrefixMethodName() + mmd.getName(), "()" + fieldTypeDesc);
-            String methodName = "get" + JDOUtils.getTypeNameForJDOMethod(mmd.getType()) + "Field";
+            String methodName = "get" + EnhanceUtils.getTypeNameForJDOMethod(mmd.getType()) + "Field";
             String argTypeDesc = fieldTypeDesc;
             if (methodName.equals("getObjectField"))
             {
-                argTypeDesc = JDOUtils.CD_Object;
+                argTypeDesc = EnhanceUtils.CD_Object;
             }
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, namer.getStateManagerAsmClassName(),
                 methodName, "(L" + namer.getPersistableAsmClassName() + ";I" + argTypeDesc + ")" + argTypeDesc);
@@ -207,7 +208,7 @@
                 // Cast any object fields to the correct type
                 mv.visitTypeInsn(Opcodes.CHECKCAST, mmd.getTypeName().replace('.', '/'));
             }
-            JDOUtils.addReturnForType(mv, mmd.getType());
+            EnhanceUtils.addReturnForType(mv, mmd.getType());
 
             mv.visitLabel(l1);
 
@@ -224,7 +225,7 @@
                 mv.visitInsn(Opcodes.ICONST_2);
                 mv.visitInsn(Opcodes.AALOAD);
                 mv.visitTypeInsn(Opcodes.CHECKCAST, "java/util/BitSet");
-                JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+                EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
                 if (cmd.getPersistenceCapableSuperclass() != null)
                 {
                     mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName, namer.getInheritedFieldCountFieldName(), "I");
@@ -238,7 +239,7 @@
                 mv.visitInsn(Opcodes.ICONST_3);
                 mv.visitInsn(Opcodes.AALOAD);
                 mv.visitTypeInsn(Opcodes.CHECKCAST, "java/util/BitSet");
-                JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+                EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
                 if (cmd.getPersistenceCapableSuperclass() != null)
                 {
                     mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName, namer.getInheritedFieldCountFieldName(), "I");
@@ -272,7 +273,7 @@
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName, 
                 namer.getGetMethodPrefixMethodName() + mmd.getName(), "()" + fieldTypeDesc);
-            JDOUtils.addReturnForType(mv, mmd.getType());
+            EnhanceUtils.addReturnForType(mv, mmd.getType());
 
             Label endLabel = new Label();
             mv.visitLabel(endLabel);
@@ -297,7 +298,7 @@
             mv.visitFieldInsn(Opcodes.GETFIELD, asmClassName,
                 namer.getStateManagerFieldName(), "L" + namer.getStateManagerAsmClassName() + ";");
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+            EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
             if (cmd.getPersistenceCapableSuperclass() != null)
             {
                 mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName,
@@ -312,7 +313,7 @@
             mv.visitFieldInsn(Opcodes.GETFIELD, asmClassName,
                 namer.getStateManagerFieldName(), "L" + namer.getStateManagerAsmClassName() + ";");
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+            EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
             if (cmd.getPersistenceCapableSuperclass() != null)
             {
                 mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName, namer.getInheritedFieldCountFieldName(), "I");
@@ -320,11 +321,11 @@
             }
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName, namer.getGetMethodPrefixMethodName() + mmd.getName(), "()" + fieldTypeDesc);
-            String methodName = "get" + JDOUtils.getTypeNameForJDOMethod(mmd.getType()) + "Field";
+            String methodName = "get" + EnhanceUtils.getTypeNameForJDOMethod(mmd.getType()) + "Field";
             String argTypeDesc = fieldTypeDesc;
             if (methodName.equals("getObjectField"))
             {
-                argTypeDesc = JDOUtils.CD_Object;
+                argTypeDesc = EnhanceUtils.CD_Object;
             }
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, namer.getStateManagerAsmClassName(),
                 methodName, "(L" + namer.getPersistableAsmClassName() + ";I" + argTypeDesc + ")" + argTypeDesc);
@@ -333,7 +334,7 @@
                 // Cast any object fields to the correct type
                 mv.visitTypeInsn(Opcodes.CHECKCAST, mmd.getTypeName().replace('.', '/'));
             }
-            JDOUtils.addReturnForType(mv, mmd.getType());
+            EnhanceUtils.addReturnForType(mv, mmd.getType());
             mv.visitLabel(l1);
 
             if (cmd.isDetachable())
@@ -353,7 +354,7 @@
                 mv.visitInsn(Opcodes.ICONST_2);
                 mv.visitInsn(Opcodes.AALOAD);
                 mv.visitTypeInsn(Opcodes.CHECKCAST, "java/util/BitSet");
-                JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+                EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
                 if (cmd.getPersistenceCapableSuperclass() != null)
                 {
                     mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName,
@@ -392,7 +393,7 @@
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName, 
                 namer.getGetMethodPrefixMethodName() + mmd.getName(), "()" + fieldTypeDesc);
-            JDOUtils.addReturnForType(mv, mmd.getType());
+            EnhanceUtils.addReturnForType(mv, mmd.getType());
 
             Label endLabel = new Label();
             mv.visitLabel(endLabel);
@@ -408,7 +409,7 @@
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName, 
                 namer.getGetMethodPrefixMethodName() + mmd.getName(), "()" + fieldTypeDesc);
-            JDOUtils.addReturnForType(mv, mmd.getType());
+            EnhanceUtils.addReturnForType(mv, mmd.getType());
 
             Label endLabel = new Label();
             mv.visitLabel(endLabel);

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOPropertySetterAdapter.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOPropertySetterAdapter.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOPropertySetterAdapter.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -29,11 +29,12 @@
 import org.datanucleus.enhancer.ClassEnhancer;
 import org.datanucleus.enhancer.ClassMethod;
 import org.datanucleus.enhancer.DataNucleusEnhancer;
+import org.datanucleus.enhancer.EnhanceUtils;
 import org.datanucleus.enhancer.EnhancementNamer;
 import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOUtils;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.util.JavaUtils;
 import org.datanucleus.util.Localiser;
 
 /**
@@ -133,7 +134,7 @@
         {
             // Property is not abstract so generate the setXXX method to use the aaaSetXXX we just added
             generateSetXXXMethod(mv, mmd, enhancer.getASMClassName(), enhancer.getClassDescriptor(), 
-                JDOClassEnhancer.useFrames(), enhancer.getNamer());
+                JavaUtils.useStackMapFrames(), enhancer.getNamer());
         }
     }
 
@@ -167,7 +168,7 @@
             Label l1 = new Label();
             mv.visitJumpInsn(Opcodes.IFNONNULL, l1);
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addLoadForType(mv, mmd.getType(), 1);
+            EnhanceUtils.addLoadForType(mv, mmd.getType(), 1);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName,
                 namer.getSetMethodPrefixMethodName() + mmd.getName(), "(" + fieldTypeDesc + ")V");
             Label l3 = new Label();
@@ -183,7 +184,7 @@
             mv.visitFieldInsn(Opcodes.GETFIELD, asmClassName,
                 namer.getStateManagerFieldName(), "L" + namer.getStateManagerAsmClassName() + ";");
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+            EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
             if (cmd.getPersistenceCapableSuperclass() != null)
             {
                 mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName, namer.getInheritedFieldCountFieldName(), "I");
@@ -192,12 +193,12 @@
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName, 
                 namer.getGetMethodPrefixMethodName() + mmd.getName(), "()" + fieldTypeDesc);
-            JDOUtils.addLoadForType(mv, mmd.getType(), 1);
-            String methodName = "set" + JDOUtils.getTypeNameForJDOMethod(mmd.getType()) + "Field";
+            EnhanceUtils.addLoadForType(mv, mmd.getType(), 1);
+            String methodName = "set" + EnhanceUtils.getTypeNameForJDOMethod(mmd.getType()) + "Field";
             String argTypeDesc = fieldTypeDesc;
             if (methodName.equals("setObjectField"))
             {
-                argTypeDesc = JDOUtils.CD_Object;
+                argTypeDesc = EnhanceUtils.CD_Object;
             }
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, namer.getStateManagerAsmClassName(),
                 methodName, "(L" + namer.getPersistableAsmClassName() + ";I" + argTypeDesc + argTypeDesc + ")V");
@@ -224,7 +225,7 @@
                 mv.visitInsn(Opcodes.ICONST_3);
                 mv.visitInsn(Opcodes.AALOAD);
                 mv.visitTypeInsn(Opcodes.CHECKCAST, "java/util/BitSet");
-                JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+                EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
                 if (cmd.getPersistenceCapableSuperclass() != null)
                 {
                     mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName,
@@ -267,7 +268,7 @@
             mv.visitFieldInsn(Opcodes.GETFIELD, asmClassName,
                 namer.getStateManagerFieldName(), "L" + namer.getStateManagerAsmClassName() + ";");
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+            EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
             if (cmd.getPersistenceCapableSuperclass() != null)
             {
                 mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName,
@@ -277,12 +278,12 @@
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName, 
                 namer.getGetMethodPrefixMethodName() + mmd.getName(), "()" + fieldTypeDesc);
-            JDOUtils.addLoadForType(mv, mmd.getType(), 1);
-            String methodName = "set" + JDOUtils.getTypeNameForJDOMethod(mmd.getType()) + "Field";
+            EnhanceUtils.addLoadForType(mv, mmd.getType(), 1);
+            String methodName = "set" + EnhanceUtils.getTypeNameForJDOMethod(mmd.getType()) + "Field";
             String argTypeDesc = fieldTypeDesc;
             if (methodName.equals("setObjectField"))
             {
-                argTypeDesc = JDOUtils.CD_Object;
+                argTypeDesc = EnhanceUtils.CD_Object;
             }
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, namer.getStateManagerAsmClassName(),
                 methodName, "(L" + namer.getPersistableAsmClassName() + ";I" + argTypeDesc + argTypeDesc + ")V");
@@ -296,7 +297,7 @@
                 mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
             }
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addLoadForType(mv, mmd.getType(), 1);
+            EnhanceUtils.addLoadForType(mv, mmd.getType(), 1);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName,
                 namer.getSetMethodPrefixMethodName() + mmd.getName(), "(" + fieldTypeDesc + ")V");
 
@@ -313,7 +314,7 @@
                 mv.visitInsn(Opcodes.ICONST_3);
                 mv.visitInsn(Opcodes.AALOAD);
                 mv.visitTypeInsn(Opcodes.CHECKCAST, "java/util/BitSet");
-                JDOUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
+                EnhanceUtils.addBIPUSHToMethod(mv, mmd.getFieldId());
                 if (cmd.getPersistenceCapableSuperclass() != null)
                 {
                     mv.visitFieldInsn(Opcodes.GETSTATIC, asmClassName,
@@ -343,7 +344,7 @@
             mv.visitLabel(startLabel);
 
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            JDOUtils.addLoadForType(mv, mmd.getType(), 1);
+            EnhanceUtils.addLoadForType(mv, mmd.getType(), 1);
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, asmClassName,
                 namer.getSetMethodPrefixMethodName() + mmd.getName(), "(" + fieldTypeDesc + ")V");
             mv.visitInsn(Opcodes.RETURN);

Deleted: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOUtils.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOUtils.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/JDOUtils.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -1,433 +0,0 @@
-/**********************************************************************
-Copyright (c) 2007 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus.enhancer.jdo;
-
-import org.datanucleus.ClassConstants;
-import org.datanucleus.ClassNameConstants;
-import org.datanucleus.asm.MethodVisitor;
-import org.datanucleus.asm.Opcodes;
-import org.datanucleus.asm.Type;
-import org.datanucleus.util.Localiser;
-
-/**
- * Utility class for JDO bytecode enhancement contract using ASM.
- * ASM operates around two basic pieces of information about any type.
- * <ul>
- * <li><b>ASM class name</b> : this is the normal fully qualified class name but replacing
- * the dots with slashes. So java.lang.String will have an ASM class name of java/lang/String</li>
- * <li><b>Class descriptor</b> : this is used where a type is referred to in a calling sequence etc.
- * and for object types is typically things like "Ljava.lang.String;", but there are variants for primitives.</li>
- * </ul>
- */
-public final class JDOUtils
-{
-    /** Localiser for messages. */
-    protected static Localiser LOCALISER = Localiser.getInstance("org.datanucleus.Localisation",
-        ClassConstants.NUCLEUS_CONTEXT_LOADER);
-
-    /** ASM class name for boolean. */
-    public final static String ACN_boolean = ClassNameConstants.BOOLEAN;
-
-    /** ASM class name for byte. */
-    public final static String ACN_byte = ClassNameConstants.BYTE;
-
-    /** ASM class name for char. */
-    public final static String ACN_char = ClassNameConstants.CHAR;
-
-    /** ASM class name for double. */
-    public final static String ACN_double = ClassNameConstants.DOUBLE;
-
-    /** ASM class name for float. */
-    public final static String ACN_float = ClassNameConstants.FLOAT;
-
-    /** ASM class name for int. */
-    public final static String ACN_int = ClassNameConstants.INT;
-
-    /** ASM class name for long. */
-    public final static String ACN_long = ClassNameConstants.LONG;
-
-    /** ASM class name for short. */
-    public final static String ACN_short = ClassNameConstants.SHORT;
-
-    /** ASM class name for Boolean. */
-    public final static String ACN_Boolean = ClassNameConstants.JAVA_LANG_BOOLEAN.replace('.', '/');
-
-    /** ASM class name for Byte. */
-    public final static String ACN_Byte = ClassNameConstants.JAVA_LANG_BYTE.replace('.', '/');
-
-    /** ASM class name for Character. */
-    public final static String ACN_Character = ClassNameConstants.JAVA_LANG_CHARACTER.replace('.', '/');
-
-    /** ASM class name for Double. */
-    public final static String ACN_Double = ClassNameConstants.JAVA_LANG_DOUBLE.replace('.', '/');
-
-    /** ASM class name for Float. */
-    public final static String ACN_Float = ClassNameConstants.JAVA_LANG_FLOAT.replace('.', '/');
-
-    /** ASM class name for Integer. */
-    public final static String ACN_Integer = ClassNameConstants.JAVA_LANG_INTEGER.replace('.', '/');
-
-    /** ASM class name for Long. */
-    public final static String ACN_Long = ClassNameConstants.JAVA_LANG_LONG.replace('.', '/');
-
-    /** ASM class name for Short. */
-    public final static String ACN_Short = ClassNameConstants.JAVA_LANG_SHORT.replace('.', '/');
-
-    /** ASM class name for java.lang.String. */
-    public final static String ACN_String = ClassNameConstants.JAVA_LANG_STRING.replace('.', '/');
-
-    /** ASM class name for java.lang.Object. */
-    public final static String ACN_Object = Object.class.getName().replace('.', '/');
-
-    /** Class descriptor for String. */
-    public final static String CD_String = Type.getDescriptor(String.class);
-
-    /** Descriptor for java.lang.Object. */
-    public final static String CD_Object = Type.getDescriptor(Object.class);
-
-    /**
-     * private constructor to prevent instantiation.
-     */
-    private JDOUtils()
-    {
-    }
-
-    /**
-     * Convenience method to add a BIPUSH-type int to the visitor.
-     * @param visitor The MethodVisitor
-     * @param i number
-     */
-    public static void addBIPUSHToMethod(MethodVisitor visitor, final int i)
-    {
-        if (i < 6)
-        {
-            switch (i)
-            {
-                case 0 :
-                    visitor.visitInsn(Opcodes.ICONST_0);
-                    break;
-                case 1 :
-                    visitor.visitInsn(Opcodes.ICONST_1);
-                    break;
-                case 2 :
-                    visitor.visitInsn(Opcodes.ICONST_2);
-                    break;
-                case 3 :
-                    visitor.visitInsn(Opcodes.ICONST_3);
-                    break;
-                case 4 :
-                    visitor.visitInsn(Opcodes.ICONST_4);
-                    break;
-                case 5 :
-                    visitor.visitInsn(Opcodes.ICONST_5);
-                    break;
-            }
-        }
-        else if (i < Byte.MAX_VALUE)
-        {
-            visitor.visitIntInsn(Opcodes.BIPUSH, i);
-        }
-        else if (i < Short.MAX_VALUE)
-        {
-            visitor.visitIntInsn(Opcodes.SIPUSH, i);
-        }
-    }
-
-    /**
-     * Convenience method to add a return statement based on the type to be returned.
-     * @param visitor The MethodVisitor
-     * @param type The type to return
-     */
-    public static void addReturnForType(MethodVisitor visitor, Class type)
-    {
-        if (type == int.class || type == boolean.class || type == byte.class || type == char.class || type == short.class)
-        {
-            visitor.visitInsn(Opcodes.IRETURN);
-        }
-        else if (type == double.class)
-        {
-            visitor.visitInsn(Opcodes.DRETURN);
-        }
-        else if (type == float.class)
-        {
-            visitor.visitInsn(Opcodes.FRETURN);
-        }
-        else if (type == long.class)
-        {
-            visitor.visitInsn(Opcodes.LRETURN);
-        }
-        else
-        {
-            visitor.visitInsn(Opcodes.ARETURN);
-        }
-    }
-
-    /**
-     * Convenience method to add a load statement based on the type to be loaded.
-     * @param visitor The MethodVisitor
-     * @param type The type to load
-     * @param number Number to load
-     */
-    public static void addLoadForType(MethodVisitor visitor, Class type, int number)
-    {
-        if (type == int.class || type == boolean.class || type == byte.class || type == char.class || type == short.class)
-        {
-            visitor.visitVarInsn(Opcodes.ILOAD, number);
-        }
-        else if (type == double.class)
-        {
-            visitor.visitVarInsn(Opcodes.DLOAD, number);
-        }
-        else if (type == float.class)
-        {
-            visitor.visitVarInsn(Opcodes.FLOAD, number);
-        }
-        else if (type == long.class)
-        {
-            visitor.visitVarInsn(Opcodes.LLOAD, number);
-        }
-        else
-        {
-            visitor.visitVarInsn(Opcodes.ALOAD, number);
-        }
-    }
-
-    /**
-     * Convenience method to give the JDO method name given the type.
-     * This is for the assorted methods on the JDO StateManager called things like "replacingStringField",
-     * "replacingObjectField", "providedIntField", etc. Just returns the "type" part of the name.
-     * <ul>
-     * <li>Boolean, bool : returns "Boolean"</li>
-     * <li>Byte, byte : returns "Byte"</li>
-     * <li>Character, char : returns "Char"</li>
-     * <li>Double, double : returns "Double"</li>
-     * <li>Float, float : returns "Float"</li>
-     * <li>Integer, int : returns "Int"</li>
-     * <li>Long, long : returns "Long"</li>
-     * <li>Short, short : returns "Short"</li>
-     * <li>String : returns "String"</li>
-     * <li>all others : returns "Object"</li>
-     * </ul>
-     * @param cls The type of the field
-     * @return Name for the method
-     */
-    public static String getTypeNameForJDOMethod(Class cls)
-    {
-        if (cls == null)
-        {
-            return null;
-        }
-        else if (cls == ClassConstants.BOOLEAN)
-        {
-            return "Boolean";
-        }
-        else if (cls == ClassConstants.BYTE)
-        {
-            return "Byte";
-        }
-        else if (cls == ClassConstants.CHAR)
-        {
-            return "Char";
-        }
-        else if (cls == ClassConstants.DOUBLE)
-        {
-            return "Double";
-        }
-        else if (cls == ClassConstants.FLOAT)
-        {
-            return "Float";
-        }
-        else if (cls == ClassConstants.INT)
-        {
-            return "Int";
-        }
-        else if (cls == ClassConstants.LONG)
-        {
-            return "Long";
-        }
-        else if (cls == ClassConstants.SHORT)
-        {
-            return "Short";
-        }
-        else if (cls == ClassConstants.JAVA_LANG_STRING)
-        {
-            return "String";
-        }
-        // Byte, Boolean, Character, Double, Float, Integer, Long, Short go through Object too
-        return "Object";
-    }
-
-    /**
-     * Return the ASM type descriptor for the input class.
-     * @param clsName The input class name
-     * @return The ASM type descriptor name
-     */
-    public static String getTypeDescriptorForType(String clsName)
-    {
-        if (clsName == null)
-        {
-            return null;
-        }
-        else if (clsName.equals(ClassNameConstants.BOOLEAN))
-        {
-            return Type.BOOLEAN_TYPE.getDescriptor();
-        }
-        else if (clsName.equals(ClassNameConstants.BYTE))
-        {
-            return Type.BYTE_TYPE.getDescriptor();
-        }
-        else if (clsName.equals(ClassNameConstants.CHAR))
-        {
-            return Type.CHAR_TYPE.getDescriptor();
-        }
-        else if (clsName.equals(ClassNameConstants.DOUBLE))
-        {
-            return Type.DOUBLE_TYPE.getDescriptor();
-        }
-        else if (clsName.equals(ClassNameConstants.FLOAT))
-        {
-            return Type.FLOAT_TYPE.getDescriptor();
-        }
-        else if (clsName.equals(ClassNameConstants.INT))
-        {
-            return Type.INT_TYPE.getDescriptor();
-        }
-        else if (clsName.equals(ClassNameConstants.LONG))
-        {
-            return Type.LONG_TYPE.getDescriptor();
-        }
-        else if (clsName.equals(ClassNameConstants.SHORT))
-        {
-            return Type.SHORT_TYPE.getDescriptor();
-        }
-        else if (clsName.equals(ClassNameConstants.JAVA_LANG_STRING))
-        {
-            return CD_String;
-        }
-        else
-        {
-            return "L" + clsName.replace('.', '/') + ";";
-        }
-    }
-    /**
-     * Convenience method to give the descriptor for use in a JDO "field" method.
-     * This is for the assorted methods on the JDO StateManager called things like "replacingStringField",
-     * "replacingObjectField", "providedIntField", etc. Returns the ASM descriptor equivalent for the method used
-     * <ul>
-     * <li>Boolean, bool : returns "Boolean"</li>
-     * <li>Byte, byte : returns "Byte"</li>
-     * <li>Character, char : returns "Char"</li>
-     * <li>Double, double : returns "Double"</li>
-     * <li>Float, float : returns "Float"</li>
-     * <li>Integer, int : returns "Int"</li>
-     * <li>Long, long : returns "Long"</li>
-     * <li>Short, short : returns "Short"</li>
-     * <li>String : returns "String"</li>
-     * <li>all others : returns "Object"</li>
-     * </ul>
-     * TODO Cache these descriptors/classes etc
-     * @param cls The type of the field
-     * @return Name for the method
-     */
-    public static String getTypeDescriptorForJDOMethod(Class cls)
-    {
-        if (cls == null)
-        {
-            return null;
-        }
-        else if (cls == ClassConstants.BOOLEAN)
-        {
-            return Type.BOOLEAN_TYPE.getDescriptor();
-        }
-        else if (cls == ClassConstants.BYTE)
-        {
-            return Type.BYTE_TYPE.getDescriptor();
-        }
-        else if (cls == ClassConstants.CHAR)
-        {
-            return Type.CHAR_TYPE.getDescriptor();
-        }
-        else if (cls == ClassConstants.DOUBLE)
-        {
-            return Type.DOUBLE_TYPE.getDescriptor();
-        }
-        else if (cls == ClassConstants.FLOAT)
-        {
-            return Type.FLOAT_TYPE.getDescriptor();
-        }
-        else if (cls == ClassConstants.INT)
-        {
-            return Type.INT_TYPE.getDescriptor();
-        }
-        else if (cls == ClassConstants.LONG)
-        {
-            return Type.LONG_TYPE.getDescriptor();
-        }
-        else if (cls == ClassConstants.SHORT)
-        {
-            return Type.SHORT_TYPE.getDescriptor();
-        }
-        else if (cls == ClassConstants.JAVA_LANG_STRING)
-        {
-            return CD_String;
-        }
-        return CD_Object;
-    }
-
-    /**
-     * Convenience method to return the ASM class name to use as input via the SingleFieldIdentity constructor.
-     * Means that if the fieldType is primitive we return the ASM class name of the object wrapper.
-     * @param fieldType Type of the field
-     * @return ASM class name to use as input in the constructor
-     */
-    public static String getASMClassNameForSingleFieldIdentityConstructor(Class fieldType)
-    {
-        if (fieldType == null)
-        {
-            return null;
-        }
-        else if (fieldType == ClassConstants.BYTE || fieldType == ClassConstants.JAVA_LANG_BYTE)
-        {
-            return ACN_Byte;
-        }
-        else if (fieldType == ClassConstants.CHAR || fieldType == ClassConstants.JAVA_LANG_CHARACTER)
-        {
-            return ACN_Character;
-        }
-        else if (fieldType == ClassConstants.INT || fieldType == ClassConstants.JAVA_LANG_INTEGER)
-        {
-            return ACN_Integer;
-        }
-        else if (fieldType == ClassConstants.LONG || fieldType == ClassConstants.JAVA_LANG_LONG)
-        {
-            return ACN_Long;
-        }
-        else if (fieldType == ClassConstants.SHORT || fieldType == ClassConstants.JAVA_LANG_SHORT)
-        {
-            return ACN_Short;
-        }
-        else if (fieldType == ClassConstants.JAVA_LANG_STRING)
-        {
-            return ACN_String;
-        }
-        else
-        {
-            return ACN_Object;
-        }
-    }
-}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/PrimaryKeyGenerator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/PrimaryKeyGenerator.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/PrimaryKeyGenerator.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -31,6 +31,7 @@
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.enhancer.ClassEnhancer;
 import org.datanucleus.enhancer.DataNucleusEnhancer;
+import org.datanucleus.enhancer.EnhanceUtils;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.IdentityType;
@@ -59,7 +60,7 @@
     final String className_DescName;
 
     /** The enhancer being used. */
-    final JDOClassEnhancer classEnhancer;
+    final ClassEnhancer classEnhancer;
 
     String stringSeparator = ":";
 
@@ -68,7 +69,7 @@
      * @param cmd Metadata for the class that needs a primary key class
      * @param enhancer The enhancer being used
      */
-    public PrimaryKeyGenerator(AbstractClassMetaData cmd, JDOClassEnhancer enhancer)
+    public PrimaryKeyGenerator(AbstractClassMetaData cmd, ClassEnhancer enhancer)
     {
         this.cmd = cmd;
         this.classEnhancer = enhancer;
@@ -125,7 +126,7 @@
             }
 
             FieldVisitor fv = cw.visitField(Opcodes.ACC_PUBLIC, mmd.getName(),
-                JDOUtils.getTypeDescriptorForType(fieldTypeName), null, null);
+                EnhanceUtils.getTypeDescriptorForType(fieldTypeName), null, null);
             fv.visitEnd();
         }
     }
@@ -228,7 +229,7 @@
             {
                 // Uses the following pattern (e.g for Integer)
                 // fieldX = Integer.valueOf(tokenX).intValue();
-                String type_desc = JDOUtils.getTypeDescriptorForType(mmd.getTypeName());
+                String type_desc = EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName());
                 String wrapperClassName_ASM = "java/lang/Long";
                 String wrapperConverterMethod = "longValue";
                 if (mmd.getType() == int.class)
@@ -260,7 +261,7 @@
             {
                 mv.visitVarInsn(Opcodes.ALOAD, astorePosition);
                 mv.visitFieldInsn(Opcodes.PUTFIELD, className_ASM, mmd.getName(), 
-                    JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                    EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
             }
             else if (mmd.getType() == Long.class || mmd.getType() == Integer.class || 
                     mmd.getType() == Short.class || mmd.getType() == BigInteger.class)
@@ -308,7 +309,7 @@
                 mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Long", "longValue", "()J");
                 mv.visitMethodInsn(Opcodes.INVOKESPECIAL, typeName_ASM, "<init>", "(J)V");
                 mv.visitFieldInsn(Opcodes.PUTFIELD, className_ASM, mmd.getName(), 
-                    JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                    EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
             }
             else if (Calendar.class.isAssignableFrom(mmd.getType()))
             {
@@ -336,7 +337,7 @@
                 mv.visitMethodInsn(Opcodes.INVOKESPECIAL, fieldTypeName_ASM, "<init>",
                     "(Ljava/lang/String;)V");
                 mv.visitFieldInsn(Opcodes.PUTFIELD, className_ASM, mmd.getName(),
-                    JDOUtils.getTypeDescriptorForType(fieldTypeName));
+                    EnhanceUtils.getTypeDescriptorForType(fieldTypeName));
             }
         }
 
@@ -387,22 +388,22 @@
             AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtRelativePosition(pkPositions[i]);
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitFieldInsn(Opcodes.GETFIELD, className_ASM, mmd.getName(),
-                JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
 
             // Use most representive form of "StringBuilder.append()"
             if (mmd.getType() == int.class || mmd.getType() == long.class ||
                 mmd.getType() == float.class || mmd.getType() == double.class)
             {
                 mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", 
-                    "(" + JDOUtils.getTypeDescriptorForType(mmd.getTypeName()) + ")Ljava/lang/StringBuilder;");
+                    "(" + EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()) + ")Ljava/lang/StringBuilder;");
             }
             else if (mmd.getType() == char.class)
             {
                 mv.visitVarInsn(Opcodes.ALOAD, 0);
                 mv.visitFieldInsn(Opcodes.GETFIELD, className_ASM, mmd.getName(),
-                    JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                    EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
                 mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append",
-                    "(" + JDOUtils.getTypeDescriptorForType(mmd.getTypeName()) + ")Ljava/lang/StringBuilder;");
+                    "(" + EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()) + ")Ljava/lang/StringBuilder;");
             }
             else if (mmd.getType() == String.class)
             {
@@ -510,10 +511,10 @@
                 // "fieldX == other.fieldX"
                 mv.visitVarInsn(Opcodes.ALOAD, 0);
                 mv.visitFieldInsn(Opcodes.GETFIELD, className_ASM, mmd.getName(),
-                    JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                    EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
                 mv.visitVarInsn(Opcodes.ALOAD, 2);
                 mv.visitFieldInsn(Opcodes.GETFIELD, className_ASM, mmd.getName(),
-                    JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                    EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
 
                 mv.visitInsn(Opcodes.LCMP);
                 if (i == 0)
@@ -527,10 +528,10 @@
                 // "fieldX == other.fieldX"
                 mv.visitVarInsn(Opcodes.ALOAD, 0);
                 mv.visitFieldInsn(Opcodes.GETFIELD, className_ASM, mmd.getName(),
-                    JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                    EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
                 mv.visitVarInsn(Opcodes.ALOAD, 2);
                 mv.visitFieldInsn(Opcodes.GETFIELD, className_ASM, mmd.getName(),
-                    JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                    EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
 
                 if (i == 0)
                 {
@@ -597,7 +598,7 @@
             AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtRelativePosition(pkPositions[i]);
             mv.visitVarInsn(Opcodes.ALOAD, 0);
             mv.visitFieldInsn(Opcodes.GETFIELD, className_ASM, mmd.getName(),
-                JDOUtils.getTypeDescriptorForType(mmd.getTypeName()));
+                EnhanceUtils.getTypeDescriptorForType(mmd.getTypeName()));
             if (mmd.getType() == long.class)
             {
                 // "(int)fieldX"

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/DefaultConstructor.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/DefaultConstructor.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/DefaultConstructor.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -20,17 +20,15 @@
 import org.datanucleus.asm.Label;
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.enhancer.ClassEnhancer;
+import org.datanucleus.enhancer.ClassMethod;
 import org.datanucleus.enhancer.DataNucleusEnhancer;
-import org.datanucleus.enhancer.jdo.method.DefaultConstructor;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
 
 /**
  * Method to generate a default Constructor using ASM.
  */
-public class DefaultConstructor extends JDOClassMethod
+public class DefaultConstructor extends ClassMethod
 {
-    public static DefaultConstructor getInstance(JDOClassEnhancer enhancer)
+    public static DefaultConstructor getInstance(ClassEnhancer enhancer)
     {
         return new DefaultConstructor(enhancer, "<init>", Opcodes.ACC_PROTECTED, null, null, null);
     }
@@ -60,7 +58,7 @@
         Label l0 = new Label();
         visitor.visitLabel(l0);
         visitor.visitVarInsn(Opcodes.ALOAD, 0);
-        Class superclass = ((JDOClassEnhancer)enhancer).getClassEnhanced().getSuperclass();
+        Class superclass = enhancer.getClassBeingEnhanced().getSuperclass();
         visitor.visitMethodInsn(Opcodes.INVOKESPECIAL, superclass.getName().replace('.', '/'), "<init>", "()V");
         visitor.visitInsn(Opcodes.RETURN);
         Label l1 = new Label();
@@ -79,7 +77,8 @@
         // Override the log message
         if (DataNucleusEnhancer.LOGGER.isDebugEnabled())
         {
-            DataNucleusEnhancer.LOGGER.debug(LOCALISER.msg("Enhancer.AddConstructor", getClassEnhancer().className + "()"));
+            DataNucleusEnhancer.LOGGER.debug(LOCALISER.msg("Enhancer.AddConstructor", 
+                getClassEnhancer().getClassName() + "()"));
         }
     }
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitClass.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitClass.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitClass.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -20,9 +20,7 @@
 import org.datanucleus.asm.MethodVisitor;
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.jdo.method.InitClass;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
+import org.datanucleus.enhancer.ClassMethod;
 
 /**
  * Method to generate a static initialisation block for the class using ASM.
@@ -40,9 +38,9 @@
  * }
  * </pre>
  */
-public class InitClass extends JDOClassMethod
+public class InitClass extends ClassMethod
 {
-    public static InitClass getInstance(JDOClassEnhancer enhancer)
+    public static InitClass getInstance(ClassEnhancer enhancer)
     {
         return new InitClass(enhancer, "<clinit>",
             Opcodes.ACC_STATIC,
@@ -112,7 +110,7 @@
         mv.visitFieldInsn(Opcodes.PUTSTATIC, getClassEnhancer().getASMClassName(),
             getNamer().getPersistableSuperclassFieldName(), "Ljava/lang/Class;");
 
-        mv.visitLdcInsn(getClassEnhancer().className);
+        mv.visitLdcInsn(getClassEnhancer().getClassName());
         mv.visitMethodInsn(Opcodes.INVOKESTATIC, getClassEnhancer().getASMClassName(),
             getNamer().getLoadClassMethodName(), "(Ljava/lang/String;)Ljava/lang/Class;");
         mv.visitFieldInsn(Opcodes.GETSTATIC, getClassEnhancer().getASMClassName(),

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldFlags.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldFlags.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldFlags.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -19,10 +19,8 @@
 
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.jdo.method.InitFieldFlags;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
-import org.datanucleus.enhancer.jdo.JDOUtils;
+import org.datanucleus.enhancer.ClassMethod;
+import org.datanucleus.enhancer.EnhanceUtils;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 
 /**
@@ -34,9 +32,9 @@
  * }
  * </pre>
  */
-public class InitFieldFlags extends JDOClassMethod
+public class InitFieldFlags extends ClassMethod
 {
-    public static InitFieldFlags getInstance(JDOClassEnhancer enhancer)
+    public static InitFieldFlags getInstance(ClassEnhancer enhancer)
     {
         return new InitFieldFlags(enhancer, enhancer.getNamer().getFieldFlagsInitMethodName(),
             Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL,
@@ -69,15 +67,15 @@
         if (fields != null && fields.length > 0)
         {
             // Create array of bytes
-            JDOUtils.addBIPUSHToMethod(visitor, fields.length);
+            EnhanceUtils.addBIPUSHToMethod(visitor, fields.length);
             visitor.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_BYTE);
 
             // Populate the array elements
             for (int i=0;i<fields.length;i++)
             {
                 visitor.visitInsn(Opcodes.DUP);
-                JDOUtils.addBIPUSHToMethod(visitor, i);
-                JDOUtils.addBIPUSHToMethod(visitor, fields[i].getPersistenceFlags());
+                EnhanceUtils.addBIPUSHToMethod(visitor, i);
+                EnhanceUtils.addBIPUSHToMethod(visitor, fields[i].getPersistenceFlags());
                 visitor.visitInsn(Opcodes.BASTORE);
             }
 

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldNames.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldNames.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldNames.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -19,10 +19,8 @@
 
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.jdo.method.InitFieldNames;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
-import org.datanucleus.enhancer.jdo.JDOUtils;
+import org.datanucleus.enhancer.ClassMethod;
+import org.datanucleus.enhancer.EnhanceUtils;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 
 /**
@@ -34,9 +32,9 @@
  * }
  * </pre>
  */
-public class InitFieldNames extends JDOClassMethod
+public class InitFieldNames extends ClassMethod
 {
-    public static InitFieldNames getInstance(JDOClassEnhancer enhancer)
+    public static InitFieldNames getInstance(ClassEnhancer enhancer)
     {
         return new InitFieldNames(enhancer, enhancer.getNamer().getFieldNamesInitMethodName(),
             Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL,
@@ -69,14 +67,14 @@
         if (fields != null && fields.length > 0)
         {
             // Create array of Strings
-            JDOUtils.addBIPUSHToMethod(visitor, fields.length);
+            EnhanceUtils.addBIPUSHToMethod(visitor, fields.length);
             visitor.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String");
 
             // Populate the array elements
             for (int i=0;i<fields.length;i++)
             {
                 visitor.visitInsn(Opcodes.DUP);
-                JDOUtils.addBIPUSHToMethod(visitor, i);
+                EnhanceUtils.addBIPUSHToMethod(visitor, i);
                 visitor.visitLdcInsn(fields[i].getName());
                 visitor.visitInsn(Opcodes.AASTORE);
             }

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldTypes.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldTypes.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitFieldTypes.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -19,10 +19,8 @@
 
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.jdo.method.InitFieldTypes;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
-import org.datanucleus.enhancer.jdo.JDOUtils;
+import org.datanucleus.enhancer.ClassMethod;
+import org.datanucleus.enhancer.EnhanceUtils;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.util.ClassUtils;
 
@@ -36,9 +34,9 @@
  * }
  * </pre>
  */
-public class InitFieldTypes extends JDOClassMethod
+public class InitFieldTypes extends ClassMethod
 {
-    public static InitFieldTypes getInstance(JDOClassEnhancer enhancer)
+    public static InitFieldTypes getInstance(ClassEnhancer enhancer)
     {
         return new InitFieldTypes(enhancer, enhancer.getNamer().getFieldTypesInitMethodName(),
             Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL,
@@ -71,14 +69,14 @@
         if (fields != null && fields.length > 0)
         {
             // Create array of Classes
-            JDOUtils.addBIPUSHToMethod(visitor, fields.length);
+            EnhanceUtils.addBIPUSHToMethod(visitor, fields.length);
             visitor.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/Class");
 
             // Populate the array elements
             for (int i=0;i<fields.length;i++)
             {
                 visitor.visitInsn(Opcodes.DUP);
-                JDOUtils.addBIPUSHToMethod(visitor, i);
+                EnhanceUtils.addBIPUSHToMethod(visitor, i);
                 if (fields[i].getType().isPrimitive())
                 {
                     String wrapperTypeName = ClassUtils.getWrapperTypeNameForPrimitiveTypeName(fields[i].getTypeName());

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitPersistenceCapableSuperclass.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitPersistenceCapableSuperclass.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/InitPersistenceCapableSuperclass.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -19,9 +19,7 @@
 
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.jdo.method.InitPersistenceCapableSuperclass;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
+import org.datanucleus.enhancer.ClassMethod;
 
 /**
  * Method to generate the method "__jdoPersistenceCapableSuperclassInit" using ASM.
@@ -39,9 +37,9 @@
  * }
  * </pre>
  */
-public class InitPersistenceCapableSuperclass extends JDOClassMethod
+public class InitPersistenceCapableSuperclass extends ClassMethod
 {
-    public static InitPersistenceCapableSuperclass getInstance(JDOClassEnhancer enhancer)
+    public static InitPersistenceCapableSuperclass getInstance(ClassEnhancer enhancer)
     {
         return new InitPersistenceCapableSuperclass(enhancer, enhancer.getNamer().getPersistableSuperclassInitMethodName(),
             Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC,

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyField.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyField.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyField.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -21,11 +21,10 @@
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.asm.Type;
 import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.jdo.method.JdoCopyField;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
+import org.datanucleus.enhancer.ClassMethod;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.PropertyMetaData;
+import org.datanucleus.util.JavaUtils;
 
 /**
  * Method to generate the method "jdoCopyField" using ASM.
@@ -61,12 +60,12 @@
  * </pre>
  * and also with minor variations if the class has no fields
  */
-public class JdoCopyField extends JDOClassMethod
+public class JdoCopyField extends ClassMethod
 {
-    public static JdoCopyField getInstance(JDOClassEnhancer enhancer)
+    public static JdoCopyField getInstance(ClassEnhancer enhancer)
     {
         return new JdoCopyField(enhancer, enhancer.getNamer().getCopyFieldMethodName(), Opcodes.ACC_PROTECTED | Opcodes.ACC_FINAL,
-            null, new Class[] {enhancer.getClassEnhanced(), int.class}, new String[] { "obj", "index" });
+            null, new Class[] {enhancer.getClassBeingEnhanced(), int.class}, new String[] { "obj", "index" });
     }
 
     /**
@@ -123,7 +122,7 @@
                 for (int i=0;i<fields.length;i++)
                 {
                     visitor.visitLabel(fieldOptions[i]);
-                    if (JDOClassEnhancer.useFrames())
+                    if (JavaUtils.useStackMapFrames())
                     {
                         visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                     }
@@ -151,7 +150,7 @@
 
                 // default :
                 visitor.visitLabel(defaultLabel);
-                if (JDOClassEnhancer.useFrames())
+                if (JavaUtils.useStackMapFrames())
                 {
                     visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                 }
@@ -165,7 +164,7 @@
 
                 // End of switch
                 visitor.visitLabel(endSwitchLabel);
-                if (JDOClassEnhancer.useFrames())
+                if (JavaUtils.useStackMapFrames())
                 {
                     visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                 }
@@ -202,7 +201,7 @@
                 for (int i=0;i<fields.length;i++)
                 {
                     visitor.visitLabel(fieldOptions[i]);
-                    if (JDOClassEnhancer.useFrames())
+                    if (JavaUtils.useStackMapFrames())
                     {
                         visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                     }
@@ -230,7 +229,7 @@
 
                 // default:
                 visitor.visitLabel(defaultLabel);
-                if (JDOClassEnhancer.useFrames())
+                if (JavaUtils.useStackMapFrames())
                 {
                     visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                 }
@@ -250,7 +249,7 @@
 
                 // End of switch
                 visitor.visitLabel(endSwitchLabel);
-                if (JDOClassEnhancer.useFrames())
+                if (JavaUtils.useStackMapFrames())
                 {
                     visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                 }

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyFields.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyFields.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyFields.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -20,10 +20,9 @@
 import org.datanucleus.asm.Label;
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.jdo.method.JdoCopyFields;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
-import org.datanucleus.enhancer.jdo.JDOUtils;
+import org.datanucleus.enhancer.ClassMethod;
+import org.datanucleus.enhancer.EnhanceUtils;
+import org.datanucleus.util.JavaUtils;
 
 /**
  * Method to generate the method "jdoCopyFields" using ASM.
@@ -49,9 +48,9 @@
  * }
  * </pre>
  */
-public class JdoCopyFields extends JDOClassMethod
+public class JdoCopyFields extends ClassMethod
 {
-    public static JdoCopyFields getInstance(JDOClassEnhancer enhancer)
+    public static JdoCopyFields getInstance(ClassEnhancer enhancer)
     {
         return new JdoCopyFields(enhancer, enhancer.getNamer().getCopyFieldsMethodName(), Opcodes.ACC_PUBLIC,
             null, new Class[] {Object.class, int[].class}, new String[] { "obj", "indices" });
@@ -95,7 +94,7 @@
         visitor.visitInsn(Opcodes.ATHROW);
 
         visitor.visitLabel(l1);
-        if (JDOClassEnhancer.useFrames())
+        if (JavaUtils.useStackMapFrames())
         {
             visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
         }
@@ -111,7 +110,7 @@
         visitor.visitInsn(Opcodes.ATHROW);
 
         visitor.visitLabel(l3);
-        if (JDOClassEnhancer.useFrames())
+        if (JavaUtils.useStackMapFrames())
         {
             visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
         }
@@ -128,7 +127,7 @@
         visitor.visitInsn(Opcodes.ATHROW);
 
         visitor.visitLabel(l5);
-        if (JDOClassEnhancer.useFrames())
+        if (JavaUtils.useStackMapFrames())
         {
             visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
         }
@@ -156,7 +155,7 @@
         visitor.visitInsn(Opcodes.ATHROW);
 
         visitor.visitLabel(l10);
-        if (JDOClassEnhancer.useFrames())
+        if (JavaUtils.useStackMapFrames())
         {
             visitor.visitFrame(Opcodes.F_APPEND,1, new Object[] {getClassEnhancer().getASMClassName()}, 0, null);
         }
@@ -173,7 +172,7 @@
         visitor.visitJumpInsn(Opcodes.IFLT, l13);
         Label l14 = new Label();
         visitor.visitLabel(l14);
-        if (JDOClassEnhancer.useFrames())
+        if (JavaUtils.useStackMapFrames())
         {
             visitor.visitFrame(Opcodes.F_APPEND,1, new Object[] {Opcodes.INTEGER}, 0, null);
         }
@@ -189,7 +188,7 @@
         visitor.visitVarInsn(Opcodes.ILOAD, 4);
         visitor.visitJumpInsn(Opcodes.IFGE, l14);
         visitor.visitLabel(l13);
-        if (JDOClassEnhancer.useFrames())
+        if (JavaUtils.useStackMapFrames())
         {
             visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
         }
@@ -199,7 +198,7 @@
         Label l16 = new Label();
         visitor.visitLabel(l16);
         visitor.visitLocalVariable("this", getClassEnhancer().getClassDescriptor(), null, l0, l16, 0);
-        visitor.visitLocalVariable(argNames[0], JDOUtils.CD_Object, null, l0, l16, 1);
+        visitor.visitLocalVariable(argNames[0], EnhanceUtils.CD_Object, null, l0, l16, 1);
         visitor.visitLocalVariable(argNames[1], "[I", null, l0, l16, 2);
         visitor.visitLocalVariable("other", getClassEnhancer().getClassDescriptor(), null, l9, l16, 3);
         visitor.visitLocalVariable("i", "I", null, l12, l16, 4);

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyKeyFieldsFromObjectId.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyKeyFieldsFromObjectId.java	2013-02-18 08:52:53 UTC (rev 16614)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/jdo/method/JdoCopyKeyFieldsFromObjectId.java	2013-02-18 09:51:20 UTC (rev 16615)
@@ -23,16 +23,15 @@
 import org.datanucleus.asm.Opcodes;
 import org.datanucleus.asm.Type;
 import org.datanucleus.enhancer.ClassEnhancer;
-import org.datanucleus.enhancer.jdo.method.JdoCopyKeyFieldsFromObjectId;
-import org.datanucleus.enhancer.jdo.JDOClassEnhancer;
-import org.datanucleus.enhancer.jdo.JDOClassMethod;
-import org.datanucleus.enhancer.jdo.JDOUtils;
+import org.datanucleus.enhancer.ClassMethod;
+import org.datanucleus.enhancer.EnhanceUtils;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ClassMetaData;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.PropertyMetaData;
 import org.datanucleus.util.ClassUtils;
+import org.datanucleus.util.JavaUtils;
 
 /**
  * Method to generate the method "jdoCopyKeyFieldsFromObjectId" using ASM.
@@ -91,9 +90,9 @@
  * (the try-catch is for cases where we set the fields with reflection and it can throw an exception).
  * There are some differences for fields .v. properties and also if fields in the PK are private.
  */
-public class JdoCopyKeyFieldsFromObjectId extends JDOClassMethod
+public class JdoCopyKeyFieldsFromObjectId extends ClassMethod
 {
-    public static JdoCopyKeyFieldsFromObjectId getInstance(JDOClassEnhancer enhancer)
+    public static JdoCopyKeyFieldsFromObjectId getInstance(ClassEnhancer enhancer)
     {
         return new JdoCopyKeyFieldsFromObjectId(enhancer, enhancer.getNamer().getCopyKeyFieldsFromObjectIdMethodName(),
             Opcodes.ACC_PUBLIC,
@@ -136,7 +135,7 @@
                 visitor.visitLabel(endLabel);
                 visitor.visitLocalVariable("this", getClassEnhancer().getClassDescriptor(), null, startLabel, endLabel, 0);
                 visitor.visitLocalVariable(argNames[0], getNamer().getObjectIdFieldConsumerDescriptor(), null, startLabel, endLabel, 1);
-                visitor.visitLocalVariable(argNames[1], JDOUtils.CD_Object, null, startLabel, endLabel, 2);
+                visitor.visitLocalVariable(argNames[1], EnhanceUtils.CD_Object, null, startLabel, endLabel, 2);
                 visitor.visitMaxs(0, 3);
             }
             else
@@ -162,7 +161,7 @@
 
                     // if (!(oid instanceof LongIdentity)) throw new ClassCastException("...");
                     visitor.visitLabel(l1);
-                    if (JDOClassEnhancer.useFrames())
+                    if (JavaUtils.useStackMapFrames())
                     {
                         visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                     }
@@ -179,7 +178,7 @@
 
                     // XXXIdentity o = (XXXIdentity) oid;
                     visitor.visitLabel(l5);
-                    if (JDOClassEnhancer.useFrames())
+                    if (JavaUtils.useStackMapFrames())
                     {
                         visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                     }
@@ -193,7 +192,7 @@
                     visitor.visitLabel(l9);
 
                     visitor.visitVarInsn(Opcodes.ALOAD, 1);
-                    JDOUtils.addBIPUSHToMethod(visitor, pkFieldNums[0]);
+                    EnhanceUtils.addBIPUSHToMethod(visitor, pkFieldNums[0]);
 
                     AbstractMemberMetaData fmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkFieldNums[0]);
                     Class primitiveType = ClassUtils.getPrimitiveTypeForType(fmd.getType());
@@ -211,7 +210,7 @@
 
                         visitor.visitMethodInsn(Opcodes.INVOKEINTERFACE,
                             getNamer().getObjectIdFieldConsumerAsmClassName(),
-                            "storeObjectField", "(I" + JDOUtils.CD_Object + ")V");
+                            "storeObjectField", "(I" + EnhanceUtils.CD_Object + ")V");
                     }
                     else
                     {
@@ -231,7 +230,7 @@
                     visitor.visitLabel(endLabel);
                     visitor.visitLocalVariable("this", getClassEnhancer().getClassDescriptor(), null, startLabel, endLabel, 0);
                     visitor.visitLocalVariable(argNames[0], getNamer().getObjectIdFieldConsumerDescriptor(), null, startLabel, endLabel, 1);
-                    visitor.visitLocalVariable(argNames[1], JDOUtils.CD_Object, null, startLabel, endLabel, 2);
+                    visitor.visitLocalVariable(argNames[1], EnhanceUtils.CD_Object, null, startLabel, endLabel, 2);
                     visitor.visitLocalVariable("o", getNamer().getSingleFieldIdentityDescriptor(objectIdClass), null, l9, endLabel, 3);
                     visitor.visitMaxs(3, 4);
                 }
@@ -258,7 +257,7 @@
                     visitor.visitInsn(Opcodes.ATHROW);
 
                     visitor.visitLabel(l4);
-                    if (JDOClassEnhancer.useFrames())
+                    if (JavaUtils.useStackMapFrames())
                     {
                         visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                     }
@@ -275,7 +274,7 @@
                     visitor.visitInsn(Opcodes.ATHROW);
 
                     visitor.visitLabel(l5);
-                    if (JDOClassEnhancer.useFrames())
+                    if (JavaUtils.useStackMapFrames())
                     {
                         visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                     }
@@ -292,7 +291,7 @@
                     {
                         AbstractMemberMetaData fmd = enhancer.getClassMetaData().getMetaDataForManagedMemberAtAbsolutePosition(pkFieldNums[i]);
                         String fieldTypeDesc = Type.getDescriptor(fmd.getType());
-                        String typeMethodName = JDOUtils.getTypeNameForJDOMethod(fmd.getType());
+                        String typeMethodName = EnhanceUtils.getTypeNameForJDOMethod(fmd.getType());
                         int pkFieldModifiers = ClassUtils.getModifiersForFieldOfClass(enhancer.getClassLoaderResolver(), 
                             objectIdClass, fmd.getName());
 
@@ -303,7 +302,7 @@
                         {
                             // CompoundIdentity, this field of the PK is a PC
                             visitor.visitVarInsn(Opcodes.ALOAD, 1);
-                            JDOUtils.addBIPUSHToMethod(visitor, fmd.getFieldId());
+                            EnhanceUtils.addBIPUSHToMethod(visitor, fmd.getFieldId());
                             visitor.visitVarInsn(Opcodes.ALOAD, 0);
                             visitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, getClassEnhancer().getASMClassName(),
                                 getNamer().getGetPersistenceManagerMethodName(), "()L" + getNamer().getPersistenceManagerAsmClassName() + ";");
@@ -327,7 +326,7 @@
                             {
                                 // Field in PK is property, hence use getXXX in PK
                                 visitor.visitVarInsn(Opcodes.ALOAD, 1);
-                                JDOUtils.addBIPUSHToMethod(visitor, fmd.getFieldId());
+                                EnhanceUtils.addBIPUSHToMethod(visitor, fmd.getFieldId());
                                 visitor.visitVarInsn(Opcodes.ALOAD, 3);
                                 visitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, ACN_objectIdClass,
                                     ClassUtils.getJavaBeanGetterName(fmd.getName(), fmd.getTypeName().equals("boolean")),
@@ -335,20 +334,20 @@
                                 visitor.visitMethodInsn(Opcodes.INVOKEINTERFACE,
                                     getNamer().getObjectIdFieldConsumerAsmClassName(),
                                     "store" + typeMethodName + "Field",
-                                    "(I" + JDOUtils.getTypeDescriptorForJDOMethod(fmd.getType()) + ")V");
+                                    "(I" + EnhanceUtils.getTypeDescriptorForJDOMethod(fmd.getType()) + ")V");
                             }
                             else if (Modifier.isPublic(pkFieldModifiers))
                             {
                                 // Field in PK is public so access directly
                                 visitor.visitVarInsn(Opcodes.ALOAD, 1);
-                                JDOUtils.addBIPUSHToMethod(visitor, fmd.getFieldId());
+                                EnhanceUtils.addBIPUSHToMethod(visitor, fmd.getFieldId());
                                 visitor.visitVarInsn(Opcodes.ALOAD, 3);
                                 visitor.visitFieldInsn(Opcodes.GETFIELD, ACN_objectIdClass,
                                     fmd.getName(), fieldTypeDesc);
                                 visitor.visitMethodInsn(Opcodes.INVOKEINTERFACE,
                                     getNamer().getObjectIdFieldConsumerAsmClassName(),
                                     "store" + typeMethodName + "Field",
-                                    "(I" + JDOUtils.getTypeDescriptorForJDOMethod(fmd.getType()) + ")V");
+                                    "(I" + EnhanceUtils.getTypeDescriptorForJDOMethod(fmd.getType()) + ")V");
                             }
                             else
                             {
@@ -374,7 +373,7 @@
                                 visitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/reflect/Field", 
                                     "setAccessible", "(Z)V");
                                 visitor.visitVarInsn(Opcodes.ALOAD, 1);
-                                JDOUtils.addBIPUSHToMethod(visitor, fmd.getFieldId());
+                                EnhanceUtils.addBIPUSHToMethod(visitor, fmd.getFieldId());
                                 visitor.visitVarInsn(Opcodes.ALOAD, 4);
                                 visitor.visitVarInsn(Opcodes.ALOAD, 3);
                                 if (fmd.getTypeName().equals("boolean"))
@@ -431,7 +430,7 @@

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16629
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16629&view=rev
Author:   andy_jefferson
Date:     2013-02-19 08:32:25 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Use ApiAdapter rather than throwing JDOUserException and tying code to one API

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/evaluator/InMemoryQueryResult.java
    platform/core/trunk/src/java/org/datanucleus/query/evaluator/JDOQLEvaluator.java
    platform/core/trunk/src/java/org/datanucleus/query/evaluator/JPQLEvaluator.java
    platform/core/trunk/src/java/org/datanucleus/store/query/AbstractQueryResult.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/InMemoryQueryResult.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/InMemoryQueryResult.java	2013-02-19 08:19:17 UTC (rev 16628)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/InMemoryQueryResult.java	2013-02-19 08:32:25 UTC (rev 16629)
@@ -25,7 +25,7 @@
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.api.ApiAdapter;
 import org.datanucleus.store.query.QueryResult;
 import org.datanucleus.util.Localiser;
 
@@ -38,14 +38,14 @@
     protected static final Localiser LOCALISER = Localiser.getInstance(
         "org.datanucleus.Localisation", org.datanucleus.ClassConstants.NUCLEUS_CONTEXT_LOADER);
 
-    String api = "JDO";
+    ApiAdapter api;
 
     List results = null;
 
     /** Whether the results are close. */
     protected boolean closed = false;
 
-    public InMemoryQueryResult(List results, String api)
+    public InMemoryQueryResult(List results, ApiAdapter api)
     {
         this.results = results;
         this.api = api;
@@ -281,14 +281,7 @@
         if (closed)
         {
             String msg = LOCALISER.msg("052600");
-            if (api.equalsIgnoreCase("JDO"))
-            {
-                throw new javax.jdo.JDOUserException(msg);
-            }
-            else
-            {
-                throw new NucleusUserException(msg);
-            }
+            throw api.getUserExceptionForException(msg, null);
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/JDOQLEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/JDOQLEvaluator.java	2013-02-19 08:19:17 UTC (rev 16628)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/JDOQLEvaluator.java	2013-02-19 08:32:25 UTC (rev 16629)
@@ -71,7 +71,7 @@
         Collection results = super.execute(applyFilter, applyOrdering, applyResult, applyResultClass, applyRange);
         if (results instanceof List)
         {
-            return new InMemoryQueryResult((List)results, "JDO");
+            return new InMemoryQueryResult((List)results, query.getExecutionContext().getApiAdapter());
         }
         return results;
     }

Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/JPQLEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/JPQLEvaluator.java	2013-02-19 08:19:17 UTC (rev 16628)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/JPQLEvaluator.java	2013-02-19 08:32:25 UTC (rev 16629)
@@ -112,8 +112,7 @@
         Collection results = super.execute(applyFilter, applyOrdering, applyResult, applyResultClass, applyRange);
         if (results instanceof List)
         {
-            // Note we could run JPQL with JDO, but just assume JPA here
-            return new InMemoryQueryResult((List)results, "JPA");
+            return new InMemoryQueryResult((List)results, query.getExecutionContext().getApiAdapter());
         }
         return results;
     }

Modified: platform/core/trunk/src/java/org/datanucleus/store/query/AbstractQueryResult.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/query/AbstractQueryResult.java	2013-02-19 08:19:17 UTC (rev 16628)
+++ platform/core/trunk/src/java/org/datanucleus/store/query/AbstractQueryResult.java	2013-02-19 08:32:25 UTC (rev 16629)
@@ -27,6 +27,7 @@
 import java.util.Map;
 
 import org.datanucleus.ExecutionContext;
+import org.datanucleus.api.ApiAdapter;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.store.connection.ManagedConnectionResourceListener;
 import org.datanucleus.util.Localiser;
@@ -60,7 +61,7 @@
     /** List of listeners to notify when the query results are closed. */
     protected List<ManagedConnectionResourceListener> connectionListeners = null;
 
-    String api = "JDO";
+    ApiAdapter api;
 
     /** size of the query results. Is -1 until known. */
     protected int size = -1;
@@ -80,7 +81,7 @@
         this.query = query;
         if (query != null) // In tests we pass in null
         {
-            this.api = query.getExecutionContext().getApiAdapter().getName();
+            this.api = query.getExecutionContext().getApiAdapter();
 
             // Process any supported extensions
             resultSizeMethod = query.getStringExtensionProperty(Query.EXTENSION_RESULT_SIZE_METHOD, "last");
@@ -186,15 +187,7 @@
     {
         if (!isOpen())
         {
-            String msg = LOCALISER.msg("052600");
-            if (api.equalsIgnoreCase("JDO"))
-            {
-                throw new javax.jdo.JDOUserException(msg);
-            }
-            else
-            {
-                throw new NucleusUserException(msg);
-            }
+            throw api.getUserExceptionForException(LOCALISER.msg("052600"), null);
         }
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16680
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16680&view=rev
Author:   andy_jefferson
Date:     2013-03-02 11:40:13 +0000 (Sat, 02 Mar 2013)
Log Message:
-----------
property was renamed

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/Localisation.properties
    platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-03-01 16:09:17 UTC (rev 16679)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-03-02 11:40:13 UTC (rev 16680)
@@ -562,7 +562,7 @@
 026025=Object of type "{0}" and identity "{1}" was not detached correctly. Please consult the log for any possible information.
 026026=Object "{0}" is being deleted since the field ({1}) where it was the value has just been nulled and the field is delete-dependent.
 026027=An illegal "{0}" transition was attempted from the "{1}" state, sm = "{2}"
-026028=Object "{0}" has been marked for persistence but its actual persistence to the datastore will be delayed due to use of optimistic transactions or "delayDatastoreOperationsUntilCommit"
+026028=Object "{0}" has been marked for persistence but its actual persistence to the datastore will be delayed due to use of optimistic transactions or "datanucleus.flush.mode" setting
 026029=Object "{0}" (id="{1}") is having the value in field "{2}" replaced by a SCO wrapper
 026030=Object "{0}" (id="{1}") is having the SCO wrapper in field "{2}" replaced by the unwrapped value
 026031=Object "{0}" (id="{1}") is to be detached (using DetachAllOnCommit?) but is not detachable, so being made transient

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-03-01 16:09:17 UTC (rev 16679)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-03-02 11:40:13 UTC (rev 16680)
@@ -569,7 +569,7 @@
 026025=El "detach" del objeto de tipo "{0}" y con identidad "{1}" ha fallado. Por favor, compruebe el Log para alguna detalle.
 026026=Vamos a borrar el objeto "{0}" porque esta el valor en un campo ({1}) donde el valor has sido anulado y el campo es delete-dependent.
 026027=Una transition ilegal "{0}" ha sido intentado desde el estado "{1}", sm = "{2}"
-026028=El objeto "{0}" ha sido marcado para persistir pero vamos a persistir a la base de datos mas tarde debido a transacci\xF3n optimistic o "delayDatastoreOperationsUntilCommit"
+026028=El objeto "{0}" ha sido marcado para persistir pero vamos a persistir a la base de datos mas tarde debido a transacci\xF3n optimistic o "datanucleus.flush.mode" propiedad
 026029=El objeto "{0}" (id="{1}") va a tener el valor en el campo "{2}" cambiado por un SCO wrapper
 026030=El objeto "{0}" (id="{1}") va a tener el SCO wrapper en el campo "{2}" cambiado por el valor
 026031=El objeto "{0}" (id="{1}") va a ser detachado (con la opcion DetachAllOnCommit?) pero no es detachable, por eso vamos a hacerlo transient

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16681
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16681&view=rev
Author:   andy_jefferson
Date:     2013-03-04 08:13:05 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
cleaner log message about fields updated in L2 cache

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/Localisation.properties
    platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-02 11:40:13 UTC (rev 16680)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-04 08:13:05 UTC (rev 16681)
@@ -4824,8 +4824,8 @@
                         fieldsToUpdate[j++] = i;
                     }
                 }
-                NucleusLogger.CACHE.debug(LOCALISER.msg("004015", op.getInternalObjectId(), 
-                    StringUtils.intArrayToString(fieldsToUpdate)));
+                NucleusLogger.CACHE.debug(LOCALISER.msg("004015", StringUtils.toJVMIDString(op.getObject()), 
+                    op.getInternalObjectId(), StringUtils.intArrayToString(fieldsToUpdate)));
             }
         }
 
@@ -4856,11 +4856,9 @@
 
                 if (NucleusLogger.CACHE.isDebugEnabled())
                 {
-                    String fieldNames = StringUtils.objectArrayToString(cachedPC.getFieldNumbers());
-                    if (fieldNames == null || fieldNames.equals("null"))
-                    {
-                        fieldNames = "";
-                    }
+                    int[] loadedFieldNums = cachedPC.getLoadedFieldNumbers();
+                    String fieldNames = (loadedFieldNums == null || loadedFieldNums.length == 0) ?
+                            "" : StringUtils.intArrayToString(loadedFieldNums);
                     if (l2Cache.containsOid(id))
                     {
                         NucleusLogger.CACHE.debug(LOCALISER.msg("004013", 
@@ -4915,11 +4913,9 @@
             // Update/add in the L2 cache
             if (NucleusLogger.CACHE.isDebugEnabled())
             {
-                String fieldNames = StringUtils.objectArrayToString(cachedPC.getFieldNumbers());
-                if (fieldNames == null || fieldNames.equals("null"))
-                {
-                    fieldNames = "";
-                }
+                int[] loadedFieldNums = cachedPC.getLoadedFieldNumbers();
+                String fieldNames = (loadedFieldNums == null || loadedFieldNums.length == 0) ?
+                        "" : StringUtils.intArrayToString(loadedFieldNums);
                 if (l2Cache.containsOid(id))
                 {
                     NucleusLogger.CACHE.debug(LOCALISER.msg("004013", 
@@ -5127,7 +5123,7 @@
                 {
                     NucleusLogger.CACHE.debug(LOCALISER.msg("004006",
                         IdentityUtils.getIdentityAsString(getApiAdapter(), id),
-                        StringUtils.objectArrayToString(cachedPC.getFieldNumbers()), cachedPC.getVersion(),
+                        StringUtils.intArrayToString(cachedPC.getLoadedFieldNumbers()), cachedPC.getVersion(),
                         StringUtils.toJVMIDString(pc)));
                 }
 
@@ -5183,7 +5179,7 @@
                     {
                         NucleusLogger.CACHE.debug(LOCALISER.msg("004006",
                             IdentityUtils.getIdentityAsString(getApiAdapter(), id),
-                            StringUtils.objectArrayToString(cachedPC.getFieldNumbers()), cachedPC.getVersion(),
+                            StringUtils.intArrayToString(cachedPC.getLoadedFieldNumbers()), cachedPC.getVersion(),
                             StringUtils.toJVMIDString(pc)));
                     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-03-02 11:40:13 UTC (rev 16680)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-03-04 08:13:05 UTC (rev 16681)
@@ -67,7 +67,7 @@
 004012=Unable to add object with id "{0}" to L2 Cache since it is still attached to a PersistenceManager.
 004013=Object "{0}" (id="{1}") updated in Level 2 cache (fields="{2}", version="{3}")
 004014=Object with id="{0}" removed from Level 2 cache since was updated yet object has been GCed
-004015=Object with id="{0}" updated in Level 2 cache for fields "{1}"
+004015=Object "{0}" (id="{1}") will have its representation updated in Level 2 cache for fields "{2}"
 004016=Object with id="{0}" removed from Level 2 cache
 
 #

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-03-02 11:40:13 UTC (rev 16680)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-03-04 08:13:05 UTC (rev 16681)
@@ -66,7 +66,7 @@
 004012=No se puede a\xF1adir el objeto "{0}" a la Cache de nivel 2 porque esta conectado a un PersistenceManager.
 004013=Objeto "{0}" (id="{1}") cambiado en la Cache de nivel 2 (campos="{2}", version="{3}")
 004014=Objeto con identidad="{0}") borrado de la Cache de nivel 2 porque ha cambiado pero ha sido GCed
-004015=Objeto con identidad="{0}" cambiado en la Cache de nivel 2 para campos "{1}"
+004015=Objeto "{0}" (id="{0}") va a ser cambiado en la Cache de nivel 2 para campos "{2}"
 004016=Objeto con identidad="{0}" borrado de la Cache de nivel 2
 
 #

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16694
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16694&view=rev
Author:   andy_jefferson
Date:     2013-03-05 07:34:47 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
add accessor for SCOOperationQueue, and for the operations queued in it

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/store/types/queued/SCOOperationQueue.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java	2013-03-04 18:40:23 UTC (rev 16693)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java	2013-03-05 07:34:47 UTC (rev 16694)
@@ -43,6 +43,7 @@
 import org.datanucleus.store.scostore.Store;
 import org.datanucleus.store.types.TypeManager;
 import org.datanucleus.store.types.queued.QueuedOperation;
+import org.datanucleus.store.types.queued.SCOOperationQueue;
 
 /**
  * Context of execution for persistence operations.
@@ -811,6 +812,13 @@
     void flushInternal(boolean flushToDatastore);
 
     /**
+     * Accessor for the SCO operation queue.
+     * The queue can be null if 
+     * @return The operation queue for SCO collections/maps
+     */
+    SCOOperationQueue getSCOOperationQueue();
+
+    /**
      * Method to add a SCO backing store operation to the queue.
      * @param oper The operation to add
      */

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-04 18:40:23 UTC (rev 16693)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-05 07:34:47 UTC (rev 16694)
@@ -4015,6 +4015,14 @@
     }
 
     /* (non-Javadoc)
+     * @see org.datanucleus.ExecutionContext#getSCOOperationQueue()
+     */
+    public SCOOperationQueue getSCOOperationQueue()
+    {
+        return scoOperationQueue;
+    }
+
+    /* (non-Javadoc)
      * @see org.datanucleus.ExecutionContext#addSCOOperationToQueue(org.datanucleus.store.types.queued.QueuedOperation)
      */
     public void addSCOOperationToQueue(QueuedOperation oper)
@@ -4738,6 +4746,11 @@
         {
             txCachedFieldsToUpdateById.clear();
         }
+        if (scoOperationQueue != null)
+        {
+            // TODO Check and log if the queue is not empty
+            scoOperationQueue.clear();
+        }
     }
 
     // -------------------------------------- Cache Management ---------------------------------------

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/queued/SCOOperationQueue.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/queued/SCOOperationQueue.java	2013-03-04 18:40:23 UTC (rev 16693)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/queued/SCOOperationQueue.java	2013-03-05 07:34:47 UTC (rev 16694)
@@ -18,6 +18,7 @@
 package org.datanucleus.store.types.queued;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 
@@ -54,6 +55,21 @@
         queuedOperations.clear();
     }
 
+    /**
+     * Method to provide access to inspect the queued operations. The returned list is unmodifiable.
+     * @return The queued operations
+     */
+    public List<QueuedOperation> getOperations()
+    {
+        return Collections.unmodifiableList(queuedOperations);
+    }
+
+    /**
+     * Method to perform all operations queued for the specified ObjectProvider and backing store.
+     * Those operations are then removed from the queue.
+     * @param store The backing store
+     * @param op ObjectProvider
+     */
     public void performAll(Store store, ObjectProvider op)
     {
         if (NucleusLogger.PERSISTENCE.isDebugEnabled())
@@ -84,12 +100,12 @@
             QueuedOperation oper = flushOperIter.next();
             if (isAddFollowedByRemoveOnSameSCO(store, op, oper, flushOperIter))
             {
-                // Ignore this and the next one
+                // add+remove of the same element - ignore this and the next one
                 flushOperIter.next();
             }
             else if (isRemoveFollowedByAddOnSameSCO(store, op, oper, flushOperIter))
             {
-                // Ignore this and the next one
+                // remove+add of the same element - ignore this and the next one
                 flushOperIter.next();
             }
             else
@@ -126,7 +142,7 @@
                     {
                         addThenRemove = true;
                         NucleusLogger.PERSISTENCE.info(
-                            "Field " + store.getOwnerMemberMetaData().getFullFieldName() + 
+                            "Member " + store.getOwnerMemberMetaData().getFullFieldName() + 
                             " of " + StringUtils.toJVMIDString(op.getObject()) +
                             " had an add then a remove of element " + 
                             StringUtils.toJVMIDString(value) + " - operations ignored");
@@ -168,7 +184,7 @@
                     {
                         removeThenAdd = true;
                         NucleusLogger.PERSISTENCE.info(
-                            "Field " + store.getOwnerMemberMetaData().getFullFieldName() + 
+                            "Member" + store.getOwnerMemberMetaData().getFullFieldName() + 
                             " of " + StringUtils.toJVMIDString(op.getObject()) +
                             " had a remove then add of element " + 
                             StringUtils.toJVMIDString(value) + " - operations ignored");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16734
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16734&view=rev
Author:   andy_jefferson
Date:     2013-03-08 13:43:00 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
Simpler success message for enhancer when verbose not enabled

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/Localisation.properties
    platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
    platform/core/trunk/src/java/org/datanucleus/enhancer/DataNucleusEnhancer.java

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-03-07 16:33:27 UTC (rev 16733)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-03-08 13:43:00 UTC (rev 16734)
@@ -1218,6 +1218,7 @@
 Enhancer.ErrorReadingInputFiles=An error was encountered reading the specified input files. Please consult the log for details. The following may help : {0}
 
 Enhancer.Success=DataNucleus Enhancer completed with success for {0} classes. Timings : input={1} ms, enhance={2} ms, total={3} ms. Consult the log for full details
+Enhancer.Success.Simple=DataNucleus Enhancer completed with success for {0} classes.
 Enhancer.Failure=DataNucleus Enhancer completed with an error. Please review the enhancer log (at DEBUG level) for full details. Some classes may have been enhanced but some caused errors
 Enhancer.NoClassesEnhanced=DataNucleus Enhancer completed and no classes were enhanced. Consult the log for full details
 

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-03-07 16:33:27 UTC (rev 16733)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-03-08 13:43:00 UTC (rev 16734)
@@ -1222,6 +1222,7 @@
 Enhancer.ErrorReadingInputFiles=Encontramos un error con los archivos. Por favor compruebe el LOG. Lo siguiente pueda ayudar : {0}
 
 Enhancer.Success=DataNucleus Enhancer ha terminado con exito para {0} clases. Tiempos : input={1} ms, enhance={2} ms, total={3} ms. Compruebe el LOG para los detalles
+Enhancer.Success.Simple=DataNucleus Enhancer ha terminado con exito para {0} clases.
 Enhancer.Failure=DataNucleus Enhancer ha terminado con un error. Por favor lee el LOG para los detalles. Habia errores con algunas de las clases
 Enhancer.NoClassesEnhanced=DataNucleus Enhancer ha terminado sin enhance ninguna clase. Compruebe el LOG para los detalles.
 

Modified: platform/core/trunk/src/java/org/datanucleus/enhancer/DataNucleusEnhancer.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/enhancer/DataNucleusEnhancer.java	2013-03-07 16:33:27 UTC (rev 16733)
+++ platform/core/trunk/src/java/org/datanucleus/enhancer/DataNucleusEnhancer.java	2013-03-08 13:43:00 UTC (rev 16734)
@@ -547,8 +547,16 @@
 
         // Log info about timings
         long enhanceTime = System.currentTimeMillis();
-        String msg = LOCALISER.msg("Enhancer.Success", classNames.size(), "" + (inputTime-startTime), 
-            "" + (enhanceTime-inputTime), "" + (enhanceTime-startTime));
+        String msg = null;
+        if (verbose)
+        {
+            msg = LOCALISER.msg("Enhancer.Success", classNames.size(), "" + (inputTime-startTime), 
+                "" + (enhanceTime-inputTime), "" + (enhanceTime-startTime));
+        }
+        else
+        {
+            msg = LOCALISER.msg("Enhancer.Success.Simple", classNames.size());
+        }
         addMessage(msg, false);
 
         // Remove the input specification
@@ -608,8 +616,16 @@
 
         // Log info about timings
         long enhanceTime = System.currentTimeMillis();
-        String msg = LOCALISER.msg("Enhancer.Success", classNames.size(), "" + (inputTime-startTime), 
-            "" + (enhanceTime-inputTime), "" + (enhanceTime-startTime));
+        String msg = null;
+        if (verbose)
+        {
+            msg = LOCALISER.msg("Enhancer.Success", classNames.size(), "" + (inputTime-startTime), 
+                "" + (enhanceTime-inputTime), "" + (enhanceTime-startTime));
+        }
+        else
+        {
+            msg = LOCALISER.msg("Enhancer.Success.Simple", classNames.size());
+        }
         addMessage(msg, false);
 
         // Remove the input specification

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16771
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16771&view=rev
Author:   andy_jefferson
Date:     2013-03-13 09:05:51 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
fix message about flushing - objects aren't necessarily "dirty"

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/Localisation.properties
    platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-03-13 08:04:56 UTC (rev 16770)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-03-13 09:05:51 UTC (rev 16771)
@@ -123,7 +123,7 @@
 010000=ExecutionContext "{0}" opened for datastore "{1}" with txn="{2}"
 010001=ExecutionContext "{0}" closed
 010002=ExecutionContext has been closed
-010003=ExecutionContext.internalFlush() process started using ordered flush - {0} dirty objects
+010003=ExecutionContext.internalFlush() process started using ordered flush - {0} enlisted objects
 010004=ExecutionContext.internalFlush() process finished
 010005=Attempt to access HOLLOW nondurable object via getObjectById!
 010006=No nondurable object with this id accessible via the cache - maybe for a different manager?

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-03-13 08:04:56 UTC (rev 16770)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-03-13 09:05:51 UTC (rev 16771)
@@ -122,7 +122,7 @@
 010000=ExecutionContext "{0}" se abri\xF3 para la base de datos "{1}" con transaccion="{2}"
 010001=ExecutionContext "{0}" se cerr\xF3
 010002=ExecutionContext ya esta cerrado
-010003=ExecutionContext.internalFlush() empezado con flush ordenado - {0} objetos sucios
+010003=ExecutionContext.internalFlush() empezado con flush ordenado - {0} objetos registrados
 010004=ExecutionContext.internalFlush() terminado
 010005=Intento de obtener un objeto nondurable en estado HOLLOW por getObjectById!
 010006=No hay ningun objeto nondurable con este identidad en el cache - \xBFquizas de otro Manager?

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16832
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16832&view=rev
Author:   andy_jefferson
Date:     2013-03-29 09:18:33 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
[NUCCORE-1020] Move JDOStateManager referencedPC to ExecutionContext

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java
    platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java	2013-03-29 07:04:13 UTC (rev 16831)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContext.java	2013-03-29 09:18:33 UTC (rev 16832)
@@ -943,4 +943,22 @@
      * @param newID the new id
      */
     void replaceObjectId(Object pc, Object oldID, Object newID);
+
+    /**
+     * Access a referenced object for this ObjectProvider during the attach/detach process.
+     * When attaching and this is the detached object this returns the newly attached object.
+     * When attaching and this is the newly attached object this returns the detached object.
+     * When detaching and this is the newly detached object this returns the attached object.
+     * When detaching and this is the attached object this returns the newly detached object.
+     * @param op Object provider
+     * @return The referenced object (if any)
+     */
+    Object getAttachDetachReferencedObject(ObjectProvider op);
+
+    /**
+     * Register a referenced object against this ObjectProvider for the attach/detach process.
+     * @param op The ObjectProvider
+     * @param obj The referenced object (or null to clear out any reference)
+     */
+    void setAttachDetachReferencedObject(ObjectProvider op, Object obj);
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-29 07:04:13 UTC (rev 16831)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-29 09:18:33 UTC (rev 16832)
@@ -179,6 +179,9 @@
     /** Map of fields of object to update in L2 cache (when attached), keyed by the id. */
     private Map<Object, BitSet> txCachedFieldsToUpdateById = null;
 
+    /** Lookup map of attached-detached objects when attaching/detaching. */
+    private Map<ObjectProvider, Object> attachDetachObjectReferenceMap = null;
+
     /** Properties controlling runtime behaviour (detach on commit, multithreaded, etc). */
     private BasePropertyStore properties = new BasePropertyStore();
 
@@ -2799,6 +2802,34 @@
         }
     }
 
+    public Object getAttachDetachReferencedObject(ObjectProvider op)
+    {
+        if (attachDetachObjectReferenceMap == null)
+        {
+            return null;
+        }
+        return attachDetachObjectReferenceMap.get(op);
+    }
+
+    public void setAttachDetachReferencedObject(ObjectProvider op, Object obj)
+    {
+        if (obj != null)
+        {
+            if (attachDetachObjectReferenceMap == null)
+            {
+                attachDetachObjectReferenceMap = new HashMap<ObjectProvider, Object>();
+            }
+            attachDetachObjectReferenceMap.put(op,  obj);
+        }
+        else
+        {
+            if (attachDetachObjectReferenceMap != null)
+            {
+                attachDetachObjectReferenceMap.remove(op);
+            }
+        }
+    }
+
     // ----------------------------- New Instances ----------------------------------
 
     /**
@@ -4763,6 +4794,7 @@
             }
             scoOperationQueue.clear();
         }
+        attachDetachObjectReferenceMap = null;
     }
 
     // -------------------------------------- Cache Management ---------------------------------------

Modified: platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java	2013-03-29 07:04:13 UTC (rev 16831)
+++ platform/core/trunk/src/java/org/datanucleus/state/AbstractStateManager.java	2013-03-29 09:18:33 UTC (rev 16832)
@@ -878,6 +878,10 @@
      */
     protected boolean areFieldsLoaded(int[] fieldNumbers)
     {
+        if (fieldNumbers == null)
+        {
+            return true;
+        }
         for (int i=0; i<fieldNumbers.length; ++i)
         {
             if (!loadedFields[fieldNumbers[i]])

Modified: platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java	2013-03-29 07:04:13 UTC (rev 16831)
+++ platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java	2013-03-29 09:18:33 UTC (rev 16832)
@@ -137,9 +137,6 @@
     /** Image of the PersistenceCapable instance when the instance is enlisted in the transaction. */
     protected PersistenceCapable savedImage = null;
 
-    /** Referenced PC object whilst attaching/detaching, for the other object in the process (if any). */
-    protected PersistenceCapable referencedPC = null;
-
     private static final JDOImplHelper HELPER;
     static
     {
@@ -178,7 +175,7 @@
         super.connect(ec, cmd);
 
         savedImage = null;
-        referencedPC = null;
+        ec.setAttachDetachReferencedObject(this, null);
         fieldsToBeUpdatedAfterObjectInsertion = null;
         insertionNotifyList = null;
     }
@@ -227,7 +224,7 @@
 
         this.embeddedOwners = null;
         this.preDeleteLoadedFields = null;
-        this.referencedPC = null;
+        this.myEC.setAttachDetachReferencedObject(this, null);
         this.fieldsToBeUpdatedAfterObjectInsertion = null;
         this.insertionNotifyList = null;
         this.objectType = 0;
@@ -4081,7 +4078,7 @@
         if (isDetaching())
         {
             // Object in the process of detaching (recursive) so return the object which will be the detached object
-            return referencedPC;
+            return getReferencedPC();
         }
 
         // Look for an existing detached copy
@@ -4107,12 +4104,13 @@
             // Need to process the detached copy using current FetchPlanState
         }
 
-        referencedPC = detachedPC;
+        myEC.setAttachDetachReferencedObject(this, detachedPC);
 
         // Check if detachable ... if so then we detach a copy, otherwise we return a transient copy
         boolean detachable = myEC.getApiAdapter().isDetachable(myPC);
 
         // make sure a detaching PC is not read by another thread while we are detaching
+        Object referencedPC = getReferencedPC();
         synchronized (referencedPC)
         {
             int[] detachFieldNums = getFieldsNumbersToDetach();
@@ -4156,7 +4154,7 @@
                 // Create a SM for our copy object
                 JDOStateManager smDetachedPC = new JDOStateManager(myEC, cmd);
                 smDetachedPC.initialiseForDetached(detachedPC, getExternalObjectId(myPC), getVersion(myPC));
-                smDetachedPC.referencedPC = myPC;
+                myEC.setAttachDetachReferencedObject(smDetachedPC, myPC);
 
                 // If detached copy already existed, take note of fields previously loaded
                 if (existingDetached != null)
@@ -4167,7 +4165,7 @@
                 smDetachedPC.replaceFields(detachFieldNums, new DetachFieldManager(this, 
                     cmd.getSCOMutableMemberFlags(), myFP, state, true));
 
-                smDetachedPC.referencedPC = null;
+                myEC.setAttachDetachReferencedObject(smDetachedPC, null);
                 if (detachable)
                 {
                     // Update the object with its detached state - not to be confused with the "state" object above
@@ -4279,7 +4277,7 @@
      */
     public Object getReferencedPC()
     {
-        return referencedPC;
+        return myEC.getAttachDetachReferencedObject(this);
     }
 
     /* (non-Javadoc)
@@ -4501,8 +4499,8 @@
                 smDetachedPC.initialiseForDetached(detachedPC, getExternalObjectId(detachedPC), null);
 
                 // Cross-reference the attached and detached objects for the attach process
-                smDetachedPC.referencedPC = myPC;
-                this.referencedPC = detachedPC;
+                myEC.setAttachDetachReferencedObject(smDetachedPC, myPC);
+                myEC.setAttachDetachReferencedObject(this, detachedPC);
 
                 // Retrieve the updated values from the detached object
                 retrieveDetachState(smDetachedPC);
@@ -4516,8 +4514,8 @@
                 smDetachedPC.initialiseForDetached(detachedPC, getExternalObjectId(detachedPC), null);
 
                 // Cross-reference the attached and detached objects for the attach process
-                smDetachedPC.referencedPC = myPC;
-                this.referencedPC = detachedPC;
+                myEC.setAttachDetachReferencedObject(smDetachedPC, myPC);
+                myEC.setAttachDetachReferencedObject(this, detachedPC);
 
                 // Retrieve the updated values from the detached object
                 retrieveDetachState(smDetachedPC);
@@ -4538,8 +4536,8 @@
             replaceStateManager(detachedPC, null);
 
             // Remove the cross-referencing now we have finished the attach process
-            smDetachedPC.referencedPC = null;
-            this.referencedPC = null;
+            myEC.setAttachDetachReferencedObject(smDetachedPC, null);
+            myEC.setAttachDetachReferencedObject(this, null);
 
             // Call any "post-attach" listeners
             getCallbackHandler().postAttach(myPC,detachedPC);
@@ -4794,7 +4792,7 @@
 
         if (activity == ActivityState.NONE && !isFlushing() && !(myLC.isTransactional() && !myLC.isPersistent()))
         {
-            if (isDetaching() && referencedPC == null)
+            if (isDetaching() && getReferencedPC() == null)
             {
                 // detachAllOnCommit caused a field to be dirty so ignore it
                 return;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16835
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16835&view=rev
Author:   andy_jefferson
Date:     2013-03-30 08:51:09 +0000 (Sat, 30 Mar 2013)
Log Message:
-----------
[NUCCORE-1021] Validate any properties set on the EC where the property has a validator

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-29 14:57:33 UTC (rev 16834)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-30 08:51:09 UTC (rev 16835)
@@ -779,6 +779,7 @@
         if (properties.hasProperty(name.toLowerCase(Locale.ENGLISH)))
         {
             String intName = getNucleusContext().getPersistenceConfiguration().getInternalNameForProperty(name);
+            getNucleusContext().getPersistenceConfiguration().validatePropertyValue(intName, value);
             properties.setProperty(intName.toLowerCase(Locale.ENGLISH), value);
         }
         else if (name.equalsIgnoreCase(PropertyNames.PROPERTY_CACHE_L2_TYPE))
@@ -795,6 +796,7 @@
             String intName = getNucleusContext().getPersistenceConfiguration().getInternalNameForProperty(name);
             if (intName != null)
             {
+                getNucleusContext().getPersistenceConfiguration().validatePropertyValue(intName, value);
                 properties.setProperty(intName.toLowerCase(Locale.ENGLISH), value);
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-03-29 14:57:33 UTC (rev 16834)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-03-30 08:51:09 UTC (rev 16835)
@@ -743,6 +743,20 @@
         }
     }
 
+    public void validatePropertyValue(String name, Object value)
+    {
+        String validatorName = null; // TODO Work this out
+        PropertyMapping mapping = propertyMappings.get(name.toLowerCase(Locale.ENGLISH));
+        if (mapping != null)
+        {
+            validatorName = mapping.validatorName;
+        }
+        if (validatorName != null)
+        {
+            validatePropertyValue(name, value, validatorName);
+        }
+    }
+
     /**
      * Convenience method to validate the value for a property using the provided validator.
      * @param name The property name

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16840
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=16840&view=rev
Author:   andy_jefferson
Date:     2013-03-30 14:26:04 +0000 (Sat, 30 Mar 2013)
Log Message:
-----------
[NUCCORE-1023] Move creation of FlushProcess into store plugin (since they have all information necessary to decide which process to use).

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
    platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java
    platform/core/trunk/src/java/org/datanucleus/FlushProcess.java
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
    platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
    platform/core/trunk/src/java/org/datanucleus/store/AbstractPersistenceHandler.java
    platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java
    platform/core/trunk/src/java/org/datanucleus/store/StoreManager.java
    platform/core/trunk/src/java/org/datanucleus/store/StorePersistenceHandler.java
    platform/core/trunk/src/java/org/datanucleus/store/federation/FederatedStoreManager.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -4014,36 +4014,10 @@
                 tx.preFlush();
             }
 
-            // Pick the appropriate flush process, and execute it
-            FlushProcess flusher = null;
-            Boolean optimisedFlag = 
-                getNucleusContext().getPersistenceConfiguration().getBooleanObjectProperty(PropertyNames.PROPERTY_FLUSH_OPTIMISED);
-            if (optimisedFlag != null)
-            {
-                // User requested particular flush type
-                if (optimisedFlag)
-                {
-                    flusher = new FlushNonReferential(this);
-                }
-                else
-                {
-                    flusher = new FlushOrdered(this);
-                }
-            }
-            else
-            {
-                if (!getStoreManager().getPersistenceHandler().useReferentialIntegrity())
-                {
-                    // Datastore doesn't use referential integrity
-                    flusher = new FlushNonReferential(this);
-                }
-                else
-                {
-                    // Use ordered flush maintaining the order they came in on
-                    flusher = new FlushOrdered(this);
-                }
-            }
-            List<NucleusOptimisticException> optimisticFailures = flusher.execute(dirtyOPs, indirectDirtyOPs);
+            // Retrieve the appropriate flush process, and execute it
+            FlushProcess flusher = getStoreManager().getFlushProcess();
+            List<NucleusOptimisticException> optimisticFailures =
+                    flusher.execute(this, dirtyOPs, indirectDirtyOPs, scoOperationQueue);
 
             if (flushToDatastore)
             {

Modified: platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -26,6 +26,7 @@
 import org.datanucleus.exceptions.NucleusOptimisticException;
 import org.datanucleus.state.ObjectProvider;
 import org.datanucleus.store.StorePersistenceHandler;
+import org.datanucleus.store.types.queued.SCOOperationQueue;
 import org.datanucleus.util.NucleusLogger;
 
 /**
@@ -34,18 +35,14 @@
  */
 public class FlushNonReferential implements FlushProcess
 {
-    ExecutionContextImpl ec;
-
-    public FlushNonReferential(ExecutionContextImpl ec)
-    {
-        this.ec = ec;
-    }
-
     /* (non-Javadoc)
-     * @see org.datanucleus.FlushProcess#execute(java.util.List, java.util.List)
+     * @see org.datanucleus.FlushProcess#execute(org.datanucleus.ExecutionContext, java.util.List, java.util.List, org.datanucleus.store.types.queued.SCOOperationQueue)
      */
-    public List<NucleusOptimisticException> execute(List<ObjectProvider> dirtyOPs, List<ObjectProvider> indirectDirtyOPs)
+    public List<NucleusOptimisticException> execute(ExecutionContext ec, List<ObjectProvider> dirtyOPs, 
+        List<ObjectProvider> indirectDirtyOPs, SCOOperationQueue scoQueue)
     {
+        // Note that scoOperationQueue is not processed here since all datastores this is used with don't use backed SCOs
+
         List<NucleusOptimisticException> optimisticFailures = null;
 
         // Make copy of ObjectProviders so we don't have ConcurrentModification issues

Modified: platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -26,6 +26,7 @@
 import org.datanucleus.FlushProcess;
 import org.datanucleus.exceptions.NucleusOptimisticException;
 import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.store.types.queued.SCOOperationQueue;
 import org.datanucleus.util.NucleusLogger;
 
 /**
@@ -34,18 +35,15 @@
  */
 public class FlushOrdered implements FlushProcess
 {
-    ExecutionContextImpl ec;
-
-    public FlushOrdered(ExecutionContextImpl ec)
-    {
-        this.ec = ec;
-    }
-
     /* (non-Javadoc)
-     * @see org.datanucleus.FlushProcess#execute(java.util.List, java.util.List)
+     * @see org.datanucleus.FlushProcess#execute(org.datanucleus.ExecutionContext, java.util.List, java.util.List, org.datanucleus.store.types.queued.SCOOperationQueue)
      */
-    public List<NucleusOptimisticException> execute(List<ObjectProvider> dirtyOPs, List<ObjectProvider> indirectDirtyOPs)
+    public List<NucleusOptimisticException> execute(ExecutionContext ec, List<ObjectProvider> directOPs, 
+        List<ObjectProvider> indirectOPs, SCOOperationQueue scoQueue)
     {
+        // Note that scoOperationQueue is not processed directly here, but instead will be processed
+        // via callbacks from the persistence of other objects
+
         List<NucleusOptimisticException> optimisticFailures = null;
 
         // Make copy of ObjectProviders so we don't have ConcurrentModification issues
@@ -58,10 +56,10 @@
                 ec.getLock().lock();
             }
 
-            toFlushDirect = dirtyOPs.toArray();
-            dirtyOPs.clear();
-            toFlushIndirect = indirectDirtyOPs.toArray();
-            indirectDirtyOPs.clear();
+            toFlushDirect = directOPs.toArray();
+            directOPs.clear();
+            toFlushIndirect = indirectOPs.toArray();
+            indirectOPs.clear();
         }
         finally
         {

Modified: platform/core/trunk/src/java/org/datanucleus/FlushProcess.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushProcess.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/FlushProcess.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -21,10 +21,12 @@
 
 import org.datanucleus.exceptions.NucleusOptimisticException;
 import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.store.types.queued.SCOOperationQueue;
 import org.datanucleus.util.Localiser;
 
 /**
  * Representation of a persistence flush process.
+ * Decides in what order the "dirty" objects/fields are to be processed in.
  */
 public interface FlushProcess
 {
@@ -34,9 +36,12 @@
 
     /**
      * Execute the flush.
-     * @param dirtyOPs ObjectProviders that were made dirty by direct API calls. Cleared during this method
+     * @param ec ExecutionContext
+     * @param directDirtyOPs ObjectProviders that were made dirty by direct API calls. Cleared during this method
      * @param indirectDirtyOPs ObjectProviders that were made dirty by reachability. Cleared during this method
+     * @param scoQueue Queue of SCO operations
      * @return Any optimistic exceptions during the deletes/inserts/updates
      */
-    List<NucleusOptimisticException> execute(List<ObjectProvider> dirtyOPs, List<ObjectProvider> indirectDirtyOPs);
+    List<NucleusOptimisticException> execute(ExecutionContext ec, 
+        List<ObjectProvider> directDirtyOPs, List<ObjectProvider> indirectDirtyOPs, SCOOperationQueue scoQueue);
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -150,7 +150,6 @@
         addDefaultIntegerProperty(PropertyNames.PROPERTY_FLUSH_AUTO_OBJECT_LIMIT, null, 1, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_FLUSH_MODE, null, null, 
             CorePropertyValidator.class.getName(), false, true);
-        addDefaultBooleanProperty(PropertyNames.PROPERTY_FLUSH_OPTIMISED, null, null, false, false);
 
         // MetaData
         addDefaultBooleanProperty(PropertyNames.PROPERTY_METADATA_ALWAYS_DETACHABLE, null, false, false, false);

Modified: platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -74,7 +74,6 @@
 
     public static final String PROPERTY_FLUSH_MODE = "datanucleus.flush.mode";
     public static final String PROPERTY_FLUSH_AUTO_OBJECT_LIMIT = "datanucleus.datastoreTransactionFlushLimit";
-    public static final String PROPERTY_FLUSH_OPTIMISED = "datanucleus.flush.optimised";
 
     public static final String PROPERTY_METADATA_ALWAYS_DETACHABLE = "datanucleus.metadata.alwaysDetachable";
     public static final String PROPERTY_METADATA_VALIDATE = "datanucleus.metadata.validate";

Modified: platform/core/trunk/src/java/org/datanucleus/store/AbstractPersistenceHandler.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/AbstractPersistenceHandler.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/store/AbstractPersistenceHandler.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -61,14 +61,6 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.store.StorePersistenceHandler#useReferentialIntegrity()
-     */
-    public boolean useReferentialIntegrity()
-    {
-        return false;
-    }
-
-    /* (non-Javadoc)
      * @see org.datanucleus.store.StorePersistenceHandler#insertObjects(org.datanucleus.store.ObjectProvider[])
      */
     public void insertObjects(ObjectProvider... ops)

Modified: platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -31,6 +31,8 @@
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ExecutionContext;
+import org.datanucleus.FlushNonReferential;
+import org.datanucleus.FlushProcess;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.PropertyNames;
 import org.datanucleus.Transaction;
@@ -140,6 +142,9 @@
     /** Persistence handler. */
     protected StorePersistenceHandler persistenceHandler = null;
 
+    /** The flush process appropriate for this datastore. */
+    protected FlushProcess flushProcess = null;
+
     /** Query Manager. Lazy initialised, so use getQueryManager() to access. */
     private QueryManager queryMgr = null;
 
@@ -596,6 +601,19 @@
     }
 
     /* (non-Javadoc)
+     * @see org.datanucleus.store.StoreManager#getFlushProcess()
+     */
+    public FlushProcess getFlushProcess()
+    {
+        if (flushProcess == null)
+        {
+            // Default to non-referential flush
+            flushProcess = new FlushNonReferential();
+        }
+        return flushProcess;
+    }
+
+    /* (non-Javadoc)
      * @see org.datanucleus.store.StoreManager#getQueryManager()
      */
     public QueryManager getQueryManager()

Modified: platform/core/trunk/src/java/org/datanucleus/store/StoreManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/StoreManager.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/store/StoreManager.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -25,6 +25,7 @@
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ExecutionContext;
+import org.datanucleus.FlushProcess;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.api.ApiAdapter;
 import org.datanucleus.exceptions.NucleusException;
@@ -79,6 +80,12 @@
     StorePersistenceHandler getPersistenceHandler();
 
     /**
+     * Accessor for the flush process to use with this datastore.
+     * @return The flush process
+     */
+    FlushProcess getFlushProcess();
+
+    /**
      * Accessor for the schema naming factory.
      * @return Naming factory.
      */

Modified: platform/core/trunk/src/java/org/datanucleus/store/StorePersistenceHandler.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/StorePersistenceHandler.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/store/StorePersistenceHandler.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -42,15 +42,6 @@
     void close();
 
     /**
-     * Returns if the datastore uses referential integrity.
-     * Using referential integrity in this context means that any flush of datastore operations means that
-     * the operations are ordered; otherwise the persistence handler will receive any deletes as a batch,
-     * then any inserts as a batch, followed by any updates.
-     * @return Datastore referential integrity capability
-     */
-    boolean useReferentialIntegrity();
-
-    /**
      * Signal that a batch of operations are starting for the specified ExecutionContext.
      * The batch type allows the store plugin to create whatever type of batch it needs.
      * @param ec The ExecutionContext

Modified: platform/core/trunk/src/java/org/datanucleus/store/federation/FederatedStoreManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/federation/FederatedStoreManager.java	2013-03-30 10:28:09 UTC (rev 16839)
+++ platform/core/trunk/src/java/org/datanucleus/store/federation/FederatedStoreManager.java	2013-03-30 14:26:04 UTC (rev 16840)
@@ -29,6 +29,7 @@
 import org.datanucleus.ClassConstants;
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ExecutionContext;
+import org.datanucleus.FlushProcess;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.PersistenceConfiguration;
 import org.datanucleus.PropertyNames;
@@ -141,6 +142,15 @@
         return nucleusContext;
     }
 
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.StoreManager#getFlushProcess()
+     */
+    public FlushProcess getFlushProcess()
+    {
+        // TODO Ideally we want to use an ordered flush if one of the stores uses that, otherwise use FlushNonReferential
+        return primaryStoreMgr.getFlushProcess();
+    }
+
     public void close()
     {
         primaryStoreMgr.close();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16931
          http://sourceforge.net/p/datanucleus/code/16931
Author:   andy_jefferson
Date:     2013-04-19 07:58:55 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
[NUCCORE-1030] Remove unnecessary null checks/assignments

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ClassLoaderResolverImpl.java
    platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
    platform/core/trunk/src/java/org/datanucleus/cache/L2CacheRetrieveFieldManager.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java
    platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java
    platform/core/trunk/src/java/org/datanucleus/query/QueryUtils.java
    platform/core/trunk/src/java/org/datanucleus/query/compiler/JDOQLParser.java
    platform/core/trunk/src/java/org/datanucleus/query/compiler/JPQLParser.java
    platform/core/trunk/src/java/org/datanucleus/query/evaluator/JavaQueryEvaluator.java
    platform/core/trunk/src/java/org/datanucleus/query/expression/ExpressionCompiler.java
    platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java
    platform/core/trunk/src/java/org/datanucleus/store/fieldmanager/AttachFieldManager.java
    platform/core/trunk/src/java/org/datanucleus/store/query/AbstractSQLQuery.java
    platform/core/trunk/src/java/org/datanucleus/store/query/QueryManager.java
    platform/core/trunk/src/java/org/datanucleus/store/schema/naming/DN2NamingFactory.java
    platform/core/trunk/src/java/org/datanucleus/store/schema/naming/JPANamingFactory.java
    platform/core/trunk/src/java/org/datanucleus/util/ClassUtils.java

Modified: platform/core/trunk/src/java/org/datanucleus/ClassLoaderResolverImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ClassLoaderResolverImpl.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/ClassLoaderResolverImpl.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -182,11 +182,9 @@
             return cls;
         }
 
-        if (cls == null)
-        {
-            // Try the supplied loader first
-            cls = classOrNull(name, primary);
-        }
+        // Try the supplied loader first
+        cls = classOrNull(name, primary);
+
         if (cls == null && this.primary.get() != null)
         {
             // Try the primary for this current thread
@@ -288,11 +286,9 @@
             return cls;
         }
 
-        if (cls == null)
-        {
-            // Try the supplied loader first
-            cls = ClassOrNullWithInitialize(name, primary);
-        }
+        // Try the supplied loader first
+        cls = ClassOrNullWithInitialize(name, primary);
+
         if (cls == null && this.primary.get() != null)
         {
             // Try the primary for this current thread

Modified: platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -140,12 +140,20 @@
             }
             catch (NucleusOptimisticException noe)
             {
-                // TODO Could get multiple failures from the deletions
-                if (optimisticFailures == null)
+                optimisticFailures = new ArrayList();
+                Throwable[] nestedExcs = noe.getNestedExceptions();
+                if (nestedExcs != null && nestedExcs.length > 1)
                 {
-                    optimisticFailures = new ArrayList();
+                    NucleusOptimisticException[] noes = (NucleusOptimisticException[])nestedExcs;
+                    for (int i=0;i<nestedExcs.length;i++)
+                    {
+                        optimisticFailures.add(noes[i]);
+                    }
                 }
-                optimisticFailures.add(noe);
+                else
+                {
+                    optimisticFailures.add(noe);
+                }
             }
             for (ObjectProvider op : opsToDelete)
             {

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -532,7 +532,7 @@
 
             if (propValue != null)
             {
-                if (validatorName != null && propValue != null)
+                if (validatorName != null)
                 {
                     propValue = getValueForPropertyWithValidator(value, validatorName);
                 }

Modified: platform/core/trunk/src/java/org/datanucleus/cache/L2CacheRetrieveFieldManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/cache/L2CacheRetrieveFieldManager.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/cache/L2CacheRetrieveFieldManager.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -248,7 +248,6 @@
                             Object element = null;
                             if (elementOIDs[i] == null)
                             {
-                                element = null;
                             }
                             else if (componentType.isInterface() || persistableElement || componentType == Object.class)
                             {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -637,7 +637,7 @@
 
         Set<Throwable> exceptions = new HashSet();
 
-        if (allowXML && mappingFiles != null && mappingFiles.size() > 0)
+        if (allowXML && !mappingFiles.isEmpty())
         {
             // Load XML metadata
             Iterator iter = mappingFiles.iterator();
@@ -676,7 +676,7 @@
             }
         }
 
-        if (allowAnnotations && classNames != null && classNames.size() > 0)
+        if (allowAnnotations && !classNames.isEmpty())
         {
             // Load annotation metadata for all classes
             Iterator iter = classNames.iterator();
@@ -916,7 +916,7 @@
             }
         }
 
-        if (allowXML && mappingFiles != null && mappingFiles.size() > 0)
+        if (allowXML && !mappingFiles.isEmpty())
         {
             // Load XML metadata for all <mapping-file> specifications
             Iterator iter = mappingFiles.iterator();
@@ -962,7 +962,7 @@
             }
         }
 
-        if (allowAnnotations && classNames != null && classNames.size() > 0)
+        if (allowAnnotations && !classNames.isEmpty())
         {
             // Load annotation metadata for all classes
             Iterator iter = classNames.iterator();
@@ -1221,7 +1221,7 @@
                     }
 
                     FileMetaData filemd = fileMetaDataByURLString.get(fileURL.toString());
-                    if (fileURL != null && filemd == null)
+                    if (filemd == null)
                     {
                         // Valid metadata, and not already loaded
                         filemd = parseFile(fileURL);

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -360,7 +360,7 @@
                         fieldName = nextToken;
                     }
 
-                    if (elementCmd != null && !elementCmd.hasMember(fieldName))
+                    if (!elementCmd.hasMember(fieldName))
                     {
                         throw new InvalidMemberMetaDataException(LOCALISER, "044138", fmd.getClassName(),
                             fmd.getName(), elementCmd.getFullClassName(), fieldName);

Modified: platform/core/trunk/src/java/org/datanucleus/query/QueryUtils.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/QueryUtils.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/query/QueryUtils.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -667,12 +667,8 @@
         {
             value = ((Number) obj).toString();
         }
-        else if (obj == null)
+        else if (obj != null)
         {
-            value = null;
-        }
-        else
-        {
             throw new NucleusException("getStringValue(obj) where obj is instanceof " + obj.getClass().getName() + " not supported");
         }
         return value;
@@ -998,8 +994,8 @@
         }
         else if (left instanceof Enum || right instanceof Enum || left instanceof String || right instanceof String)
         {
-            String leftStr = left != null ? left.toString() : null;
-            String rightStr = right != null ? right.toString() : null;
+            String leftStr = left.toString();
+            String rightStr = right.toString();
             if (op == Expression.OP_EQ)
             {
                 // Use equals()

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/JDOQLParser.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/JDOQLParser.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/JDOQLParser.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -1053,7 +1053,6 @@
         }
         else if (p.parseNullLiteral())
         {
-            litValue = null;
         }
         else
         {

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/JPQLParser.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/JPQLParser.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/JPQLParser.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -1892,7 +1892,6 @@
         }
         else if (p.parseNullLiteralIgnoreCase())
         {
-            litValue = null;
         }
         else
         {

Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/JavaQueryEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/JavaQueryEvaluator.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/JavaQueryEvaluator.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -596,36 +596,33 @@
             {
                 public int compare(Object arg0, Object arg1)
                 {
-                    if (grouping != null)
+                    for (int i = 0; i < grouping.length; i++)
                     {
-                        for (int i = 0; i < grouping.length; i++)
+                        state.put(candidateAlias, arg0);
+                        Object a = grouping[i].evaluate(evaluator);
+                        state.put(candidateAlias, arg1);
+                        Object b = grouping[i].evaluate(evaluator);
+
+                        // Put any null values at the end
+                        if (a == null && b == null)
                         {
-                            state.put(candidateAlias, arg0);
-                            Object a = grouping[i].evaluate(evaluator);
-                            state.put(candidateAlias, arg1);
-                            Object b = grouping[i].evaluate(evaluator);
-
-                            // Put any null values at the end
-                            if (a == null && b == null)
+                            return 0;
+                        }
+                        else if (a == null)
+                        {
+                            return -1;
+                        }
+                        else if (b == null)
+                        {
+                            return 1;
+                        }
+                        else
+                        {
+                            int result = ((Comparable) a).compareTo(b);
+                            if (result != 0)
                             {
-                                return 0;
+                                return result;
                             }
-                            else if (a == null)
-                            {
-                                return -1;
-                            }
-                            else if (b == null)
-                            {
-                                return 1;
-                            }
-                            else
-                            {
-                                int result = ((Comparable) a).compareTo(b);
-                                if (result != 0)
-                                {
-                                    return result;
-                                }
-                            }
                         }
                     }
                     return 0;

Modified: platform/core/trunk/src/java/org/datanucleus/query/expression/ExpressionCompiler.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/expression/ExpressionCompiler.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/query/expression/ExpressionCompiler.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -697,7 +697,7 @@
 
                 if (currentNode.getNodeType() == NodeType.INVOKE)
                 {
-                    if (currentExpr == null && tupple.size() > 1)
+                    if (tupple.size() > 1)
                     {
                         // Start from Literal and invoke on that
                         currentExpr = new Literal(node.getNodeValue());

Modified: platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/state/JDOStateManager.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -2491,7 +2491,7 @@
                 // Assign the strategy value where required.
                 // Default JDO2 behaviour is to always provide a strategy value when it is marked as using a strategy
                 boolean applyStrategy = true;
-                if (!mmd.getType().isPrimitive() && strategy != null &&
+                if (!mmd.getType().isPrimitive() &&
                     mmd.hasExtension("strategy-when-notnull") &&
                     mmd.getValueForExtension("strategy-when-notnull").equalsIgnoreCase("false") &&
                     this.provideField(fieldNumber) != null)
@@ -2968,10 +2968,7 @@
                 }
             }
 
-            if (fieldNumbers != null)
-            {
-                updateLevel2CacheForFields(fieldNumbers);
-            }
+            updateLevel2CacheForFields(fieldNumbers);
             if (callPostLoad)
             {
                 postLoad();

Modified: platform/core/trunk/src/java/org/datanucleus/store/fieldmanager/AttachFieldManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/fieldmanager/AttachFieldManager.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/store/fieldmanager/AttachFieldManager.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -177,7 +177,7 @@
                 if (!changed)
                 {
                     // Check if the new value is different (not detected if detached field was not a wrapper and mutable)
-                    if ((oldValue == null && value != null) || (oldValue != null && value == null))
+                    if (oldValue == null)
                     {
                         changed = true;
                     }
@@ -197,7 +197,7 @@
                 }
 
                 SCO sco;
-                if (oldValue == null || (oldValue != null && !(oldValue instanceof SCO)))
+                if (oldValue == null || !(oldValue instanceof SCO))
                 {
                     // Detached object didn't use wrapped field
                     if (NucleusLogger.PERSISTENCE.isDebugEnabled())
@@ -284,27 +284,24 @@
                 if (cascadeAttach)
                 {
                     // Only trigger the cascade when required
-                    if (value != null)
+                    Object arr = Array.newInstance(mmd.getType().getComponentType(), Array.getLength(value));
+                    for (int i=0;i<Array.getLength(value);i++)
                     {
-                        Object arr = Array.newInstance(mmd.getType().getComponentType(), Array.getLength(value));
-                        for (int i=0;i<Array.getLength(value);i++)
+                        Object elem = Array.get(value, i);
+                        // TODO Compare with old value and handle delete dependent etc
+                        if (copy)
                         {
-                            Object elem = Array.get(value, i);
-                            // TODO Compare with old value and handle delete dependent etc
-                            if (copy)
-                            {
-                                Object elemAttached = ec.attachObjectCopy(attachedOP, elem, false);
-                                Array.set(arr, i, elemAttached);
-                            }
-                            else
-                            {
-                                ec.attachObject(attachedOP, elem, false);
-                                Array.set(arr, i, elem);
-                            }
+                            Object elemAttached = ec.attachObjectCopy(attachedOP, elem, false);
+                            Array.set(arr, i, elemAttached);
                         }
+                        else
+                        {
+                            ec.attachObject(attachedOP, elem, false);
+                            Array.set(arr, i, elem);
+                        }
+                    }
 
-                        attachedOP.replaceFieldMakeDirty(fieldNumber, arr);
-                    }
+                    attachedOP.replaceFieldMakeDirty(fieldNumber, arr);
                 }
 
                 if (dirtyFields[fieldNumber] || !persistent)

Modified: platform/core/trunk/src/java/org/datanucleus/store/query/AbstractSQLQuery.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/query/AbstractSQLQuery.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/store/query/AbstractSQLQuery.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -506,24 +506,22 @@
 
         // Build a Map of params with keys 1, 2, 3, etc representing the position in the runtime JDBC SQL
         Map executeMap = new HashMap();
-        if (params != null)
+
+        // Cycle through the expected params
+        paramPos = 1;
+        Iterator expectedParamIter = expectedParams.iterator();
+        while (expectedParamIter.hasNext())
         {
-            // Cycle through the expected params
-            paramPos = 1;
-            Iterator expectedParamIter = expectedParams.iterator();
-            while (expectedParamIter.hasNext())
+            Object key = expectedParamIter.next();
+            if (!params.containsKey(key))
             {
-                Object key = expectedParamIter.next();
-                if (!params.containsKey(key))
-                {
-                    // Expected parameter is not provided
-                    throw new NucleusUserException(LOCALISER.msg("059030", inputSQL, "" + key));
-                }
+                // Expected parameter is not provided
+                throw new NucleusUserException(LOCALISER.msg("059030", inputSQL, "" + key));
+            }
 
-                executeMap.put(Integer.valueOf(paramPos), params.get(key));
-                paramNames.add("" + paramPos);
-                paramPos++;
-            }
+            executeMap.put(Integer.valueOf(paramPos), params.get(key));
+            paramNames.add("" + paramPos);
+            paramPos++;
         }
         parameterNames = (String[])paramNames.toArray(new String[paramNames.size()]);
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/query/QueryManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/query/QueryManager.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/store/query/QueryManager.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -349,7 +349,7 @@
             QueryCompilation compilation = queryCompilationCache.get(queryKey);
             if (compilation != null)
             {
-                if (compilation != null && NucleusLogger.QUERY.isDebugEnabled())
+                if (NucleusLogger.QUERY.isDebugEnabled())
                 {
                     NucleusLogger.QUERY.debug(LOCALISER.msg("021079", query, language));
                 }
@@ -415,7 +415,7 @@
             Object compilation = queryCompilationCacheDatastore.get(queryKey);
             if (compilation != null)
             {
-                if (compilation != null && NucleusLogger.QUERY.isDebugEnabled())
+                if (NucleusLogger.QUERY.isDebugEnabled())
                 {
                     NucleusLogger.QUERY.debug(LOCALISER.msg("021080", query, language, datastore));
                 }

Modified: platform/core/trunk/src/java/org/datanucleus/store/schema/naming/DN2NamingFactory.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/schema/naming/DN2NamingFactory.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/store/schema/naming/DN2NamingFactory.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -80,7 +80,7 @@
 
         // Apply any truncation necessary
         int maxLength = getMaximumLengthForComponent(SchemaComponent.TABLE);
-        if (name != null && maxLength > 0 && name.length() > maxLength)
+        if (maxLength > 0 && name.length() > maxLength)
         {
             name = truncate(name, maxLength);
         }

Modified: platform/core/trunk/src/java/org/datanucleus/store/schema/naming/JPANamingFactory.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/schema/naming/JPANamingFactory.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/store/schema/naming/JPANamingFactory.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -106,7 +106,7 @@
 
         // Apply any truncation necessary
         int maxLength = getMaximumLengthForComponent(SchemaComponent.TABLE);
-        if (name != null && maxLength > 0 && name.length() > maxLength)
+        if (maxLength > 0 && name.length() > maxLength)
         {
             name = truncate(name, maxLength);
         }

Modified: platform/core/trunk/src/java/org/datanucleus/util/ClassUtils.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/util/ClassUtils.java	2013-04-18 06:33:31 UTC (rev 16930)
+++ platform/core/trunk/src/java/org/datanucleus/util/ClassUtils.java	2013-04-19 07:58:55 UTC (rev 16931)
@@ -168,8 +168,7 @@
                                 break;
                             }
                             else if (argTypes[j] != null && !ctrParams[j].isAssignableFrom( argTypes[j] ) &&
-                                (primType == null ||
-                                 primType != null && ctrParams[j] != primType))
+                                (primType == null || ctrParams[j] != primType))
                             {
                                 // Different type in this parameter position
                                 ctrIsValid = false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16955
          http://sourceforge.net/p/datanucleus/code/16955
Author:   andy_jefferson
Date:     2013-04-24 09:42:47 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
[NUCCORE-1034] Cater better for detach of non-detachable objects via DetachAllOnCommit

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/Localisation.properties
    platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-04-23 13:43:56 UTC (rev 16954)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-04-24 09:42:47 UTC (rev 16955)
@@ -2732,6 +2732,11 @@
         ObjectProvider op = findObjectProvider(obj);
         if (op == null)
         {
+            if (runningDetachAllOnTxnEnd && !getMetaDataManager().getMetaDataForClass(obj.getClass(), clr).isDetachable())
+            {
+                // Object is not detachable, so is now transient (hence no ObjectProvider)
+                return;
+            }
             throw new NucleusUserException(LOCALISER.msg("010007", getApiAdapter().getIdForObject(obj)));
         }
         op.detach(state);

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-04-23 13:43:56 UTC (rev 16954)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation.properties	2013-04-24 09:42:47 UTC (rev 16955)
@@ -127,7 +127,7 @@
 010004=ExecutionContext.internalFlush() process finished
 010005=Attempt to access HOLLOW nondurable object via getObjectById!
 010006=No nondurable object with this id accessible via the cache - maybe for a different manager?
-010007=Object with id "{0}" is managed by a different Object Manager
+010007=Object with id "{0}" is managed by a different persistence manager
 010008=Object is not detached. The operation requires a detached object.
 010009=Detaching object from persistence : "{0}" (depth={1})
 010010=Detaching copy of object "{0}" (depth={1}) as "{2}" with detached-fields {3} and fields-to-load={4}
@@ -496,7 +496,7 @@
 023006=Object "{0}" field "{1}" loading contents to SCO wrapper from the datastore
 023007=Object "{0}" field "{1}" is having its SCO wrapper initialised with a container with {2} values
 023008=Object "{0}" field "{1}" is having its SCO wrapper updated with a container with {2} values
-023009=Can't write object "{0}" since it is managed by a different Object Manager
+023009=Can't write object "{0}" since it is managed by a different persistence manager
 023010={0} is an invalid SCO type for field {1}, must be compatible with {2}
 023011=Class {0} (declared type of field {2} referencing {1}) is not supported as a Second-Class object
 023012=The field "{0}" has been specified to use a comparator of type "{1}" yet this class was not found in the CLASSPATH. Please check the name of the comparator class specified in the MetaData.

Modified: platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-04-23 13:43:56 UTC (rev 16954)
+++ platform/core/trunk/src/java/org/datanucleus/Localisation_es.properties	2013-04-24 09:42:47 UTC (rev 16955)
@@ -502,7 +502,7 @@
 023006=El objeto "{0}" campo "{1}" obteniendo los contenidos al contenedor de SCO de la base de datos
 023007=El objeto "{0}" campo "{1}" va a ser inicializado por un contenedor con {2} valores
 023008=El objeto "{0}" campo "{1}" va a ser cambiado por un conteneder con {2} valores
-023009=Es imposible persistir el objeto "{0}" como esta manejado por otro Object Manager
+023009=Es imposible persistir el objeto "{0}" como esta manejado por otro persistence manager
 023010={0} no es un tipo valido de SCO por campo {1}, deb ser compatible con {2}
 # needs updating
 023011=La clase {0} no tiene soporte como objeto de clase segundo (SCO)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16963
          http://sourceforge.net/p/datanucleus/code/16963
Author:   andy_jefferson
Date:     2013-04-27 13:01:54 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
[NUCCORE-1037] Add "datanucleus.objectProvider.className" property so user can choose ObjectProvider implementation to use with their NucleusContext

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
    platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
    platform/core/trunk/src/java/org/datanucleus/state/ObjectProviderFactoryImpl.java
    platform/core/trunk/src/java/org/datanucleus/state/ObjectProviderPool.java

Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-04-26 10:12:08 UTC (rev 16962)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java	2013-04-27 13:01:54 UTC (rev 16963)
@@ -41,6 +41,7 @@
 import org.datanucleus.properties.PersistencePropertyValidator;
 import org.datanucleus.properties.PropertyStore;
 import org.datanucleus.properties.StringPropertyValidator;
+import org.datanucleus.state.JDOStateManager;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.PersistenceUtils;
@@ -119,6 +120,8 @@
         addDefaultIntegerProperty(PropertyNames.PROPERTY_EXECUTION_CONTEXT_MAX_IDLE, null, 20, false, false);
         addDefaultBooleanProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_REAPER_THREAD, null, false, false, false);
         addDefaultIntegerProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_MAX_IDLE, null, 0, false, false);
+        addDefaultProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_CLASS_NAME, null, JDOStateManager.class.getName(), 
+            null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_DATASTORE_IDENTITY_TYPE, null, "datanucleus", null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_IDENTITY_STRING_TRANSLATOR_TYPE, null, null, null, false, false);
         addDefaultProperty(PropertyNames.PROPERTY_IDENTITY_KEY_TRANSLATOR_TYPE, null, null, null, false, false);

Modified: platform/core/trunk/src/java/org/datanucleus/PropertyNames.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-04-26 10:12:08 UTC (rev 16962)
+++ platform/core/trunk/src/java/org/datanucleus/PropertyNames.java	2013-04-27 13:01:54 UTC (rev 16963)
@@ -63,6 +63,7 @@
     public static final String PROPERTY_EXECUTION_CONTEXT_MAX_IDLE = "datanucleus.executionContext.maxIdle";
     public static final String PROPERTY_OBJECT_PROVIDER_REAPER_THREAD = "datanucleus.objectProvider.reaperThread";
     public static final String PROPERTY_OBJECT_PROVIDER_MAX_IDLE = "datanucleus.objectProvider.maxIdle";
+    public static final String PROPERTY_OBJECT_PROVIDER_CLASS_NAME = "datanucleus.objectProvider.className";
 
     public static final String PROPERTY_TRANSACTION_TYPE = "datanucleus.TransactionType";
     public static final String PROPERTY_TRANSACTION_JTA_LOCATOR = "datanucleus.jtaLocator";

Modified: platform/core/trunk/src/java/org/datanucleus/state/ObjectProviderFactoryImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/ObjectProviderFactoryImpl.java	2013-04-26 10:12:08 UTC (rev 16962)
+++ platform/core/trunk/src/java/org/datanucleus/state/ObjectProviderFactoryImpl.java	2013-04-27 13:01:54 UTC (rev 16963)
@@ -27,6 +27,7 @@
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.store.FieldValues;
+import org.datanucleus.util.ClassUtils;
 import org.datanucleus.util.Localiser;
 
 /**
@@ -39,6 +40,10 @@
     protected static final Localiser LOCALISER = Localiser.getInstance("org.datanucleus.Localisation",
         org.datanucleus.ClassConstants.NUCLEUS_CONTEXT_LOADER);
 
+    Class opClass = null;
+
+    Class[] opClassArgs = new Class[] {ExecutionContext.class, AbstractClassMetaData.class};
+
     /** Single pool of all ObjectProvider objects. TODO Consider having one pool per object type. */
     ObjectProviderPool opPool = null;
 
@@ -47,6 +52,8 @@
         PersistenceConfiguration conf = nucCtx.getPersistenceConfiguration();
         opPool = new ObjectProviderPool(conf.getIntProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_MAX_IDLE),
             conf.getBooleanProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_REAPER_THREAD));
+        String opClassName = conf.getStringProperty(PropertyNames.PROPERTY_OBJECT_PROVIDER_CLASS_NAME);
+        opClass = nucCtx.getClassLoaderResolver(null).classForName(opClassName);
     }
 
     public void close()
@@ -281,8 +288,7 @@
 
     protected ObjectProvider getObjectProvider(ExecutionContext ec, AbstractClassMetaData cmd)
     {
-        // TODO Allow use of different types of ObjectProvider other than JDOStateManager
-        return new JDOStateManager(ec, cmd);
+        return (ObjectProvider) ClassUtils.newInstance(opClass, opClassArgs, new Object[] {ec, cmd});
         // TODO Enable this when the pool is working in multithreaded mode [NUCCORE-1007]
 //        return opPool.checkOut(ec, cmd);
     }

Modified: platform/core/trunk/src/java/org/datanucleus/state/ObjectProviderPool.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/ObjectProviderPool.java	2013-04-26 10:12:08 UTC (rev 16962)
+++ platform/core/trunk/src/java/org/datanucleus/state/ObjectProviderPool.java	2013-04-27 13:01:54 UTC (rev 16963)
@@ -69,7 +69,7 @@
 
     protected ObjectProvider create(ExecutionContext ec, AbstractClassMetaData cmd)
     {
-        // TODO Allow use of different types of ObjectProvider other than JDOStateManager
+        // TODO Allow use of different types of ObjectProvider other than JDOStateManager (see ObjectProviderFactoryImpl)
         return new JDOStateManager(ec, cmd);
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16976
          http://sourceforge.net/p/datanucleus/code/16976
Author:   andy_jefferson
Date:     2013-05-06 10:54:56 +0000 (Mon, 06 May 2013)
Log Message:
-----------
[NUCCORE-1038] Move "scoOperationQueue" to "operationQueue" so that it could contain PERSISTs, DELETEs, UPDATEs.

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
    platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java
    platform/core/trunk/src/java/org/datanucleus/store/StoreManager.java
    platform/core/trunk/src/java/org/datanucleus/store/federation/FederatedStoreManager.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/flush/FlushNonReferential.java
    platform/core/trunk/src/java/org/datanucleus/flush/FlushOrdered.java
    platform/core/trunk/src/java/org/datanucleus/flush/FlushProcess.java

Removed Paths:
-------------
    platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
    platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java
    platform/core/trunk/src/java/org/datanucleus/FlushProcess.java

Modified: platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-05-06 10:51:17 UTC (rev 16975)
+++ platform/core/trunk/src/java/org/datanucleus/ExecutionContextImpl.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -56,6 +56,7 @@
 import org.datanucleus.exceptions.RollbackStateTransitionException;
 import org.datanucleus.exceptions.TransactionActiveOnCloseException;
 import org.datanucleus.exceptions.TransactionNotActiveException;
+import org.datanucleus.flush.FlushProcess;
 import org.datanucleus.flush.Operation;
 import org.datanucleus.flush.OperationQueue;
 import org.datanucleus.identity.DatastoreUniqueOID;

Deleted: platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-05-06 10:51:17 UTC (rev 16975)
+++ platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -1,221 +0,0 @@
-/**********************************************************************
-Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.datanucleus.exceptions.NucleusOptimisticException;
-import org.datanucleus.flush.OperationQueue;
-import org.datanucleus.state.ObjectProvider;
-import org.datanucleus.store.StorePersistenceHandler;
-import org.datanucleus.util.NucleusLogger;
-
-/**
- * Flush method for cases where the datastore doesn't use referential integrity so we can send batches
- * of deletes, then batches of inserts, then any updates to optimise the persistence.
- */
-public class FlushNonReferential implements FlushProcess
-{
-    /* (non-Javadoc)
-     * @see org.datanucleus.FlushProcess#execute(org.datanucleus.ExecutionContext, java.util.List, java.util.List, org.datanucleus.flush.OperationQueue)
-     */
-    public List<NucleusOptimisticException> execute(ExecutionContext ec, List<ObjectProvider> primaryOPs, 
-        List<ObjectProvider> secondaryOPs, OperationQueue opQueue)
-    {
-        // Note that scoOperationQueue is not processed here since all datastores this is used with don't use backed SCOs
-
-        // Make copy of ObjectProviders so we don't have ConcurrentModification issues
-        Set<ObjectProvider> opsToFlush = new HashSet<ObjectProvider>();
-        if (primaryOPs != null)
-        {
-            opsToFlush.addAll(primaryOPs);
-            primaryOPs.clear();
-        }
-        if (secondaryOPs != null)
-        {
-            opsToFlush.addAll(secondaryOPs);
-            secondaryOPs.clear();
-        }
-
-        return flushDeleteInsertUpdateGrouped(opsToFlush, ec);
-    }
-
-    /**
-     * Method that does the flushing of the passed ObjectProviders, grouping them into all DELETEs, then all INSERTs,
-     * finally all UPDATEs. The StorePersistenceHandler will get calls to <i>deleteObjects</i>, <i>insertObjects</i>
-     * and <i>updateObject</i> (for each other one). Note that this is in a separate method to allow calls by
-     * other FlushProcesses that want to take advantage of the basic flush method without 
-     * @param opsToFlush The ObjectProviders to process
-     * @param ec ExecutionContext
-     * @return Any optimistic verification exceptions thrown during flush
-     */
-    public List<NucleusOptimisticException> flushDeleteInsertUpdateGrouped(Set<ObjectProvider> opsToFlush, ExecutionContext ec)
-    {
-        List<NucleusOptimisticException> optimisticFailures = null;
-
-        Set<Class> classesToFlush = null;
-        if (ec.getNucleusContext().getStoreManager().getQueryManager().getQueryResultsCache() != null)
-        {
-            classesToFlush = new HashSet();
-        }
-
-        Set<ObjectProvider> opsToDelete = new HashSet<ObjectProvider>();
-        Set<ObjectProvider> opsToInsert = new HashSet<ObjectProvider>();
-        Iterator<ObjectProvider> opIter = opsToFlush.iterator();
-        while (opIter.hasNext())
-        {
-            ObjectProvider op = opIter.next();
-            if (op.isEmbedded())
-            {
-                op.markAsFlushed(); // Embedded have nothing to flush since the owner manages it
-                opIter.remove();
-            }
-            else
-            {
-                if (classesToFlush != null)
-                {
-                    classesToFlush.add(op.getObject().getClass());
-                }
-                if (op.getLifecycleState().isNew() && !op.isFlushedToDatastore() && !op.isFlushedNew())
-                {
-                    // P_NEW and not yet flushed to datastore
-                    opsToInsert.add(op);
-                    opIter.remove();
-                }
-                else if (op.getLifecycleState().isDeleted() && !op.isFlushedToDatastore())
-                {
-                    if (!op.getLifecycleState().isNew())
-                    {
-                        // P_DELETED
-                        opsToDelete.add(op);
-                        opIter.remove();
-                    }
-                    else if (op.getLifecycleState().isNew() && op.isFlushedNew())
-                    {
-                        // P_NEW_DELETED already persisted
-                        opsToDelete.add(op);
-                        opIter.remove();
-                    }
-                }
-            }
-        }
-
-        if (NucleusLogger.PERSISTENCE.isDebugEnabled())
-        {
-            NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("010046", opsToDelete.size(), opsToInsert.size(), opsToFlush.size()));
-        }
-
-        StorePersistenceHandler persistenceHandler = ec.getStoreManager().getPersistenceHandler();
-        if (!opsToDelete.isEmpty())
-        {
-            // Perform preDelete - deleteAll - postDelete, and mark all ObjectProviders as flushed
-            // TODO This omits some parts of sm.internalDeletePersistent
-            for (ObjectProvider op : opsToDelete)
-            {
-                op.setFlushing(true);
-                ec.getCallbackHandler().preDelete(op.getObject());
-            }
-            try
-            {
-                persistenceHandler.deleteObjects(opsToDelete.toArray(new ObjectProvider[opsToDelete.size()]));
-            }
-            catch (NucleusOptimisticException noe)
-            {
-                optimisticFailures = new ArrayList();
-                Throwable[] nestedExcs = noe.getNestedExceptions();
-                if (nestedExcs != null && nestedExcs.length > 1)
-                {
-                    NucleusOptimisticException[] noes = (NucleusOptimisticException[])nestedExcs;
-                    for (int i=0;i<nestedExcs.length;i++)
-                    {
-                        optimisticFailures.add(noes[i]);
-                    }
-                }
-                else
-                {
-                    optimisticFailures.add(noe);
-                }
-            }
-            for (ObjectProvider op : opsToDelete)
-            {
-                ec.getCallbackHandler().postDelete(op.getObject());
-                op.setFlushedNew(false);
-                op.markAsFlushed();
-                op.setFlushing(false);
-            }
-        }
-
-        if (!opsToInsert.isEmpty())
-        {
-            // Perform preStore - insertAll - postStore, and mark all ObjectProviders as flushed
-            // TODO This omits some parts of sm.internalMakePersistent
-            for (ObjectProvider op : opsToInsert)
-            {
-                op.setFlushing(true);
-                ec.getCallbackHandler().preStore(op.getObject());
-                // TODO Make sure identity is set since user could have updated fields in preStore
-            }
-            persistenceHandler.insertObjects(opsToInsert.toArray(new ObjectProvider[opsToInsert.size()]));
-            for (ObjectProvider op : opsToInsert)
-            {
-                ec.getCallbackHandler().postStore(op.getObject());
-                op.setFlushedNew(true);
-                op.markAsFlushed();
-                op.setFlushing(false);
-                ec.putObjectIntoLevel1Cache(op); // Update the object in the cache(s) now that version/id are set
-            }
-        }
-
-        if (!opsToFlush.isEmpty())
-        {
-            // Objects to update
-            for (ObjectProvider op : opsToFlush)
-            {
-                try
-                {
-                    op.flush();
-                }
-                catch (NucleusOptimisticException oe)
-                {
-                    if (optimisticFailures == null)
-                    {
-                        optimisticFailures = new ArrayList();
-                    }
-                    optimisticFailures.add(oe);
-                }
-            }
-        }
-
-        if (classesToFlush != null)
-        {
-            // Flush any query results from cache for these types
-            Iterator<Class> queryClsIter = classesToFlush.iterator();
-            while (queryClsIter.hasNext())
-            {
-                Class cls = queryClsIter.next();
-                ec.getNucleusContext().getStoreManager().getQueryManager().evictQueryResultsForType(cls);
-            }
-        }
-        
-        return optimisticFailures;
-    }
-}
\ No newline at end of file

Deleted: platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java	2013-05-06 10:51:17 UTC (rev 16975)
+++ platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -1,161 +0,0 @@
-/**********************************************************************
-Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.datanucleus.FlushProcess;
-import org.datanucleus.exceptions.NucleusOptimisticException;
-import org.datanucleus.flush.OperationQueue;
-import org.datanucleus.state.ObjectProvider;
-import org.datanucleus.util.NucleusLogger;
-
-/**
- * Flush process that processes the objects in the order that they became dirty.
- * If a datastore uses referential integrity this is typically the best way of maintaining a valid update process.
- */
-public class FlushOrdered implements FlushProcess
-{
-    /* (non-Javadoc)
-     * @see org.datanucleus.FlushProcess#execute(org.datanucleus.ExecutionContext, java.util.List, java.util.List, org.datanucleus.flush.OperationQueue)
-     */
-    public List<NucleusOptimisticException> execute(ExecutionContext ec, List<ObjectProvider> primaryOPs, 
-        List<ObjectProvider> secondaryOPs, OperationQueue opQueue)
-    {
-        // Note that scoOperationQueue is not processed directly here, but instead will be processed
-        // via callbacks from the persistence of other objects
-
-        List<NucleusOptimisticException> optimisticFailures = null;
-
-        // Make copy of ObjectProviders so we don't have ConcurrentModification issues
-        Object[] toFlushPrimary = null;
-        Object[] toFlushSecondary = null;
-        try
-        {
-            if (ec.getMultithreaded()) // Why lock here? should be on overall flush
-            {
-                ec.getLock().lock();
-            }
-
-            if (primaryOPs != null)
-            {
-                toFlushPrimary = primaryOPs.toArray();
-                primaryOPs.clear();
-            }
-            if (secondaryOPs != null)
-            {
-                toFlushSecondary = secondaryOPs.toArray();
-                secondaryOPs.clear();
-            }
-        }
-        finally
-        {
-            if (ec.getMultithreaded())
-            {
-                ec.getLock().unlock();
-            }
-        }
-
-        if (NucleusLogger.PERSISTENCE.isDebugEnabled())
-        {
-            int total = 0;
-            if (toFlushPrimary != null)
-            {
-                total += toFlushPrimary.length;
-            }
-            if (toFlushSecondary != null)
-            {
-                total += toFlushSecondary.length;
-            }
-            NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("010003", total));
-        }
-
-        Set<Class> classesToFlush = null;
-        if (ec.getNucleusContext().getStoreManager().getQueryManager().getQueryResultsCache() != null)
-        {
-            classesToFlush = new HashSet();
-        }
-
-        // a). primary dirty objects
-        if (toFlushPrimary != null)
-        {
-            for (int i = 0; i < toFlushPrimary.length; i++)
-            {
-                ObjectProvider op = (ObjectProvider) toFlushPrimary[i];
-                try
-                {
-                    op.flush();
-                    if (classesToFlush != null)
-                    {
-                        classesToFlush.add(op.getObject().getClass());
-                    }
-                }
-                catch (NucleusOptimisticException oe)
-                {
-                    if (optimisticFailures == null)
-                    {
-                        optimisticFailures = new ArrayList();
-                    }
-                    optimisticFailures.add(oe);
-                }
-            }
-        }
-
-        // b). secondary dirty objects
-        if (toFlushSecondary != null)
-        {
-            for (int i = 0; i < toFlushSecondary.length; i++)
-            {
-                ObjectProvider sm = (ObjectProvider) toFlushSecondary[i];
-                try
-                {
-                    sm.flush();
-                    if (classesToFlush != null)
-                    {
-                        classesToFlush.add(sm.getObject().getClass());
-                    }
-                }
-                catch (NucleusOptimisticException oe)
-                {
-                    if (optimisticFailures == null)
-                    {
-                        optimisticFailures = new ArrayList();
-                    }
-                    optimisticFailures.add(oe);
-                }
-            }
-        }
-
-        if (classesToFlush != null)
-        {
-            // Flush any query results from cache for these types
-            Iterator<Class> queryClsIter = classesToFlush.iterator();
-            while (queryClsIter.hasNext())
-            {
-                Class cls = queryClsIter.next();
-                ec.getNucleusContext().getStoreManager().getQueryManager().evictQueryResultsForType(cls);
-            }
-        }
-
-        return optimisticFailures;
-    }
-}
\ No newline at end of file

Deleted: platform/core/trunk/src/java/org/datanucleus/FlushProcess.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FlushProcess.java	2013-05-06 10:51:17 UTC (rev 16975)
+++ platform/core/trunk/src/java/org/datanucleus/FlushProcess.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -1,47 +0,0 @@
-/**********************************************************************
-Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus;
-
-import java.util.List;
-
-import org.datanucleus.exceptions.NucleusOptimisticException;
-import org.datanucleus.flush.OperationQueue;
-import org.datanucleus.state.ObjectProvider;
-import org.datanucleus.util.Localiser;
-
-/**
- * Representation of a persistence flush process.
- * Decides in what order the "dirty" objects/fields are to be processed in.
- */
-public interface FlushProcess
-{
-    /** Localisation utility for output messages */
-    static final Localiser LOCALISER = Localiser.getInstance("org.datanucleus.Localisation",
-        org.datanucleus.ClassConstants.NUCLEUS_CONTEXT_LOADER);
-
-    /**
-     * Execute the flush.
-     * @param ec ExecutionContext
-     * @param primaryOPs ObjectProviders that were made dirty by direct API calls. Cleared during this method
-     * @param secondaryOPs ObjectProviders that were made dirty by reachability. Cleared during this method
-     * @param opQueue Queue of operations
-     * @return Any optimistic exceptions during the deletes/inserts/updates
-     */
-    List<NucleusOptimisticException> execute(ExecutionContext ec, 
-        List<ObjectProvider> primaryOPs, List<ObjectProvider> secondaryOPs, OperationQueue opQueue);
-}
\ No newline at end of file

Copied: platform/core/trunk/src/java/org/datanucleus/flush/FlushNonReferential.java (from rev 16974, platform/core/trunk/src/java/org/datanucleus/FlushNonReferential.java)
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/flush/FlushNonReferential.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/flush/FlushNonReferential.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -0,0 +1,221 @@
+/**********************************************************************
+Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.flush;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.datanucleus.ExecutionContext;
+import org.datanucleus.exceptions.NucleusOptimisticException;
+import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.store.StorePersistenceHandler;
+import org.datanucleus.util.NucleusLogger;
+
+/**
+ * Flush method for cases where the datastore doesn't use referential integrity so we can send batches
+ * of deletes, then batches of inserts, then any updates to optimise the persistence.
+ */
+public class FlushNonReferential implements FlushProcess
+{
+    /* (non-Javadoc)
+     * @see org.datanucleus.FlushProcess#execute(org.datanucleus.ExecutionContext, java.util.List, java.util.List, org.datanucleus.flush.OperationQueue)
+     */
+    public List<NucleusOptimisticException> execute(ExecutionContext ec, List<ObjectProvider> primaryOPs, 
+        List<ObjectProvider> secondaryOPs, OperationQueue opQueue)
+    {
+        // Note that scoOperationQueue is not processed here since all datastores this is used with don't use backed SCOs
+
+        // Make copy of ObjectProviders so we don't have ConcurrentModification issues
+        Set<ObjectProvider> opsToFlush = new HashSet<ObjectProvider>();
+        if (primaryOPs != null)
+        {
+            opsToFlush.addAll(primaryOPs);
+            primaryOPs.clear();
+        }
+        if (secondaryOPs != null)
+        {
+            opsToFlush.addAll(secondaryOPs);
+            secondaryOPs.clear();
+        }
+
+        return flushDeleteInsertUpdateGrouped(opsToFlush, ec);
+    }
+
+    /**
+     * Method that does the flushing of the passed ObjectProviders, grouping them into all DELETEs, then all INSERTs,
+     * finally all UPDATEs. The StorePersistenceHandler will get calls to <i>deleteObjects</i>, <i>insertObjects</i>
+     * and <i>updateObject</i> (for each other one). Note that this is in a separate method to allow calls by
+     * other FlushProcesses that want to take advantage of the basic flush method without 
+     * @param opsToFlush The ObjectProviders to process
+     * @param ec ExecutionContext
+     * @return Any optimistic verification exceptions thrown during flush
+     */
+    public List<NucleusOptimisticException> flushDeleteInsertUpdateGrouped(Set<ObjectProvider> opsToFlush, ExecutionContext ec)
+    {
+        List<NucleusOptimisticException> optimisticFailures = null;
+
+        Set<Class> classesToFlush = null;
+        if (ec.getNucleusContext().getStoreManager().getQueryManager().getQueryResultsCache() != null)
+        {
+            classesToFlush = new HashSet();
+        }
+
+        Set<ObjectProvider> opsToDelete = new HashSet<ObjectProvider>();
+        Set<ObjectProvider> opsToInsert = new HashSet<ObjectProvider>();
+        Iterator<ObjectProvider> opIter = opsToFlush.iterator();
+        while (opIter.hasNext())
+        {
+            ObjectProvider op = opIter.next();
+            if (op.isEmbedded())
+            {
+                op.markAsFlushed(); // Embedded have nothing to flush since the owner manages it
+                opIter.remove();
+            }
+            else
+            {
+                if (classesToFlush != null)
+                {
+                    classesToFlush.add(op.getObject().getClass());
+                }
+                if (op.getLifecycleState().isNew() && !op.isFlushedToDatastore() && !op.isFlushedNew())
+                {
+                    // P_NEW and not yet flushed to datastore
+                    opsToInsert.add(op);
+                    opIter.remove();
+                }
+                else if (op.getLifecycleState().isDeleted() && !op.isFlushedToDatastore())
+                {
+                    if (!op.getLifecycleState().isNew())
+                    {
+                        // P_DELETED
+                        opsToDelete.add(op);
+                        opIter.remove();
+                    }
+                    else if (op.getLifecycleState().isNew() && op.isFlushedNew())
+                    {
+                        // P_NEW_DELETED already persisted
+                        opsToDelete.add(op);
+                        opIter.remove();
+                    }
+                }
+            }
+        }
+
+        if (NucleusLogger.PERSISTENCE.isDebugEnabled())
+        {
+            NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("010046", opsToDelete.size(), opsToInsert.size(), opsToFlush.size()));
+        }
+
+        StorePersistenceHandler persistenceHandler = ec.getStoreManager().getPersistenceHandler();
+        if (!opsToDelete.isEmpty())
+        {
+            // Perform preDelete - deleteAll - postDelete, and mark all ObjectProviders as flushed
+            // TODO This omits some parts of sm.internalDeletePersistent
+            for (ObjectProvider op : opsToDelete)
+            {
+                op.setFlushing(true);
+                ec.getCallbackHandler().preDelete(op.getObject());
+            }
+            try
+            {
+                persistenceHandler.deleteObjects(opsToDelete.toArray(new ObjectProvider[opsToDelete.size()]));
+            }
+            catch (NucleusOptimisticException noe)
+            {
+                optimisticFailures = new ArrayList();
+                Throwable[] nestedExcs = noe.getNestedExceptions();
+                if (nestedExcs != null && nestedExcs.length > 1)
+                {
+                    NucleusOptimisticException[] noes = (NucleusOptimisticException[])nestedExcs;
+                    for (int i=0;i<nestedExcs.length;i++)
+                    {
+                        optimisticFailures.add(noes[i]);
+                    }
+                }
+                else
+                {
+                    optimisticFailures.add(noe);
+                }
+            }
+            for (ObjectProvider op : opsToDelete)
+            {
+                ec.getCallbackHandler().postDelete(op.getObject());
+                op.setFlushedNew(false);
+                op.markAsFlushed();
+                op.setFlushing(false);
+            }
+        }
+
+        if (!opsToInsert.isEmpty())
+        {
+            // Perform preStore - insertAll - postStore, and mark all ObjectProviders as flushed
+            // TODO This omits some parts of sm.internalMakePersistent
+            for (ObjectProvider op : opsToInsert)
+            {
+                op.setFlushing(true);
+                ec.getCallbackHandler().preStore(op.getObject());
+                // TODO Make sure identity is set since user could have updated fields in preStore
+            }
+            persistenceHandler.insertObjects(opsToInsert.toArray(new ObjectProvider[opsToInsert.size()]));
+            for (ObjectProvider op : opsToInsert)
+            {
+                ec.getCallbackHandler().postStore(op.getObject());
+                op.setFlushedNew(true);
+                op.markAsFlushed();
+                op.setFlushing(false);
+                ec.putObjectIntoLevel1Cache(op); // Update the object in the cache(s) now that version/id are set
+            }
+        }
+
+        if (!opsToFlush.isEmpty())
+        {
+            // Objects to update
+            for (ObjectProvider op : opsToFlush)
+            {
+                try
+                {
+                    op.flush();
+                }
+                catch (NucleusOptimisticException oe)
+                {
+                    if (optimisticFailures == null)
+                    {
+                        optimisticFailures = new ArrayList();
+                    }
+                    optimisticFailures.add(oe);
+                }
+            }
+        }
+
+        if (classesToFlush != null)
+        {
+            // Flush any query results from cache for these types
+            Iterator<Class> queryClsIter = classesToFlush.iterator();
+            while (queryClsIter.hasNext())
+            {
+                Class cls = queryClsIter.next();
+                ec.getNucleusContext().getStoreManager().getQueryManager().evictQueryResultsForType(cls);
+            }
+        }
+        
+        return optimisticFailures;
+    }
+}
\ No newline at end of file

Copied: platform/core/trunk/src/java/org/datanucleus/flush/FlushOrdered.java (from rev 16974, platform/core/trunk/src/java/org/datanucleus/FlushOrdered.java)
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/flush/FlushOrdered.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/flush/FlushOrdered.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -0,0 +1,161 @@
+/**********************************************************************
+Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.flush;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.datanucleus.ExecutionContext;
+import org.datanucleus.exceptions.NucleusOptimisticException;
+import org.datanucleus.flush.FlushProcess;
+import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.util.NucleusLogger;
+
+/**
+ * Flush process that processes the objects in the order that they became dirty.
+ * If a datastore uses referential integrity this is typically the best way of maintaining a valid update process.
+ */
+public class FlushOrdered implements FlushProcess
+{
+    /* (non-Javadoc)
+     * @see org.datanucleus.FlushProcess#execute(org.datanucleus.ExecutionContext, java.util.List, java.util.List, org.datanucleus.flush.OperationQueue)
+     */
+    public List<NucleusOptimisticException> execute(ExecutionContext ec, List<ObjectProvider> primaryOPs, 
+        List<ObjectProvider> secondaryOPs, OperationQueue opQueue)
+    {
+        // Note that scoOperationQueue is not processed directly here, but instead will be processed
+        // via callbacks from the persistence of other objects
+
+        List<NucleusOptimisticException> optimisticFailures = null;
+
+        // Make copy of ObjectProviders so we don't have ConcurrentModification issues
+        Object[] toFlushPrimary = null;
+        Object[] toFlushSecondary = null;
+        try
+        {
+            if (ec.getMultithreaded()) // Why lock here? should be on overall flush
+            {
+                ec.getLock().lock();
+            }
+
+            if (primaryOPs != null)
+            {
+                toFlushPrimary = primaryOPs.toArray();
+                primaryOPs.clear();
+            }
+            if (secondaryOPs != null)
+            {
+                toFlushSecondary = secondaryOPs.toArray();
+                secondaryOPs.clear();
+            }
+        }
+        finally
+        {
+            if (ec.getMultithreaded())
+            {
+                ec.getLock().unlock();
+            }
+        }
+
+        if (NucleusLogger.PERSISTENCE.isDebugEnabled())
+        {
+            int total = 0;
+            if (toFlushPrimary != null)
+            {
+                total += toFlushPrimary.length;
+            }
+            if (toFlushSecondary != null)
+            {
+                total += toFlushSecondary.length;
+            }
+            NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("010003", total));
+        }
+
+        Set<Class> classesToFlush = null;
+        if (ec.getNucleusContext().getStoreManager().getQueryManager().getQueryResultsCache() != null)
+        {
+            classesToFlush = new HashSet();
+        }
+
+        // a). primary dirty objects
+        if (toFlushPrimary != null)
+        {
+            for (int i = 0; i < toFlushPrimary.length; i++)
+            {
+                ObjectProvider op = (ObjectProvider) toFlushPrimary[i];
+                try
+                {
+                    op.flush();
+                    if (classesToFlush != null)
+                    {
+                        classesToFlush.add(op.getObject().getClass());
+                    }
+                }
+                catch (NucleusOptimisticException oe)
+                {
+                    if (optimisticFailures == null)
+                    {
+                        optimisticFailures = new ArrayList();
+                    }
+                    optimisticFailures.add(oe);
+                }
+            }
+        }
+
+        // b). secondary dirty objects
+        if (toFlushSecondary != null)
+        {
+            for (int i = 0; i < toFlushSecondary.length; i++)
+            {
+                ObjectProvider sm = (ObjectProvider) toFlushSecondary[i];
+                try
+                {
+                    sm.flush();
+                    if (classesToFlush != null)
+                    {
+                        classesToFlush.add(sm.getObject().getClass());
+                    }
+                }
+                catch (NucleusOptimisticException oe)
+                {
+                    if (optimisticFailures == null)
+                    {
+                        optimisticFailures = new ArrayList();
+                    }
+                    optimisticFailures.add(oe);
+                }
+            }
+        }
+
+        if (classesToFlush != null)
+        {
+            // Flush any query results from cache for these types
+            Iterator<Class> queryClsIter = classesToFlush.iterator();
+            while (queryClsIter.hasNext())
+            {
+                Class cls = queryClsIter.next();
+                ec.getNucleusContext().getStoreManager().getQueryManager().evictQueryResultsForType(cls);
+            }
+        }
+
+        return optimisticFailures;
+    }
+}
\ No newline at end of file

Copied: platform/core/trunk/src/java/org/datanucleus/flush/FlushProcess.java (from rev 16974, platform/core/trunk/src/java/org/datanucleus/FlushProcess.java)
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/flush/FlushProcess.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/flush/FlushProcess.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -0,0 +1,47 @@
+/**********************************************************************
+Copyright (c) 2013 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.flush;
+
+import java.util.List;
+
+import org.datanucleus.ExecutionContext;
+import org.datanucleus.exceptions.NucleusOptimisticException;
+import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.util.Localiser;
+
+/**
+ * Representation of a persistence flush process.
+ * Decides in what order the "dirty" objects/fields are to be processed in.
+ */
+public interface FlushProcess
+{
+    /** Localisation utility for output messages */
+    static final Localiser LOCALISER = Localiser.getInstance("org.datanucleus.Localisation",
+        org.datanucleus.ClassConstants.NUCLEUS_CONTEXT_LOADER);
+
+    /**
+     * Execute the flush.
+     * @param ec ExecutionContext
+     * @param primaryOPs ObjectProviders that were made dirty by direct API calls. Cleared during this method
+     * @param secondaryOPs ObjectProviders that were made dirty by reachability. Cleared during this method
+     * @param opQueue Queue of operations
+     * @return Any optimistic exceptions during the deletes/inserts/updates
+     */
+    List<NucleusOptimisticException> execute(ExecutionContext ec, 
+        List<ObjectProvider> primaryOPs, List<ObjectProvider> secondaryOPs, OperationQueue opQueue);
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java	2013-05-06 10:51:17 UTC (rev 16975)
+++ platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -31,14 +31,14 @@
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ExecutionContext;
-import org.datanucleus.FlushNonReferential;
-import org.datanucleus.FlushProcess;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.PropertyNames;
 import org.datanucleus.Transaction;
 import org.datanucleus.api.ApiAdapter;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.flush.FlushNonReferential;
+import org.datanucleus.flush.FlushProcess;
 import org.datanucleus.identity.OID;
 import org.datanucleus.identity.SCOID;
 import org.datanucleus.metadata.AbstractClassMetaData;

Modified: platform/core/trunk/src/java/org/datanucleus/store/StoreManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/StoreManager.java	2013-05-06 10:51:17 UTC (rev 16975)
+++ platform/core/trunk/src/java/org/datanucleus/store/StoreManager.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -25,11 +25,11 @@
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ExecutionContext;
-import org.datanucleus.FlushProcess;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.api.ApiAdapter;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.flush.FlushProcess;
 import org.datanucleus.identity.OID;
 import org.datanucleus.identity.SCOID;
 import org.datanucleus.metadata.AbstractClassMetaData;

Modified: platform/core/trunk/src/java/org/datanucleus/store/federation/FederatedStoreManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/federation/FederatedStoreManager.java	2013-05-06 10:51:17 UTC (rev 16975)
+++ platform/core/trunk/src/java/org/datanucleus/store/federation/FederatedStoreManager.java	2013-05-06 10:54:56 UTC (rev 16976)
@@ -29,12 +29,12 @@
 import org.datanucleus.ClassConstants;
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ExecutionContext;
-import org.datanucleus.FlushProcess;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.PersistenceConfiguration;
 import org.datanucleus.PropertyNames;
 import org.datanucleus.api.ApiAdapter;
 import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.flush.FlushProcess;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.SequenceMetaData;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.