DataNucleus

Revision: 2767
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=2767&view=rev
Author:   andy_jefferson
Date:     2008-08-25 09:24:17 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
[NUCDBFO-23] Start to use db4o API 7.0 or later

Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2008-08-25 09:17:11 UTC (rev 2766)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2008-08-25 09:24:17 UTC (rev 2767)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
 Bundle-Version: 1.1.0.m1
 Bundle-Localization: plugin
-Require-Bundle: org.datanucleus;bundle-version="[1.1.0.m1,2.0)",
+Require-Bundle: org.datanucleus;bundle-version="[1.1.0.m1, 2.0)",
  org.datanucleus.sql4o;bundle-version="[1.0.0.final, 2.0)"
 Bundle-Vendor: DataNucleus
 Import-Package: com.db4o;resolution:=optional,

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2008-08-25 09:17:11 UTC (rev 2766)
+++ platform/store.db4o/trunk/pom.xml	2008-08-25 09:24:17 UTC (rev 2767)
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[1.1-SNAPSHOT, 1.2)</version>
+            <version>[1.1-SNAPSHOT, 2.0)</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>db4o</groupId>
             <artifactId>db4o</artifactId>
-            <version>7.2.54.11278-java1.2</version>
+            <version>[7.0,)</version>
         </dependency>
 
         <!-- Test dependencies -->

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2008-08-25 09:17:11 UTC (rev 2766)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2008-08-25 09:24:17 UTC (rev 2767)
@@ -145,7 +145,7 @@
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("DB4O.Insert.Start", 
                     StringUtils.toJVMIDString(sm.getObject()), sm.getInternalObjectId()));
             }
-            cont.ext().set(sm.getObject(), 1);
+            cont.ext().store(sm.getObject(), 1);
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("DB4O.ExecutionTime", 
@@ -293,7 +293,7 @@
             }
 
             // Do the update in DB4O
-            cont.ext().set(sm.getObject(), 1);
+            cont.ext().store(sm.getObject(), 1);
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("DB4O.ExecutionTime", 
@@ -543,7 +543,7 @@
 
                 // Use this template object to get the real object with these key values from DB4O
                 ObjectContainer cont = (ObjectContainer)storeMgr.getConnection(om).getConnection();
-                ObjectSet objectSet = cont.ext().get(pc);
+                ObjectSet objectSet = cont.queryByExample(pc);
                 pc = objectSet.next();
                 StateManager pcSM = om.findStateManager(pc);
                 if (pcSM == null)
@@ -601,7 +601,7 @@
             Object referenceObject = referenceSM.getObject();
 
             // Use QBE to get any object with these key values from DB4O
-            ObjectSet objectSet = cont.ext().get(referenceObject);
+            ObjectSet objectSet = cont.queryByExample(referenceObject);
             if (objectSet.size() > 0)
             {
                 isStored = true;

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java	2008-08-25 09:17:11 UTC (rev 2766)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java	2008-08-25 09:24:17 UTC (rev 2767)
@@ -139,7 +139,7 @@
         // Find the NucleusSequence object in DB4O
         NucleusSequence seq = null;
         NucleusSequence baseSeq = new NucleusSequence(sequenceName);
-        ObjectSet set = container.get(baseSeq);
+        ObjectSet set = container.queryByExample(baseSeq);
         if (set != null && set.size() == 1)
         {
             seq = (NucleusSequence)set.next();
@@ -169,7 +169,7 @@
         }
 
         // Update the NucleusSequence object in DB4O
-        container.set(seq);
+        container.store(seq);
 
         return new PoidBlock(ids);
     }


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

Revision: 3495
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3495&view=rev
Author:   andy_jefferson
Date:     2008-10-17 09:21:36 +0000 (Fri, 17 Oct 2008)

Log Message:
-----------
[NUCACCESS-26] Include db4o 7.4 java5 jar

Modified Paths:
--------------
    platform/store.db4o/trunk/pom.xml
    platform/store.db4o/trunk/project.xml

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2008-10-17 09:19:33 UTC (rev 3494)
+++ platform/store.db4o/trunk/pom.xml	2008-10-17 09:21:36 UTC (rev 3495)
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>db4o</groupId>
             <artifactId>db4o</artifactId>
-            <version>7.2.54.11278-java1.2</version>
+            <version>7.4.63.11890-java5</version>
         </dependency>
     </dependencies>
 

Modified: platform/store.db4o/trunk/project.xml
===================================================================
--- platform/store.db4o/trunk/project.xml	2008-10-17 09:19:33 UTC (rev 3494)
+++ platform/store.db4o/trunk/project.xml	2008-10-17 09:21:36 UTC (rev 3495)
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>db4o</groupId>
             <artifactId>db4o</artifactId>
-            <version>7.2.54.11278-java1.2</version>
+            <version>7.4.63.11890-java5</version>
             <url>http://www.db4o.com/</url>
         </dependency>
 


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

Revision: 3592
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3592&view=rev
Author:   andy_jefferson
Date:     2008-10-23 11:34:48 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
[NUCCORE-138] Rename poid package

Modified Paths:
--------------
    platform/store.db4o/trunk/plugin.xml

Added Paths:
-----------
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementGenerator.java

Removed Paths:
-------------
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java

Modified: platform/store.db4o/trunk/plugin.xml
===================================================================
--- platform/store.db4o/trunk/plugin.xml	2008-10-23 11:33:10 UTC (rev 3591)
+++ platform/store.db4o/trunk/plugin.xml	2008-10-23 11:34:48 UTC (rev 3592)
@@ -45,9 +45,9 @@
 
     <!-- VALUE GENERATORS -->
     <extension point="org.datanucleus.store_valuegenerator">
-        <valuegenerator name="increment" class-name="org.datanucleus.store.db4o.valuegenerator.DB4OIncrementPoidGenerator"
+        <valuegenerator name="increment" class-name="org.datanucleus.store.db4o.valuegenerator.DB4OIncrementGenerator"
             datastore="db4o"/>
-        <valuegenerator name="sequence" class-name="org.datanucleus.store.db4o.valuegenerator.DB4OIncrementPoidGenerator"
+        <valuegenerator name="sequence" class-name="org.datanucleus.store.db4o.valuegenerator.DB4OIncrementGenerator"
             datastore="db4o"/>
     </extension>
 

Copied: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementGenerator.java (from rev 3591, platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java)
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementGenerator.java	                        (rev 0)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementGenerator.java	2008-10-23 11:34:48 UTC (rev 3592)
@@ -0,0 +1,176 @@
+/**********************************************************************
+Copyright (c) 2006 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.store.db4o.valuegenerator;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.valuegenerator.AbstractDatastoreGenerator;
+import org.datanucleus.store.valuegenerator.ValueGenerationBlock;
+import org.datanucleus.store.valuegenerator.ValueGenerationException;
+import org.datanucleus.util.NucleusLogger;
+import org.datanucleus.util.Localiser;
+
+import com.db4o.ObjectContainer;
+import com.db4o.ObjectSet;
+
+/**
+ * Value generator for DB4O that provides increment/sequence like generation.
+ * Utilises the persistence of objects of NucleusSequence. Each objects stores the sequence class/field name
+ * and the current value of that sequence.
+ */
+public class DB4OIncrementGenerator extends AbstractDatastoreGenerator
+{
+    /** Localiser for messages. */
+    protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
+        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
+
+    /** The DB4O ObjectContainer to use for generating values */
+    private ObjectContainer container = null;
+
+    /** Name of the sequence that we are storing values under (name of the class/field). */
+    private final String sequenceName;
+
+    /**
+     * Constructor.
+     * @param name Symbolic name for this generator
+     * @param props Properties defining the behaviour of this generator
+     */
+    public DB4OIncrementGenerator(String name, Properties props)
+    {
+        super(name, props);
+        allocationSize = 5;
+
+        // TODO Check these names and what we want to use for DB4O (classname or fieldname)
+        if (properties.getProperty("sequence-name") != null)
+        {
+            // Specified sequence-name so use that
+            sequenceName = properties.getProperty("sequence-name");
+        }
+        else if (properties.getProperty("field-name") != null)
+        {
+            // Use field name as the sequence name so we have one sequence per field on the class
+            sequenceName = properties.getProperty("field-name");
+        }
+        else
+        {
+            // Use actual class name as the sequence name so we have one sequence per class
+            sequenceName = properties.getProperty("class-name");
+        }
+    }
+
+    /**
+     * Get a new PoidBlock with the specified number of ids.
+     * @param number The number of additional ids required
+     * @return the PoidBlock
+     */
+    protected ValueGenerationBlock obtainPoidBlock(int number)
+    {
+        ValueGenerationBlock block = null;
+
+        // Try getting the block
+        try
+        {
+            container = (ObjectContainer)connectionProvider.retrieveConnection().getConnection();
+
+            try
+            {
+                if (number < 0)
+                {
+                    block = reserveBlock();
+                }
+                else
+                {
+                    block = reserveBlock(number);
+                }
+            }
+            catch (ValueGenerationException poidex)
+            {
+                NucleusLogger.POID.info(LOCALISER.msg("040003", poidex.getMessage()));
+                throw poidex;
+            }
+            catch (RuntimeException ex)
+            {
+                //exceptions cached by the poid should be enclosed in PoidException
+                //when the exceptions are not catched exception by poid, we give a new try
+                //in creating the repository
+                NucleusLogger.POID.info(LOCALISER.msg("040003", ex.getMessage()));
+                throw ex;
+            }
+        }
+        finally
+        {
+            if (container != null)
+            {
+                connectionProvider.releaseConnection();
+                container = null;
+            }
+        }
+
+        return block;
+    }
+
+    /**
+     * Method to reserve a block of "size" identities.
+     * @param size Block size
+     * @return The reserved block
+     */
+    protected ValueGenerationBlock reserveBlock(long size)
+    {
+        List ids = new ArrayList();
+
+        // Find the NucleusSequence object in DB4O
+        NucleusSequence seq = null;
+        NucleusSequence baseSeq = new NucleusSequence(sequenceName);
+        ObjectSet set = container.queryByExample(baseSeq);
+        if (set != null && set.size() == 1)
+        {
+            seq = (NucleusSequence)set.next();
+        }
+
+        Long nextVal = null;
+        if (seq == null)
+        {
+            seq = baseSeq;
+            nextVal = new Long(1);
+            seq.setCurrentValue(1);
+        }
+        else
+        {
+            nextVal = new Long(seq.getCurrentValue());
+        }
+        seq.incrementCurrentValue(allocationSize);
+        if (NucleusLogger.DATASTORE.isDebugEnabled())
+        {
+            NucleusLogger.DATASTORE.debug(LOCALISER_DB4O.msg("DB4O.ValueGenerator.UpdatingSequence", sequenceName, "" + seq.getCurrentValue()));
+        }
+
+        for (int i=0; i<size; i++)
+        {
+            ids.add(nextVal);
+            nextVal = new Long(nextVal.longValue()+1);
+        }
+
+        // Update the NucleusSequence object in DB4O
+        container.store(seq);
+
+        return new ValueGenerationBlock(ids);
+    }
+}
\ No newline at end of file

Deleted: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java	2008-10-23 11:33:10 UTC (rev 3591)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementPoidGenerator.java	2008-10-23 11:34:48 UTC (rev 3592)
@@ -1,176 +0,0 @@
-/**********************************************************************
-Copyright (c) 2006 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.store.db4o.valuegenerator;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.datanucleus.store.db4o.DB4OManager;
-import org.datanucleus.store.valuegenerator.AbstractDatastoreGenerator;
-import org.datanucleus.store.valuegenerator.ValueGenerationBlock;
-import org.datanucleus.store.valuegenerator.ValueGenerationException;
-import org.datanucleus.util.NucleusLogger;
-import org.datanucleus.util.Localiser;
-
-import com.db4o.ObjectContainer;
-import com.db4o.ObjectSet;
-
-/**
- * Value generator for DB4O that provides increment/sequence like generation.
- * Utilises the persistence of objects of NucleusSequence. Each objects stores the sequence class/field name
- * and the current value of that sequence.
- */
-public class DB4OIncrementPoidGenerator extends AbstractDatastoreGenerator
-{
-    /** Localiser for messages. */
-    protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
-
-    /** The DB4O ObjectContainer to use for generating values */
-    private ObjectContainer container = null;
-
-    /** Name of the sequence that we are storing values under (name of the class/field). */
-    private final String sequenceName;
-
-    /**
-     * Constructor.
-     * @param name Symbolic name for this generator
-     * @param props Properties defining the behaviour of this generator
-     */
-    public DB4OIncrementPoidGenerator(String name, Properties props)
-    {
-        super(name, props);
-        allocationSize = 5;
-
-        // TODO Check these names and what we want to use for DB4O (classname or fieldname)
-        if (properties.getProperty("sequence-name") != null)
-        {
-            // Specified sequence-name so use that
-            sequenceName = properties.getProperty("sequence-name");
-        }
-        else if (properties.getProperty("field-name") != null)
-        {
-            // Use field name as the sequence name so we have one sequence per field on the class
-            sequenceName = properties.getProperty("field-name");
-        }
-        else
-        {
-            // Use actual class name as the sequence name so we have one sequence per class
-            sequenceName = properties.getProperty("class-name");
-        }
-    }
-
-    /**
-     * Get a new PoidBlock with the specified number of ids.
-     * @param number The number of additional ids required
-     * @return the PoidBlock
-     */
-    protected ValueGenerationBlock obtainPoidBlock(int number)
-    {
-        ValueGenerationBlock block = null;
-
-        // Try getting the block
-        try
-        {
-            container = (ObjectContainer)connectionProvider.retrieveConnection().getConnection();
-
-            try
-            {
-                if (number < 0)
-                {
-                    block = reserveBlock();
-                }
-                else
-                {
-                    block = reserveBlock(number);
-                }
-            }
-            catch (ValueGenerationException poidex)
-            {
-                NucleusLogger.POID.info(LOCALISER.msg("040003", poidex.getMessage()));
-                throw poidex;
-            }
-            catch (RuntimeException ex)
-            {
-                //exceptions cached by the poid should be enclosed in PoidException
-                //when the exceptions are not catched exception by poid, we give a new try
-                //in creating the repository
-                NucleusLogger.POID.info(LOCALISER.msg("040003", ex.getMessage()));
-                throw ex;
-            }
-        }
-        finally
-        {
-            if (container != null)
-            {
-                connectionProvider.releaseConnection();
-                container = null;
-            }
-        }
-
-        return block;
-    }
-
-    /**
-     * Method to reserve a block of "size" identities.
-     * @param size Block size
-     * @return The reserved block
-     */
-    protected ValueGenerationBlock reserveBlock(long size)
-    {
-        List ids = new ArrayList();
-
-        // Find the NucleusSequence object in DB4O
-        NucleusSequence seq = null;
-        NucleusSequence baseSeq = new NucleusSequence(sequenceName);
-        ObjectSet set = container.queryByExample(baseSeq);
-        if (set != null && set.size() == 1)
-        {
-            seq = (NucleusSequence)set.next();
-        }
-
-        Long nextVal = null;
-        if (seq == null)
-        {
-            seq = baseSeq;
-            nextVal = new Long(1);
-            seq.setCurrentValue(1);
-        }
-        else
-        {
-            nextVal = new Long(seq.getCurrentValue());
-        }
-        seq.incrementCurrentValue(allocationSize);
-        if (NucleusLogger.DATASTORE.isDebugEnabled())
-        {
-            NucleusLogger.DATASTORE.debug(LOCALISER_DB4O.msg("DB4O.ValueGenerator.UpdatingSequence", sequenceName, "" + seq.getCurrentValue()));
-        }
-
-        for (int i=0; i<size; i++)
-        {
-            ids.add(nextVal);
-            nextVal = new Long(nextVal.longValue()+1);
-        }
-
-        // Update the NucleusSequence object in DB4O
-        container.store(seq);
-
-        return new ValueGenerationBlock(ids);
-    }
-}
\ 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: 4477
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4477&view=rev
Author:   andy_jefferson
Date:     2009-01-01 11:26:44 +0000 (Thu, 01 Jan 2009)

Log Message:
-----------
Bump versions. Use convenience method for whether to evaluate the query in-memory

Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JDOQLQuery.java

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2009-01-01 11:25:20 UTC (rev 4476)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2009-01-01 11:26:44 UTC (rev 4477)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
 Bundle-Version: 1.1.0.m4
 Bundle-Localization: plugin
-Require-Bundle: org.datanucleus;bundle-version="[1.1.0.m2, 2.0)",
+Require-Bundle: org.datanucleus;bundle-version="[1.1.0.m4, 2.0)",
  org.datanucleus.sql4o;bundle-version="[1.0.0, 2.0)";resolution:=optional
 Bundle-Vendor: DataNucleus
 Import-Package: com.db4o,

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2009-01-01 11:25:20 UTC (rev 4476)
+++ platform/store.db4o/trunk/pom.xml	2009-01-01 11:26:44 UTC (rev 4477)
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>sql4o</artifactId>
-            <version>[1.0-SNAPSHOT, 2.0)</version>
+            <version>[1.0.0, 2.0)</version>
             <optional>true</optional>
         </dependency>
         <dependency>

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JDOQLQuery.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JDOQLQuery.java	2009-01-01 11:25:20 UTC (rev 4476)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JDOQLQuery.java	2009-01-01 11:26:44 UTC (rev 4477)
@@ -86,9 +86,7 @@
             return Collections.EMPTY_LIST;
         }
 
-        Boolean inMemoryVal = getBooleanExtensionProperty("datanucleus.query.evaluateInMemory");
-        boolean inMemory = (inMemoryVal != null ? inMemoryVal.booleanValue() : false);
-
+        boolean inMemory = evaluateInMemory();
         ManagedConnection mconn = om.getStoreManager().getConnection(om);
         ObjectContainer cont = (ObjectContainer) mconn.getConnection();
         try


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

Revision: 4766
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4766&view=rev
Author:   andy_jefferson
Date:     2009-01-25 14:30:04 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
Compile using JDK1.5+

Modified Paths:
--------------
    platform/store.db4o/trunk/pom.xml
    platform/store.db4o/trunk/project.properties

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2009-01-25 14:29:02 UTC (rev 4765)
+++ platform/store.db4o/trunk/pom.xml	2009-01-25 14:30:04 UTC (rev 4766)
@@ -97,7 +97,10 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration/>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>

Modified: platform/store.db4o/trunk/project.properties
===================================================================
--- platform/store.db4o/trunk/project.properties	2009-01-25 14:29:02 UTC (rev 4765)
+++ platform/store.db4o/trunk/project.properties	2009-01-25 14:30:04 UTC (rev 4766)
@@ -15,8 +15,8 @@
 maven.compile.optimize=on
 maven.compile.verbose=off
 maven.compile.encoding=iso8859-1
-maven.compile.target=1.3
-maven.compile.source=1.3
+maven.compile.target=1.5
+maven.compile.source=1.5
 
 maven.jar.manifest=${basedir}/META-INF/MANIFEST.MF
 


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

Revision: 5688
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=5688&view=rev
Author:   andy_jefferson
Date:     2009-03-22 08:30:16 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
bump version

Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2009-03-22 08:29:18 UTC (rev 5687)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2009-03-22 08:30:16 UTC (rev 5688)
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus DB4O
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
-Bundle-Version: 1.1.0.release
+Bundle-Version: 1.1.1
 Bundle-Localization: plugin
-Require-Bundle: org.datanucleus;bundle-version="[1.1.0.m4, 2.0)",
+Require-Bundle: org.datanucleus;bundle-version="[1.1.1, 2.0)",
  org.datanucleus.sql4o;bundle-version="[1.0.0, 2.0)";resolution:=optional
 Bundle-Vendor: DataNucleus
 Import-Package: com.db4o,

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2009-03-22 08:29:18 UTC (rev 5687)
+++ platform/store.db4o/trunk/pom.xml	2009-03-22 08:30:16 UTC (rev 5688)
@@ -5,7 +5,7 @@
                       http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>1.1-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
     <artifactId>datanucleus-db4o</artifactId>
     <name>DataNucleus DB4O plugin</name>
     <description>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[1.1, 2.0)</version>
+            <version>[1.1.2, 2.0)</version>
             <scope>provided</scope>
         </dependency>
         <dependency>


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

Revision: 6993
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=6993&view=rev
Author:   andy_jefferson
Date:     2009-06-30 13:11:28 +0000 (Tue, 30 Jun 2009)

Log Message:
-----------
Move standard files into META-INF since that is their only role

Modified Paths:
--------------
    platform/store.db4o/trunk/pom.xml

Added Paths:
-----------
    platform/store.db4o/trunk/META-INF/LICENSE.txt
    platform/store.db4o/trunk/META-INF/NOTICE.txt
    platform/store.db4o/trunk/META-INF/README.txt

Removed Paths:
-------------
    platform/store.db4o/trunk/LICENSE.txt
    platform/store.db4o/trunk/NOTICE.txt
    platform/store.db4o/trunk/README.txt

Deleted: platform/store.db4o/trunk/LICENSE.txt
===================================================================
--- platform/store.db4o/trunk/LICENSE.txt	2009-06-30 13:10:19 UTC (rev 6992)
+++ platform/store.db4o/trunk/LICENSE.txt	2009-06-30 13:11:28 UTC (rev 6993)
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2008-2008 DataNucleus
-
-   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.

Copied: platform/store.db4o/trunk/META-INF/LICENSE.txt (from rev 6763, platform/store.db4o/trunk/LICENSE.txt)
===================================================================
--- platform/store.db4o/trunk/META-INF/LICENSE.txt	                        (rev 0)
+++ platform/store.db4o/trunk/META-INF/LICENSE.txt	2009-06-30 13:11:28 UTC (rev 6993)
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2008-2008 DataNucleus
+
+   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.

Copied: platform/store.db4o/trunk/META-INF/NOTICE.txt (from rev 6763, platform/store.db4o/trunk/NOTICE.txt)
===================================================================
--- platform/store.db4o/trunk/META-INF/NOTICE.txt	                        (rev 0)
+++ platform/store.db4o/trunk/META-INF/NOTICE.txt	2009-06-30 13:11:28 UTC (rev 6993)
@@ -0,0 +1,20 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the DataNucleus distribution.        ==
+=========================================================================
+
+===================================================================
+This product includes software developed by many individuals,
+including the following:
+===================================================================
+Andy Jefferson
+Marcel Wirth
+Erik Bengtson
+
+
+===================================================================
+This product has included contributions from some individuals,
+including the following:
+===================================================================
+Xuan Baldauf
+Joe Batt

Copied: platform/store.db4o/trunk/META-INF/README.txt (from rev 6763, platform/store.db4o/trunk/README.txt)
===================================================================
--- platform/store.db4o/trunk/META-INF/README.txt	                        (rev 0)
+++ platform/store.db4o/trunk/META-INF/README.txt	2009-06-30 13:11:28 UTC (rev 6993)
@@ -0,0 +1,5 @@
+DB4O
+====
+This project provides support for persistence to DB4O datastores.
+
+This project is licensed by the Apache 2 license which you should have received with this.

Deleted: platform/store.db4o/trunk/NOTICE.txt
===================================================================
--- platform/store.db4o/trunk/NOTICE.txt	2009-06-30 13:10:19 UTC (rev 6992)
+++ platform/store.db4o/trunk/NOTICE.txt	2009-06-30 13:11:28 UTC (rev 6993)
@@ -1,20 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the DataNucleus distribution.        ==
-=========================================================================
-
-===================================================================
-This product includes software developed by many individuals,
-including the following:
-===================================================================
-Andy Jefferson
-Marcel Wirth
-Erik Bengtson
-
-
-===================================================================
-This product has included contributions from some individuals,
-including the following:
-===================================================================
-Xuan Baldauf
-Joe Batt

Deleted: platform/store.db4o/trunk/README.txt
===================================================================
--- platform/store.db4o/trunk/README.txt	2009-06-30 13:10:19 UTC (rev 6992)
+++ platform/store.db4o/trunk/README.txt	2009-06-30 13:11:28 UTC (rev 6993)
@@ -1,5 +0,0 @@
-DB4O
-====
-This project provides support for persistence to DB4O datastores.
-
-This project is licensed by the Apache 2 license which you should have received with this.

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2009-06-30 13:10:19 UTC (rev 6992)
+++ platform/store.db4o/trunk/pom.xml	2009-06-30 13:11:28 UTC (rev 6993)
@@ -87,12 +87,6 @@
                 <targetPath>META-INF</targetPath>
                 <includes>
                     <include>MANIFEST.MF</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>${basedir}</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
                     <include>LICENSE.txt</include>
                     <include>NOTICE.txt</include>
                     <include>README.txt</include>


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

Revision: 7087
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=7087&view=rev
Author:   andy_jefferson
Date:     2009-07-15 14:23:31 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
2.0

Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2009-07-15 14:22:12 UTC (rev 7086)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2009-07-15 14:23:31 UTC (rev 7087)
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus DB4O
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
-Bundle-Version: 1.1.2
+Bundle-Version: 2.0.0.m1
 Bundle-Localization: plugin
-Require-Bundle: org.datanucleus;bundle-version="1.1.4",
+Require-Bundle: org.datanucleus;bundle-version="2.0.0.m1",
  org.datanucleus.sql4o;bundle-version="1.0";resolution:=optional
 Bundle-Vendor: DataNucleus
 Import-Package: com.db4o,

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2009-07-15 14:22:12 UTC (rev 7086)
+++ platform/store.db4o/trunk/pom.xml	2009-07-15 14:23:31 UTC (rev 7087)
@@ -5,7 +5,7 @@
                       http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>1.1.2</version>
+	<version>2.0.0-SNAPSHOT</version>
     <artifactId>datanucleus-db4o</artifactId>
     <name>DataNucleus DB4O plugin</name>
     <description>
@@ -37,13 +37,13 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>[1.1.1, )</version>
+            <version>[1.9, )</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>sql4o</artifactId>
-            <version>[1.0.0, 2.0)</version>
+            <version>[1.0.0, )</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>


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

Revision: 7174
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=7174&view=rev
Author:   andy_jefferson
Date:     2009-07-17 15:16:13 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
Consistent namings

Modified Paths:
--------------
    platform/store.db4o/trunk/plugin.xml
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/ConnectionFactoryImpl.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OExtent.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OUtils.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/exceptions/ObjectNotActiveException.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/ActivationFieldManager.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/AssignStateManagerFieldManager.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JDOQLQuery.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JPQLQuery.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/NativeQuery.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/QueryToSODAMapper.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/SQLQuery.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/SQLQueryResult.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementGenerator.java

Added Paths:
-----------
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java

Removed Paths:
-------------
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OManager.java

Modified: platform/store.db4o/trunk/plugin.xml
===================================================================
--- platform/store.db4o/trunk/plugin.xml	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/plugin.xml	2009-07-17 15:16:13 UTC (rev 7174)
@@ -20,7 +20,7 @@
 <plugin id="org.datanucleus.store.db4o" name="DataNucleus DB4O" provider-name="DataNucleus">
     <!-- STORE MANAGER -->
     <extension point="org.datanucleus.store_manager">
-        <store-manager class-name="org.datanucleus.store.db4o.DB4OManager" url-key="db4o" key="db4o"/>
+        <store-manager class-name="org.datanucleus.store.db4o.DB4OStoreManager" url-key="db4o" key="db4o"/>
     </extension>
 
     <!-- PERSISTENCE PROPERTIES -->

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/ConnectionFactoryImpl.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/ConnectionFactoryImpl.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/ConnectionFactoryImpl.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -86,7 +86,7 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
+        "org.datanucleus.store.db4o.Localisation", DB4OStoreManager.class.getClassLoader());
 
     /** Use embedded server mode. */
     private boolean db4oUseEmbeddedServer = false;
@@ -397,7 +397,7 @@
                     objectContainerByObjectManager.put(om, conn);
 
                     // Register the ObjectContainer as active for this StoreManager
-                    ((DB4OManager) om.getStoreManager()).registerObjectContainer((ObjectContainer)conn);
+                    ((DB4OStoreManager) om.getStoreManager()).registerObjectContainer((ObjectContainer)conn);
                 }
             }
             return conn;
@@ -427,7 +427,7 @@
                 // Deregister the ObjectContainer for this StoreManager
                 if (om != null)
                 {
-                    ((DB4OManager) om.getStoreManager()).deregisterObjectContainer((ObjectContainer)conn);
+                    ((DB4OStoreManager) om.getStoreManager()).deregisterObjectContainer((ObjectContainer)conn);
                 }
                 conn = null;
             }

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OExtent.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OExtent.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OExtent.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -47,7 +47,7 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER_DB4O = Localiser.getInstance("org.datanucleus.store.db4o.Localisation",
-        DB4OManager.class.getClassLoader());
+        DB4OStoreManager.class.getClassLoader());
 
     /** Set of iterators created by this Extent. */
     private Set iterators = new HashSet();
@@ -187,7 +187,7 @@
             ObjectContainer container = (ObjectContainer) mconn.getConnection();
             try
             {
-                DB4OUtils.prepareDB4OObjectForUse(obj, om, container, cmd, (DB4OManager)om.getStoreManager());
+                DB4OUtils.prepareDB4OObjectForUse(obj, om, container, cmd, (DB4OStoreManager)om.getStoreManager());
             }
             finally
             {

Deleted: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OManager.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OManager.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OManager.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -1,487 +0,0 @@
-/**********************************************************************
-Copyright (c) 2006 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:
-2007 Xuan Baldauf - Major improvements in the way DB4O is accessed. See CORE-3272
-2007 Xuan Baldauf - Simplified and optimized the access of the DB4O database. Previously, for every access, a new
-    database connection was made, and the old database connection was flushed, resulting in inferior performance.
-2007 Xuan Baldauf - Use DatastoreUniqueOID to save memory
-2007 Andy Jefferson - removed numerous pointless "if (true)" lines that should not be in CVS
-    ...
-**********************************************************************/
-package org.datanucleus.store.db4o;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.OMFContext;
-import org.datanucleus.ObjectManager;
-import org.datanucleus.PersistenceConfiguration;
-import org.datanucleus.StateManager;
-import org.datanucleus.exceptions.NucleusException;
-import org.datanucleus.identity.OIDFactory;
-import org.datanucleus.metadata.AbstractClassMetaData;
-import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.IdentityStrategy;
-import org.datanucleus.metadata.IdentityType;
-import org.datanucleus.store.Extent;
-import org.datanucleus.store.StoreData;
-import org.datanucleus.store.exceptions.NoExtentException;
-import org.datanucleus.util.NucleusLogger;
-import org.datanucleus.util.Localiser;
-import org.datanucleus.util.StringUtils;
-
-import org.datanucleus.store.AbstractStoreManager;
-
-import com.db4o.Db4o;
-import com.db4o.ObjectContainer;
-import com.db4o.config.Configuration;
-import com.db4o.config.ObjectClass;
-import com.db4o.config.ObjectField;
-
-/**
- * Store Manager for DB4O (http://www.db4o.com).
- * <p>
- * DataNucleus will select this StoreManager with URLs of the form "db4o:...".
- * Support for DB4O is for the following URLs
- * <ul>
- * <li>db4o:{filename} - uses a local DB4O database in the named file (no username/password needed)</li>
- * <li>db4o:server:{filename} - embedded DB4O server in the named file (no username/password needed)</li>
- * <li>db4o:{hostname}:{port} - uses a remote DB4O database with the specified username/password</li>
- * <ul>
- * These URLs are specific to our support since DB4O doesn't use URLs to define the datastore.
- * </p>
- * <h3>Object Activation and Field Loading</h3>
- * <p>
- * DB4O provides methods to hand out memory versions of the datastore objects. Each object has to be
- * "activated" to have its values accessible. Similarly the object can be "deactivated" when it is
- * no longer needed (freeing up resources, and the link to the disk object). When we retrieve an object
- * from DB4O it activates the object. This makes all fields accessible. If however one of the fields is
- * a PC object (or collection, or map, or array etc) that object itself is not activated. Consequently
- * all fields are accessible from the start (unlike with RDBMS), but the StateManager manages the list
- * of fields that are considered "loaded", and this is initially just those in the DFG (even though others
- * are available). When the user accesses one of these "not-loaded" fields DB4OManager.fetchObject is called
- * and that field is marked as loaded (if it is a SCO mutable it is wrapped, and if it is a PC object it
- * has a StateManager connected and is activated).
- * </p>
- * <h3>Persistence</h3>
- * <p>
- * Each object is persisted on its own, and we dont use DB4O's internal cascade mechanism. Instead
- * the DB4OManager.insertObject, or DB4OManager.updateObject methods are called for each object that
- * is to be persisted/updated. Each call to insertObject/updateObject provides reachability by use
- * of PersistFieldManager.
- * </p>
- * <h3>Deletion</h3>
- * <p>
- * Currently objects are deleted using DB4O's internal cascade mechanism. 
- * </p>
- * <h3>Transactions and Connections</h3>
- * <p>
- * Refer to ConnectionFactoryImpl. In simple terms each ObjectManager has a DB4O ObjectContainer associated
- * with it, and this is retained until the end of life of the ObjectManager. With DB4O in server mode this
- * allows use of multiple PMs on the same underlying datastore. With DB4O in file mode you can only
- * have one PM operating on the same underlying datastore at once. This is a DB4O limitation rather than ours.
- * </p>
- */
-public class DB4OManager extends AbstractStoreManager
-{
-    /** Localiser for messages. */
-    protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
-
-    /** 
-     * Collection of the currently active ObjectContainers.
-     * Used for providing class mapping information when they are found.
-     */
-    private Set activeObjectContainers = new HashSet();
-
-    /**
-     * Constructor for a new DB4O StoreManager. 
-     * Stores the basic information required for the datastore management.
-     * @param clr the ClassLoaderResolver
-     * @param omfContext The corresponding ObjectManagerFactory omfContext.
-     */
-    public DB4OManager(ClassLoaderResolver clr, OMFContext omfContext)
-    {
-        super("db4o", clr, omfContext);
-
-        PersistenceConfiguration conf = omfContext.getPersistenceConfiguration();
-
-        // Use unique datastore-identity ids
-        conf.setProperty("datanucleus.datastoreIdentityType", "unique");
-
-        // Log the manager configuration
-        logConfiguration();
-
-        // Handler for persistence process
-        persistenceHandler = new DB4OPersistenceHandler(this);
-
-        // Make sure transactional connection factory has listener for closing object container
-        omfContext.addObjectManagerListener(new ObjectManager.ObjectManagerListener()
-        {
-            public void objectManagerPreClose(ObjectManager om)
-            {
-                // Close any ObjectContainer for this ObjectManager
-                ConnectionFactoryImpl cf = 
-                    (ConnectionFactoryImpl)connectionMgr.lookupConnectionFactory(txConnectionFactoryName);
-                cf.closeObjectContainerForObjectManager(om);
-            }
-        });
-
-        // Initialise the auto start process
-        initialiseAutoStart(clr);
-    }
-
-    /**
-     * Release of resources
-     */
-    public void close()
-    {
-        super.close();
-        activeObjectContainers.clear();
-    }
-
-    /**
-     * Convenience method to log the configuration of this store manager.
-     */
-    protected void logConfiguration()
-    {
-        super.logConfiguration();
-        if (NucleusLogger.DATASTORE.isDebugEnabled())
-        {
-            // DB4O specific configuration
-            NucleusLogger.DATASTORE.debug("DB4O Version : " + Db4o.version());
-
-            PersistenceConfiguration conf = omfContext.getPersistenceConfiguration();
-
-            String outputFilename = conf.getStringProperty("datanucleus.db4o.outputFile");
-            if (outputFilename != null)
-            {
-                NucleusLogger.DATASTORE.debug("DB4O Output : " + outputFilename);
-            }
-            // TODO Add db4o global properties here
-
-            NucleusLogger.DATASTORE.debug("===========================================================");
-        }
-    }
-
-    // ------------------------------- Class Management -----------------------------------
-
-    /**
-     * Method to register some data with the store.
-     * This will also register the data with the starter process.
-     * @param data The StoreData to add
-     */
-    protected void registerStoreData(StoreData data)
-    {
-        // Register the data
-        super.registerStoreData(data);
-
-        // Make this class config known to all active ObjectContainers for this store
-        if (activeObjectContainers.size() > 0)
-        {
-            Iterator containerIter = activeObjectContainers.iterator();
-            while (containerIter.hasNext())
-            {
-                ObjectContainer cont = (ObjectContainer)containerIter.next();
-                supportClassInDB4O(cont.ext().configure(), (AbstractClassMetaData)data.getMetaData());
-            }
-        }
-    }
-
-    /**
-     * Method to register an ObjectContainer as active on this store.
-     * Will load up all known class mapping information into the datastore container.
-     * @param cont ObjectContainer
-     */
-    public void registerObjectContainer(ObjectContainer cont)
-    {
-        if (cont == null)
-        {
-            return;
-        }
-
-        // Register all known classes with the ObjectContainer of this transaction
-        Configuration conf = cont.ext().configure();
-        Collection storeDataValues = storeDataMgr.getManagedStoreData();
-        Iterator iter = storeDataValues.iterator();
-        while (iter.hasNext())
-        {
-            StoreData data = (StoreData)iter.next();
-            supportClassInDB4O(conf, (AbstractClassMetaData)data.getMetaData());
-        }
-        activeObjectContainers.add(cont);
-    }
-
-    /**
-     * Method to deregister an ObjectContainer from this store.
-     * ObjectContainers are deregistered when about to be closed and hence not interested in more class mapping information.
-     * @param cont ObjectContainer
-     */
-    public void deregisterObjectContainer(ObjectContainer cont)
-    {
-        if (cont == null)
-        {
-            return;
-        }
-        activeObjectContainers.remove(cont);
-    }
-
-    /**
-     * Convenience method to support the specified class in DB4O.
-     * Prepares the DB4O environment for the persistence of this class (indexed fields, persist-cascade etc).
-     * TODO This will need update in the future to provide for schema updates, so where a class definition has
-     * changed and we need to set the changes in DB4O.
-     * @param conf The DB4O Configuration to add the class support to
-     * @param cmd MetaData for the class
-     */
-    private void supportClassInDB4O(Configuration conf, AbstractClassMetaData cmd)
-    {
-        ObjectClass objectCls = conf.objectClass(cmd.getFullClassName());
-        if (cmd.getVersionMetaData() != null)
-        {
-            // Class has version requirements so DB4O should use versioning
-            objectCls.generateVersionNumbers(true);
-        }
-        objectCls.cascadeOnUpdate(false); // Make sure we don't update cascade
-
-        // TODO Allow option of having UUID datastore identities
-//        objectCls.generateUUIDs(true);
-
-        AbstractMemberMetaData[] fmds = cmd.getManagedMembers();
-        for (int i=0;i<fmds.length;i++)
-        {
-            // Set the indexing for the field
-            boolean indexed = false;
-            if (fmds[i].isPrimaryKey() || fmds[i].getIndexMetaData() != null)
-            {
-                indexed = true;
-            }
-
-            // We don't do cascade-on-persist or cascade-on-update since they are stored as object refs
-            // in DB4O and we need to manage this so the user has the references correct. If a related
-            // object needs persisting/updating then we will pass through insertObject/updateObject for each
-
-            // TODO Check if arrays should be updated since they may be FCOs in DB4O.
-
-            // Determine the flag for delete_cascade
-            boolean cascadeDelete = false;
-            if (fmds[i].isDependent())
-            {
-                cascadeDelete = true;
-            }
-            if (fmds[i].getCollection() != null && fmds[i].getCollection().isDependentElement())
-            {
-                cascadeDelete = true;
-            }
-            else if (fmds[i].getArray() != null && fmds[i].getArray().isDependentElement())
-            {
-                cascadeDelete = true;
-            }
-            else if (fmds[i].getMap() != null && 
-                (fmds[i].getMap().isDependentKey() || fmds[i].getMap().isDependentValue()))
-            {
-                // We should have 2 settings one for key and one for value but DB4O only has "is this field dependent"
-                cascadeDelete = true;
-            }
-
-            // Set the DB4O behaviour for this field
-            if (indexed || cascadeDelete)
-            {
-                ObjectField objectFld = objectCls.objectField(fmds[i].getName());
-                if (indexed)
-                {
-                    objectFld.indexed(true);
-                }
-                if (cascadeDelete)
-                {
-                    objectFld.cascadeOnDelete(true);
-                }
-            }
-        }
-    }
-
-    /**
-     * Hook for the StateManager to notify us that an object is outdated (no longer valid). 
-     * The most common case is that the state of the PC becomes HOLLOW. This is especially important for 
-     * object databases employing implicit storing from the main memory to the database (like DB4O).
-     * @param sm StateManager of object
-     */
-    public void notifyObjectIsOutdated(StateManager sm)
-    {
-        ObjectContainer cont = (ObjectContainer)getConnection(sm.getObjectManager()).getConnection();
-        deactivateObject(cont, sm.getObject());
-    }
-
-    // ------------------------------- Utilities -----------------------------------
-
-    /**
-     * Convenience method to activate an object, to a depth of 1.
-     * @param cont ObjectContainer where the object resides
-     * @param obj The object
-     */
-    public void activateObject(ObjectContainer cont, Object obj)
-    {
-        activateObject(cont, obj, 1);
-    }
-
-    /**
-     * Convenience method to activate an object, to a depth.
-     * @param cont ObjectContainer where the object resides
-     * @param obj The object
-     * @param depth The depth to activate to
-     */
-    public void activateObject(ObjectContainer cont, Object obj, int depth)
-    {
-        if (NucleusLogger.DATASTORE.isDebugEnabled())
-        {
-            NucleusLogger.DATASTORE.debug(LOCALISER_DB4O.msg("DB4O.Object.Activating", 
-                StringUtils.toJVMIDString(obj)));
-        }
-        cont.activate(obj, depth);
-    }
-
-    /**
-     * Convenience method to deactivate an object, to a depth of 1.
-     * @param cont ObjectContainer where the object resides
-     * @param obj The object
-     */
-    public void deactivateObject(ObjectContainer cont, Object obj)
-    {
-        deactivateObject(cont, obj, 1);
-    }
-
-    /**
-     * Convenience method to activate an object, to a depth.
-     * @param cont ObjectContainer where the object resides
-     * @param obj The object
-     * @param depth The depth to activate to
-     */
-    public void deactivateObject(ObjectContainer cont, Object obj, int depth)
-    {
-        if (NucleusLogger.DATASTORE.isDebugEnabled())
-        {
-            NucleusLogger.DATASTORE.debug(LOCALISER_DB4O.msg("DB4O.Object.Deactivating", 
-                StringUtils.toJVMIDString(obj)));
-        }
-        cont.deactivate(obj, depth);
-    }
-
-    /**
-     * Convenience method to get the identity for a Persistable object.
-     * @param om The Object Manager
-     * @param pc The object
-     * @return The identity
-     */
-    public Object getObjectIdForObject(ObjectManager om, Object pc)
-    {
-        AbstractClassMetaData cmd = getMetaDataManager().getMetaDataForClass(pc.getClass().getName(), 
-            om.getClassLoaderResolver());
-        Object id = null;
-        StateManager sm = om.findStateManager(pc);
-        if (sm != null)
-        {
-            // Object is managed, so return its id
-            return sm.getInternalObjectId();
-        }
-
-        ObjectContainer cont = (ObjectContainer)getConnection(om).getConnection();
-        try
-        {
-            // TODO If the object passed in is not activated in DB4O can we generate the id for app id cases ?
-            if (cmd.getIdentityType() == IdentityType.DATASTORE)
-            {
-                // Consult the ObjectContainer for the internal DB4O id for this object
-                long idKey = cont.ext().getID(pc);
-                if (idKey == 0)
-                {
-                    // Not stored in the DB4O datastore
-                    return null;
-                }
-                return OIDFactory.getInstance(om, idKey);
-            }
-            else if (cmd.getIdentityType() == IdentityType.APPLICATION)
-            {
-                // If the fields are loaded then the id is known
-                return getApiAdapter().getNewApplicationIdentityObjectId(pc, cmd);
-            }
-        }
-        finally
-        {
-        }
-
-        return id;
-    }
-
-    /**
-     * Check if the strategy is attributed by the database when the PersistenceCapable object is inserted into the database.
-     * "datastore-identity" cases will be datastore attributed (since we cant store the id anywhere).
-     * "application-identity" cases will be datastore attributed if using "IDENTITY" strategy.
-     * @param identityStrategy the identityStrategy
-     * @param datastoreIdentityField Whether this is for the surrogate datastore identity field
-     * @return if the object for the strategy is attributed by the database
-     */
-    public boolean isStrategyDatastoreAttributed(IdentityStrategy identityStrategy, boolean datastoreIdentityField)
-    {
-        if (identityStrategy == null)
-        {
-            return false;
-        }
-
-        if (!datastoreIdentityField && identityStrategy == IdentityStrategy.IDENTITY)
-        {
-            throw new NucleusException("DataNucleus-DB4O doesnt currently support use of application-identity and strategy \"identity\"");
-        }
-        if (datastoreIdentityField || identityStrategy == IdentityStrategy.IDENTITY)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Accessor for an Extent for a class.
-     * @param om The Object Manager
-     * @param c The class requiring the Extent
-     * @param subclasses Whether to include subclasses of 'c'
-     * @return The Extent.
-     */
-    public Extent getExtent(ObjectManager om, Class c, boolean subclasses)
-    {
-        AbstractClassMetaData cmd = getMetaDataManager().getMetaDataForClass(c, om.getClassLoaderResolver());
-        if (!cmd.isRequiresExtent())
-        {
-            throw new NoExtentException(c.getName());
-        }
-
-        return new DB4OExtent(om, c, subclasses, cmd);
-    }
-
-    /**
-     * Accessor for the supported options in string form
-     */
-    public Collection getSupportedOptions()
-    {
-        Set set = new HashSet();
-        set.add("DatastoreIdentity");
-        set.add("ApplicationIdentity");
-        set.add("OptimisticTransaction");
-        set.add("TransactionIsolationLevel.read-committed");
-        return set;
-    }
-}
\ No newline at end of file

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -64,10 +64,10 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
+        "org.datanucleus.store.db4o.Localisation", DB4OStoreManager.class.getClassLoader());
 
     /** Manager for the store. */
-    protected final DB4OManager storeMgr;
+    protected final DB4OStoreManager storeMgr;
 
     /** Temporary map of a list of the objects being deleted, keyed by the thread name. Used by delete() method. */
     private Map currentDeleteThreads = Collections.synchronizedMap(new HashMap());
@@ -97,7 +97,7 @@
      */
     public DB4OPersistenceHandler(StoreManager storeMgr)
     {
-        this.storeMgr = (DB4OManager)storeMgr;
+        this.storeMgr = (DB4OStoreManager)storeMgr;
     }
 
     /**

Copied: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java (from rev 7165, platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OManager.java)
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java	                        (rev 0)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -0,0 +1,487 @@
+/**********************************************************************
+Copyright (c) 2006 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:
+2007 Xuan Baldauf - Major improvements in the way DB4O is accessed. See CORE-3272
+2007 Xuan Baldauf - Simplified and optimized the access of the DB4O database. Previously, for every access, a new
+    database connection was made, and the old database connection was flushed, resulting in inferior performance.
+2007 Xuan Baldauf - Use DatastoreUniqueOID to save memory
+2007 Andy Jefferson - removed numerous pointless "if (true)" lines that should not be in CVS
+    ...
+**********************************************************************/
+package org.datanucleus.store.db4o;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.OMFContext;
+import org.datanucleus.ObjectManager;
+import org.datanucleus.PersistenceConfiguration;
+import org.datanucleus.StateManager;
+import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.identity.OIDFactory;
+import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.IdentityStrategy;
+import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.store.Extent;
+import org.datanucleus.store.StoreData;
+import org.datanucleus.store.exceptions.NoExtentException;
+import org.datanucleus.util.NucleusLogger;
+import org.datanucleus.util.Localiser;
+import org.datanucleus.util.StringUtils;
+
+import org.datanucleus.store.AbstractStoreManager;
+
+import com.db4o.Db4o;
+import com.db4o.ObjectContainer;
+import com.db4o.config.Configuration;
+import com.db4o.config.ObjectClass;
+import com.db4o.config.ObjectField;
+
+/**
+ * Store Manager for DB4O (http://www.db4o.com).
+ * <p>
+ * DataNucleus will select this StoreManager with URLs of the form "db4o:...".
+ * Support for DB4O is for the following URLs
+ * <ul>
+ * <li>db4o:{filename} - uses a local DB4O database in the named file (no username/password needed)</li>
+ * <li>db4o:server:{filename} - embedded DB4O server in the named file (no username/password needed)</li>
+ * <li>db4o:{hostname}:{port} - uses a remote DB4O database with the specified username/password</li>
+ * <ul>
+ * These URLs are specific to our support since DB4O doesn't use URLs to define the datastore.
+ * </p>
+ * <h3>Object Activation and Field Loading</h3>
+ * <p>
+ * DB4O provides methods to hand out memory versions of the datastore objects. Each object has to be
+ * "activated" to have its values accessible. Similarly the object can be "deactivated" when it is
+ * no longer needed (freeing up resources, and the link to the disk object). When we retrieve an object
+ * from DB4O it activates the object. This makes all fields accessible. If however one of the fields is
+ * a PC object (or collection, or map, or array etc) that object itself is not activated. Consequently
+ * all fields are accessible from the start (unlike with RDBMS), but the StateManager manages the list
+ * of fields that are considered "loaded", and this is initially just those in the DFG (even though others
+ * are available). When the user accesses one of these "not-loaded" fields DB4OManager.fetchObject is called
+ * and that field is marked as loaded (if it is a SCO mutable it is wrapped, and if it is a PC object it
+ * has a StateManager connected and is activated).
+ * </p>
+ * <h3>Persistence</h3>
+ * <p>
+ * Each object is persisted on its own, and we dont use DB4O's internal cascade mechanism. Instead
+ * the DB4OManager.insertObject, or DB4OManager.updateObject methods are called for each object that
+ * is to be persisted/updated. Each call to insertObject/updateObject provides reachability by use
+ * of PersistFieldManager.
+ * </p>
+ * <h3>Deletion</h3>
+ * <p>
+ * Currently objects are deleted using DB4O's internal cascade mechanism. 
+ * </p>
+ * <h3>Transactions and Connections</h3>
+ * <p>
+ * Refer to ConnectionFactoryImpl. In simple terms each ObjectManager has a DB4O ObjectContainer associated
+ * with it, and this is retained until the end of life of the ObjectManager. With DB4O in server mode this
+ * allows use of multiple PMs on the same underlying datastore. With DB4O in file mode you can only
+ * have one PM operating on the same underlying datastore at once. This is a DB4O limitation rather than ours.
+ * </p>
+ */
+public class DB4OStoreManager extends AbstractStoreManager
+{
+    /** Localiser for messages. */
+    protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
+        "org.datanucleus.store.db4o.Localisation", DB4OStoreManager.class.getClassLoader());
+
+    /** 
+     * Collection of the currently active ObjectContainers.
+     * Used for providing class mapping information when they are found.
+     */
+    private Set activeObjectContainers = new HashSet();
+
+    /**
+     * Constructor for a new DB4O StoreManager. 
+     * Stores the basic information required for the datastore management.
+     * @param clr the ClassLoaderResolver
+     * @param omfContext The corresponding ObjectManagerFactory omfContext.
+     */
+    public DB4OStoreManager(ClassLoaderResolver clr, OMFContext omfContext)
+    {
+        super("db4o", clr, omfContext);
+
+        PersistenceConfiguration conf = omfContext.getPersistenceConfiguration();
+
+        // Use unique datastore-identity ids
+        conf.setProperty("datanucleus.datastoreIdentityType", "unique");
+
+        // Log the manager configuration
+        logConfiguration();
+
+        // Handler for persistence process
+        persistenceHandler = new DB4OPersistenceHandler(this);
+
+        // Make sure transactional connection factory has listener for closing object container
+        omfContext.addObjectManagerListener(new ObjectManager.ObjectManagerListener()
+        {
+            public void objectManagerPreClose(ObjectManager om)
+            {
+                // Close any ObjectContainer for this ObjectManager
+                ConnectionFactoryImpl cf = 
+                    (ConnectionFactoryImpl)connectionMgr.lookupConnectionFactory(txConnectionFactoryName);
+                cf.closeObjectContainerForObjectManager(om);
+            }
+        });
+
+        // Initialise the auto start process
+        initialiseAutoStart(clr);
+    }
+
+    /**
+     * Release of resources
+     */
+    public void close()
+    {
+        super.close();
+        activeObjectContainers.clear();
+    }
+
+    /**
+     * Convenience method to log the configuration of this store manager.
+     */
+    protected void logConfiguration()
+    {
+        super.logConfiguration();
+        if (NucleusLogger.DATASTORE.isDebugEnabled())
+        {
+            // DB4O specific configuration
+            NucleusLogger.DATASTORE.debug("DB4O Version : " + Db4o.version());
+
+            PersistenceConfiguration conf = omfContext.getPersistenceConfiguration();
+
+            String outputFilename = conf.getStringProperty("datanucleus.db4o.outputFile");
+            if (outputFilename != null)
+            {
+                NucleusLogger.DATASTORE.debug("DB4O Output : " + outputFilename);
+            }
+            // TODO Add db4o global properties here
+
+            NucleusLogger.DATASTORE.debug("===========================================================");
+        }
+    }
+
+    // ------------------------------- Class Management -----------------------------------
+
+    /**
+     * Method to register some data with the store.
+     * This will also register the data with the starter process.
+     * @param data The StoreData to add
+     */
+    protected void registerStoreData(StoreData data)
+    {
+        // Register the data
+        super.registerStoreData(data);
+
+        // Make this class config known to all active ObjectContainers for this store
+        if (activeObjectContainers.size() > 0)
+        {
+            Iterator containerIter = activeObjectContainers.iterator();
+            while (containerIter.hasNext())
+            {
+                ObjectContainer cont = (ObjectContainer)containerIter.next();
+                supportClassInDB4O(cont.ext().configure(), (AbstractClassMetaData)data.getMetaData());
+            }
+        }
+    }
+
+    /**
+     * Method to register an ObjectContainer as active on this store.
+     * Will load up all known class mapping information into the datastore container.
+     * @param cont ObjectContainer
+     */
+    public void registerObjectContainer(ObjectContainer cont)
+    {
+        if (cont == null)
+        {
+            return;
+        }
+
+        // Register all known classes with the ObjectContainer of this transaction
+        Configuration conf = cont.ext().configure();
+        Collection storeDataValues = storeDataMgr.getManagedStoreData();
+        Iterator iter = storeDataValues.iterator();
+        while (iter.hasNext())
+        {
+            StoreData data = (StoreData)iter.next();
+            supportClassInDB4O(conf, (AbstractClassMetaData)data.getMetaData());
+        }
+        activeObjectContainers.add(cont);
+    }
+
+    /**
+     * Method to deregister an ObjectContainer from this store.
+     * ObjectContainers are deregistered when about to be closed and hence not interested in more class mapping information.
+     * @param cont ObjectContainer
+     */
+    public void deregisterObjectContainer(ObjectContainer cont)
+    {
+        if (cont == null)
+        {
+            return;
+        }
+        activeObjectContainers.remove(cont);
+    }
+
+    /**
+     * Convenience method to support the specified class in DB4O.
+     * Prepares the DB4O environment for the persistence of this class (indexed fields, persist-cascade etc).
+     * TODO This will need update in the future to provide for schema updates, so where a class definition has
+     * changed and we need to set the changes in DB4O.
+     * @param conf The DB4O Configuration to add the class support to
+     * @param cmd MetaData for the class
+     */
+    private void supportClassInDB4O(Configuration conf, AbstractClassMetaData cmd)
+    {
+        ObjectClass objectCls = conf.objectClass(cmd.getFullClassName());
+        if (cmd.getVersionMetaData() != null)
+        {
+            // Class has version requirements so DB4O should use versioning
+            objectCls.generateVersionNumbers(true);
+        }
+        objectCls.cascadeOnUpdate(false); // Make sure we don't update cascade
+
+        // TODO Allow option of having UUID datastore identities
+//        objectCls.generateUUIDs(true);
+
+        AbstractMemberMetaData[] fmds = cmd.getManagedMembers();
+        for (int i=0;i<fmds.length;i++)
+        {
+            // Set the indexing for the field
+            boolean indexed = false;
+            if (fmds[i].isPrimaryKey() || fmds[i].getIndexMetaData() != null)
+            {
+                indexed = true;
+            }
+
+            // We don't do cascade-on-persist or cascade-on-update since they are stored as object refs
+            // in DB4O and we need to manage this so the user has the references correct. If a related
+            // object needs persisting/updating then we will pass through insertObject/updateObject for each
+
+            // TODO Check if arrays should be updated since they may be FCOs in DB4O.
+
+            // Determine the flag for delete_cascade
+            boolean cascadeDelete = false;
+            if (fmds[i].isDependent())
+            {
+                cascadeDelete = true;
+            }
+            if (fmds[i].getCollection() != null && fmds[i].getCollection().isDependentElement())
+            {
+                cascadeDelete = true;
+            }
+            else if (fmds[i].getArray() != null && fmds[i].getArray().isDependentElement())
+            {
+                cascadeDelete = true;
+            }
+            else if (fmds[i].getMap() != null && 
+                (fmds[i].getMap().isDependentKey() || fmds[i].getMap().isDependentValue()))
+            {
+                // We should have 2 settings one for key and one for value but DB4O only has "is this field dependent"
+                cascadeDelete = true;
+            }
+
+            // Set the DB4O behaviour for this field
+            if (indexed || cascadeDelete)
+            {
+                ObjectField objectFld = objectCls.objectField(fmds[i].getName());
+                if (indexed)
+                {
+                    objectFld.indexed(true);
+                }
+                if (cascadeDelete)
+                {
+                    objectFld.cascadeOnDelete(true);
+                }
+            }
+        }
+    }
+
+    /**
+     * Hook for the StateManager to notify us that an object is outdated (no longer valid). 
+     * The most common case is that the state of the PC becomes HOLLOW. This is especially important for 
+     * object databases employing implicit storing from the main memory to the database (like DB4O).
+     * @param sm StateManager of object
+     */
+    public void notifyObjectIsOutdated(StateManager sm)
+    {
+        ObjectContainer cont = (ObjectContainer)getConnection(sm.getObjectManager()).getConnection();
+        deactivateObject(cont, sm.getObject());
+    }
+
+    // ------------------------------- Utilities -----------------------------------
+
+    /**
+     * Convenience method to activate an object, to a depth of 1.
+     * @param cont ObjectContainer where the object resides
+     * @param obj The object
+     */
+    public void activateObject(ObjectContainer cont, Object obj)
+    {
+        activateObject(cont, obj, 1);
+    }
+
+    /**
+     * Convenience method to activate an object, to a depth.
+     * @param cont ObjectContainer where the object resides
+     * @param obj The object
+     * @param depth The depth to activate to
+     */
+    public void activateObject(ObjectContainer cont, Object obj, int depth)
+    {
+        if (NucleusLogger.DATASTORE.isDebugEnabled())
+        {
+            NucleusLogger.DATASTORE.debug(LOCALISER_DB4O.msg("DB4O.Object.Activating", 
+                StringUtils.toJVMIDString(obj)));
+        }
+        cont.activate(obj, depth);
+    }
+
+    /**
+     * Convenience method to deactivate an object, to a depth of 1.
+     * @param cont ObjectContainer where the object resides
+     * @param obj The object
+     */
+    public void deactivateObject(ObjectContainer cont, Object obj)
+    {
+        deactivateObject(cont, obj, 1);
+    }
+
+    /**
+     * Convenience method to activate an object, to a depth.
+     * @param cont ObjectContainer where the object resides
+     * @param obj The object
+     * @param depth The depth to activate to
+     */
+    public void deactivateObject(ObjectContainer cont, Object obj, int depth)
+    {
+        if (NucleusLogger.DATASTORE.isDebugEnabled())
+        {
+            NucleusLogger.DATASTORE.debug(LOCALISER_DB4O.msg("DB4O.Object.Deactivating", 
+                StringUtils.toJVMIDString(obj)));
+        }
+        cont.deactivate(obj, depth);
+    }
+
+    /**
+     * Convenience method to get the identity for a Persistable object.
+     * @param om The Object Manager
+     * @param pc The object
+     * @return The identity
+     */
+    public Object getObjectIdForObject(ObjectManager om, Object pc)
+    {
+        AbstractClassMetaData cmd = getMetaDataManager().getMetaDataForClass(pc.getClass().getName(), 
+            om.getClassLoaderResolver());
+        Object id = null;
+        StateManager sm = om.findStateManager(pc);
+        if (sm != null)
+        {
+            // Object is managed, so return its id
+            return sm.getInternalObjectId();
+        }
+
+        ObjectContainer cont = (ObjectContainer)getConnection(om).getConnection();
+        try
+        {
+            // TODO If the object passed in is not activated in DB4O can we generate the id for app id cases ?
+            if (cmd.getIdentityType() == IdentityType.DATASTORE)
+            {
+                // Consult the ObjectContainer for the internal DB4O id for this object
+                long idKey = cont.ext().getID(pc);
+                if (idKey == 0)
+                {
+                    // Not stored in the DB4O datastore
+                    return null;
+                }
+                return OIDFactory.getInstance(om, idKey);
+            }
+            else if (cmd.getIdentityType() == IdentityType.APPLICATION)
+            {
+                // If the fields are loaded then the id is known
+                return getApiAdapter().getNewApplicationIdentityObjectId(pc, cmd);
+            }
+        }
+        finally
+        {
+        }
+
+        return id;
+    }
+
+    /**
+     * Check if the strategy is attributed by the database when the PersistenceCapable object is inserted into the database.
+     * "datastore-identity" cases will be datastore attributed (since we cant store the id anywhere).
+     * "application-identity" cases will be datastore attributed if using "IDENTITY" strategy.
+     * @param identityStrategy the identityStrategy
+     * @param datastoreIdentityField Whether this is for the surrogate datastore identity field
+     * @return if the object for the strategy is attributed by the database
+     */
+    public boolean isStrategyDatastoreAttributed(IdentityStrategy identityStrategy, boolean datastoreIdentityField)
+    {
+        if (identityStrategy == null)
+        {
+            return false;
+        }
+
+        if (!datastoreIdentityField && identityStrategy == IdentityStrategy.IDENTITY)
+        {
+            throw new NucleusException("DataNucleus-DB4O doesnt currently support use of application-identity and strategy \"identity\"");
+        }
+        if (datastoreIdentityField || identityStrategy == IdentityStrategy.IDENTITY)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Accessor for an Extent for a class.
+     * @param om The Object Manager
+     * @param c The class requiring the Extent
+     * @param subclasses Whether to include subclasses of 'c'
+     * @return The Extent.
+     */
+    public Extent getExtent(ObjectManager om, Class c, boolean subclasses)
+    {
+        AbstractClassMetaData cmd = getMetaDataManager().getMetaDataForClass(c, om.getClassLoaderResolver());
+        if (!cmd.isRequiresExtent())
+        {
+            throw new NoExtentException(c.getName());
+        }
+
+        return new DB4OExtent(om, c, subclasses, cmd);
+    }
+
+    /**
+     * Accessor for the supported options in string form
+     */
+    public Collection getSupportedOptions()
+    {
+        Set set = new HashSet();
+        set.add("DatastoreIdentity");
+        set.add("ApplicationIdentity");
+        set.add("OptimisticTransaction");
+        set.add("TransactionIsolationLevel.read-committed");
+        return set;
+    }
+}
\ No newline at end of file

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OUtils.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OUtils.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OUtils.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -43,7 +43,7 @@
      * @return The StateManager for this object
      */
     public static StateManager prepareDB4OObjectForUse(Object obj, ObjectManager om, ObjectContainer cont, 
-            AbstractClassMetaData cmd, DB4OManager mgr)
+            AbstractClassMetaData cmd, DB4OStoreManager mgr)
     {
         if (!om.getApiAdapter().isPersistable(obj))
         {

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/exceptions/ObjectNotActiveException.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/exceptions/ObjectNotActiveException.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/exceptions/ObjectNotActiveException.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -17,7 +17,7 @@
 **********************************************************************/
 package org.datanucleus.store.db4o.exceptions;
 
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.StringUtils;
@@ -31,7 +31,7 @@
 public class ObjectNotActiveException extends NucleusException
 {
     private static final Localiser LOCALISER=Localiser.getInstance("org.datanucleus.store.db4o.Localisation",
-        DB4OManager.class.getClassLoader());
+        DB4OStoreManager.class.getClassLoader());
 
     /** The object that is not activated. */
     private final Object pc;

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/ActivationFieldManager.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/ActivationFieldManager.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/ActivationFieldManager.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.store.db4o.exceptions.ObjectNotActiveException;
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
@@ -67,7 +67,7 @@
     protected void processPersistable(int fieldNumber, Object pc)
     {
         ObjectManager om = sm.getObjectManager();
-        DB4OManager mgr = (DB4OManager)om.getStoreManager();
+        DB4OStoreManager mgr = (DB4OStoreManager)om.getStoreManager();
 
         // Activate the object in DB4O
         mgr.activateObject(cont, pc);

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/AssignStateManagerFieldManager.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/AssignStateManagerFieldManager.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/AssignStateManagerFieldManager.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.store.db4o.exceptions.ObjectNotActiveException;
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
@@ -68,7 +68,7 @@
      */
     protected void processPersistable(int fieldNumber, Object pc)
     {
-        DB4OManager mgr = (DB4OManager)sm.getObjectManager().getStoreManager();
+        DB4OStoreManager mgr = (DB4OStoreManager)sm.getObjectManager().getStoreManager();
 
         // Find the id for this object stored in this field
         Object id = null;

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JDOQLQuery.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JDOQLQuery.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JDOQLQuery.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -32,7 +32,7 @@
 import org.datanucleus.query.evaluator.JDOQLEvaluator;
 import org.datanucleus.query.evaluator.JavaQueryEvaluator;
 import org.datanucleus.store.connection.ManagedConnection;
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.store.db4o.DB4OUtils;
 import org.datanucleus.store.query.AbstractJDOQLQuery;
 import org.datanucleus.util.NucleusLogger;
@@ -134,7 +134,7 @@
             {
                 Object obj = iter.next();
                 AbstractClassMetaData cmd = om.getMetaDataManager().getMetaDataForClass(obj.getClass(), clr);
-                DB4OUtils.prepareDB4OObjectForUse(obj, om, cont, cmd, (DB4OManager)om.getStoreManager());
+                DB4OUtils.prepareDB4OObjectForUse(obj, om, cont, cmd, (DB4OStoreManager)om.getStoreManager());
             }
             return results;
         }

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JPQLQuery.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JPQLQuery.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/JPQLQuery.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -31,7 +31,7 @@
 import org.datanucleus.query.evaluator.JPQLEvaluator;
 import org.datanucleus.query.evaluator.JavaQueryEvaluator;
 import org.datanucleus.store.connection.ManagedConnection;
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.store.db4o.DB4OUtils;
 import org.datanucleus.store.query.AbstractJPQLQuery;
 import org.datanucleus.util.Localiser;
@@ -49,7 +49,7 @@
 public class JPQLQuery extends AbstractJPQLQuery
 {
     protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
+        "org.datanucleus.store.db4o.Localisation", DB4OStoreManager.class.getClassLoader());
 
     /**
      * Constructs a new query instance that uses the given persistence manager.
@@ -139,7 +139,7 @@
             {
                 Object obj = iter.next();
                 AbstractClassMetaData cmd = om.getMetaDataManager().getMetaDataForClass(obj.getClass(), clr);
-                DB4OUtils.prepareDB4OObjectForUse(obj, om, cont, cmd, (DB4OManager)om.getStoreManager());
+                DB4OUtils.prepareDB4OObjectForUse(obj, om, cont, cmd, (DB4OStoreManager)om.getStoreManager());
             }
 
             if (type == BULK_DELETE)

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/NativeQuery.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/NativeQuery.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/NativeQuery.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -24,7 +24,7 @@
 import java.util.Set;
 
 import org.datanucleus.store.connection.ManagedConnection;
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.store.db4o.DB4OUtils;
 import org.datanucleus.ObjectManager;
 import org.datanucleus.exceptions.NucleusUserException;
@@ -48,7 +48,7 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
+        "org.datanucleus.store.db4o.Localisation", DB4OStoreManager.class.getClassLoader());
 
     /** The Predicate for the native query. */
     protected Predicate predicate = null;
@@ -162,7 +162,7 @@
                         cmd = om.getMetaDataManager().getMetaDataForClass(getCandidateClassName(), 
                             om.getClassLoaderResolver());
                     }
-                    DB4OUtils.prepareDB4OObjectForUse(obj, om, cont, cmd, (DB4OManager)om.getStoreManager());
+                    DB4OUtils.prepareDB4OObjectForUse(obj, om, cont, cmd, (DB4OStoreManager)om.getStoreManager());
                 }
             }
 

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/QueryToSODAMapper.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/QueryToSODAMapper.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/QueryToSODAMapper.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Stack;
 
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.query.QueryUtils;
 import org.datanucleus.query.compiler.QueryCompilation;
@@ -50,7 +50,7 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
+        "org.datanucleus.store.db4o.Localisation", DB4OStoreManager.class.getClassLoader());
 
     String candidateAlias;
 

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/SQLQuery.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/SQLQuery.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/SQLQuery.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -28,7 +28,7 @@
 import org.datanucleus.sql4o.Sql4oException;
 import org.datanucleus.sql4o.parser.SqlParseException;
 import org.datanucleus.store.connection.ManagedConnection;
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ObjectManager;
 import org.datanucleus.exceptions.NucleusDataStoreException;
@@ -51,7 +51,7 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
+        "org.datanucleus.store.db4o.Localisation", DB4OStoreManager.class.getClassLoader());
 
     /** State variable for the compilation state */
     protected transient boolean isCompiled = false;

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/SQLQueryResult.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/SQLQueryResult.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/query/SQLQueryResult.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -27,7 +27,7 @@
 import org.datanucleus.sql4o.ObjectSetWrapper;
 import org.datanucleus.sql4o.Result;
 import org.datanucleus.sql4o.Sql4oException;
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.store.db4o.DB4OUtils;
 import org.datanucleus.FetchPlan;
 import org.datanucleus.ObjectManager;
@@ -522,7 +522,7 @@
             ObjectManager om = query.getObjectManager();
             AbstractClassMetaData cmd = om.getMetaDataManager().getMetaDataForClass(obj.getClass(), 
                 om.getClassLoaderResolver());
-            DB4OUtils.prepareDB4OObjectForUse(obj, om, cont, cmd, (DB4OManager)om.getStoreManager());
+            DB4OUtils.prepareDB4OObjectForUse(obj, om, cont, cmd, (DB4OStoreManager)om.getStoreManager());
         }
     }
 

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementGenerator.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementGenerator.java	2009-07-17 15:14:34 UTC (rev 7173)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/valuegenerator/DB4OIncrementGenerator.java	2009-07-17 15:16:13 UTC (rev 7174)
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.datanucleus.store.db4o.DB4OManager;
+import org.datanucleus.store.db4o.DB4OStoreManager;
 import org.datanucleus.store.valuegenerator.AbstractDatastoreGenerator;
 import org.datanucleus.store.valuegenerator.ValueGenerationBlock;
 import org.datanucleus.store.valuegenerator.ValueGenerationException;
@@ -40,7 +40,7 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER_DB4O = Localiser.getInstance(
-        "org.datanucleus.store.db4o.Localisation", DB4OManager.class.getClassLoader());
+        "org.datanucleus.store.db4o.Localisation", DB4OStoreManager.class.getClassLoader());
 
     /** The DB4O ObjectContainer to use for generating values */
     private ObjectContainer container = null;


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

Revision: 8256
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=8256&view=rev
Author:   andy_jefferson
Date:     2009-12-07 08:02:55 +0000 (Mon, 07 Dec 2009)

Log Message:
-----------
2.0 M3 - no idea why somebody updated this to M4 when there has never been an M3

Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2009-12-07 07:54:00 UTC (rev 8255)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2009-12-07 08:02:55 UTC (rev 8256)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus DB4O
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
-Bundle-Version: 2.0.0.m4
+Bundle-Version: 2.0.0.m3
 Bundle-Localization: plugin
 Require-Bundle: org.datanucleus;bundle-version="2.0.0.m4",
  org.datanucleus.sql4o;bundle-version="1.0";resolution:=optional

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2009-12-07 07:54:00 UTC (rev 8255)
+++ platform/store.db4o/trunk/pom.xml	2009-12-07 08:02:55 UTC (rev 8256)
@@ -5,7 +5,7 @@
                       http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>2.0.0-m4</version>
+	<version>2.0.0-m3</version>
     <artifactId>datanucleus-db4o</artifactId>
     <name>DataNucleus DB4O plugin</name>
     <description>


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

Revision: 8444
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=8444&view=rev
Author:   andy_jefferson
Date:     2010-01-02 11:14:18 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
[NUCDBFO-44] Logged warning with L2 cache

Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2010-01-02 11:10:23 UTC (rev 8443)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2010-01-02 11:14:18 UTC (rev 8444)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus DB4O
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
-Bundle-Version: 2.0.0.m3
+Bundle-Version: 2.0.0.release
 Bundle-Localization: plugin
 Require-Bundle: org.datanucleus;bundle-version="2.0.0.m4",
  org.datanucleus.sql4o;bundle-version="1.0";resolution:=optional

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2010-01-02 11:10:23 UTC (rev 8443)
+++ platform/store.db4o/trunk/pom.xml	2010-01-02 11:14:18 UTC (rev 8444)
@@ -5,7 +5,7 @@
                       http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>2.0.0-m3</version>
+	<version>2.0.0-release-SNAPSHOT</version>
     <artifactId>datanucleus-db4o</artifactId>
     <name>DataNucleus DB4O plugin</name>
     <description>

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java	2010-01-02 11:10:23 UTC (rev 8443)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java	2010-01-02 11:14:18 UTC (rev 8444)
@@ -120,6 +120,11 @@
         super("db4o", clr, omfContext);
 
         PersistenceConfiguration conf = omfContext.getPersistenceConfiguration();
+        if (!conf.getStringProperty("datanucleus.cache.level2.type").equalsIgnoreCase("none"))
+        {
+            // TODO Remove this when we can handle getting objects from the L2 cache
+            NucleusLogger.PERSISTENCE.warn("DB4O StoreManager is not fully supported when using the L2 cache");
+        }
 
         // Use unique datastore-identity ids
         conf.setProperty("datanucleus.datastoreIdentityType", "unique");


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

Revision: 9567
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=9567&view=rev
Author:   andy_jefferson
Date:     2010-04-14 18:01:25 +0000 (Wed, 14 Apr 2010)

Log Message:
-----------
[NUCCORE-499] Remove one usage of PersistenceCapable

Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2010-04-14 15:50:53 UTC (rev 9566)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2010-04-14 18:01:25 UTC (rev 9567)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus DB4O
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
-Bundle-Version: 2.1.0.m1
+Bundle-Version: 2.1.0.m2
 Bundle-Localization: plugin
 Require-Bundle: org.datanucleus;bundle-version="2.1.0.m1",
  org.datanucleus.sql4o;bundle-version="2.0";resolution:=optional

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2010-04-14 15:50:53 UTC (rev 9566)
+++ platform/store.db4o/trunk/pom.xml	2010-04-14 18:01:25 UTC (rev 9567)
@@ -5,7 +5,7 @@
                       http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>2.1.0-m1</version>
+	<version>2.1.0-m2-SNAPSHOT</version>
     <artifactId>datanucleus-db4o</artifactId>
     <name>DataNucleus DB4O plugin</name>
     <description>

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2010-04-14 15:50:53 UTC (rev 9566)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2010-04-14 18:01:25 UTC (rev 9567)
@@ -620,13 +620,13 @@
                     {
                         throw new NucleusObjectNotFoundException(LOCALISER.msg("DB4O.Object.IdNotFound", id));
                     }
-                    
+
                     pc = objectSet.next();
                     ObjectProvider pcSM = ec.findObjectProvider(pc);
                     if (pcSM == null)
                     {
                         // DB4O returned object has no StateManager so swap the generated SM to manage its object
-                        sm.replaceManagedPC((PersistenceCapable)pc);
+                        sm.replaceManagedPC(pc);
                     }
                     // TODO Error checking on whether there are more than 1 returned etc (should be impossible)
                 }


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

Revision: 11597
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=11597&view=rev
Author:   andy_jefferson
Date:     2010-12-31 10:22:04 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------


Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2010-12-31 10:19:10 UTC (rev 11596)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2010-12-31 10:22:04 UTC (rev 11597)
@@ -4,8 +4,7 @@
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
 Bundle-Version: 3.0.0.m1
 Bundle-Localization: plugin
-Require-Bundle: org.datanucleus;bundle-version="3.0.0.m1",
- org.datanucleus.sql4o;bundle-version="2.0";resolution:=optional
+Require-Bundle: org.datanucleus;bundle-version="3.0.0.m1"
 Bundle-Vendor: DataNucleus
 Import-Package: com.db4o,
  com.db4o.cluster,
@@ -26,13 +25,6 @@
  com.db4o.reflect.self,
  com.db4o.replication,
  com.db4o.types,
- javax.jdo,
- javax.jdo.datastore,
- javax.jdo.identity,
- javax.jdo.listener,
- javax.jdo.spi,
- javax.persistence,
- javax.persistence.spi,
  javax.transaction;resolution:=optional,
  javax.transaction.xa;resolution:=optional
 Export-Package: org.datanucleus.store.db4o,

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2010-12-31 10:19:10 UTC (rev 11596)
+++ platform/store.db4o/trunk/pom.xml	2010-12-31 10:22:04 UTC (rev 11597)
@@ -45,13 +45,6 @@
             <artifactId>db4o</artifactId>
             <version>7.12.126.14142-all-java5</version>
         </dependency>
-        <!-- TODO Remove this when code fixed. Should have no dep on JDO (or JPA) -->
-        <dependency>
-            <groupId>javax.jdo</groupId>
-            <artifactId>jdo-api</artifactId>
-            <version>[3.0, )</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2010-12-31 10:19:10 UTC (rev 11596)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2010-12-31 10:22:04 UTC (rev 11597)
@@ -23,8 +23,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.jdo.spi.PersistenceCapable;
-
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.PersistenceConfiguration;
 import org.datanucleus.exceptions.NucleusDataStoreException;
@@ -39,7 +37,6 @@
 import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.metadata.VersionStrategy;
 import org.datanucleus.state.ObjectProviderFactory;
-import org.datanucleus.state.ObjectProviderImpl;
 import org.datanucleus.state.StateManagerFactory;
 import org.datanucleus.store.AbstractPersistenceHandler;
 import org.datanucleus.store.ExecutionContext;
@@ -311,23 +308,22 @@
             // This method is to update just particular fields but DB4O doesn't support that
             // so instead we fetch all fields and then do the update.
             // TODO Is this really necessary, and why? Catering for DB4O inadequacies?
-            // Assume here that the DB4O-deactivated related objects loaded by this call will not ever be 
+            // Assume here that the DB4O-deactivated related objects loaded by this call will not ever be
             // accessed, because we assume that the PC will go into a hollow state.
             // If this assumption is wrong, we should give each DB4O-deactivated child object a state mananger. 
-            PersistenceCapable pc = (PersistenceCapable)sm.getObject();
+            Object obj = sm.getObject();
             int[] dirtyFieldNumbers = sm.getDirtyFieldNumbers();
             if (dirtyFieldNumbers != null && dirtyFieldNumbers.length > 0)
             {
                 // Some fields need preserving
-                PersistenceCapable backupCopy = pc.jdoNewInstance((javax.jdo.spi.StateManager) ((ObjectProviderImpl)sm).getStateManager());
-                backupCopy.jdoCopyFields(pc, dirtyFieldNumbers);
+                Object copy = storeMgr.getApiAdapter().getCopyOfPersistableObject(obj, sm, dirtyFieldNumbers);
                 if (NucleusLogger.DATASTORE.isDebugEnabled())
                 {
                     NucleusLogger.DATASTORE.debug(LOCALISER.msg("DB4O.Object.Refreshing", 
-                        StringUtils.toJVMIDString(pc)));
+                        StringUtils.toJVMIDString(obj)));
                 }
-                cont.ext().refresh(pc, 1);
-                pc.jdoCopyFields(backupCopy, dirtyFieldNumbers);
+                cont.ext().refresh(obj, 1);
+                storeMgr.getApiAdapter().copyFieldsFromPersistableObject(copy, dirtyFieldNumbers, obj);
             }
             else
             {
@@ -335,9 +331,9 @@
                 if (NucleusLogger.DATASTORE.isDebugEnabled())
                 {
                     NucleusLogger.DATASTORE.debug(LOCALISER.msg("DB4O.Object.Refreshing", 
-                        StringUtils.toJVMIDString(pc)));
+                        StringUtils.toJVMIDString(obj)));
                 }
-                cont.ext().refresh(pc, 1);
+                cont.ext().refresh(obj, 1);
             }
 
             // Do the update in DB4O
@@ -516,20 +512,19 @@
             if (!cont.ext().isActive(sm.getObject()))
             {
                 // Object not active so we need to update fields with what DB4O has and preserve any dirty fields here
-                PersistenceCapable pc = (PersistenceCapable)sm.getObject();
+                Object obj = sm.getObject();
                 int[] dirtyFieldNumbers = sm.getDirtyFieldNumbers();
                 if (dirtyFieldNumbers != null && dirtyFieldNumbers.length > 0)
                 {
                     // Dirty fields, so copy values to new object, activate DB4O's object and copy the dirty values back
-                    PersistenceCapable backupCopy = pc.jdoNewInstance((javax.jdo.spi.StateManager) ((ObjectProviderImpl)sm).getStateManager());
-                    backupCopy.jdoCopyFields(pc, dirtyFieldNumbers);
-                    storeMgr.activateObject(cont, pc);
-                    pc.jdoCopyFields(backupCopy, dirtyFieldNumbers);
+                    Object copy = storeMgr.getApiAdapter().getCopyOfPersistableObject(obj, sm, dirtyFieldNumbers);
+                    storeMgr.activateObject(cont, obj);
+                    storeMgr.getApiAdapter().copyFieldsFromPersistableObject(copy, dirtyFieldNumbers, obj);
                 }
                 else
                 {
                     // No dirty fields so just activate the object
-                    storeMgr.activateObject(cont, pc);
+                    storeMgr.activateObject(cont, obj);
                 }
             }
 


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

Revision: 13454
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=13454&view=rev
Author:   andy_jefferson
Date:     2011-08-20 18:57:23 +0000 (Sat, 20 Aug 2011)

Log Message:
-----------
[NUCDBFO-50] Local variable rather than ec lookup

Modified Paths:
--------------
    platform/store.db4o/trunk/META-INF/MANIFEST.MF
    platform/store.db4o/trunk/pom.xml
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OExtent.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OUtils.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/ActivationFieldManager.java
    platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/AssignStateManagerFieldManager.java

Modified: platform/store.db4o/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.db4o/trunk/META-INF/MANIFEST.MF	2011-08-20 18:55:33 UTC (rev 13453)
+++ platform/store.db4o/trunk/META-INF/MANIFEST.MF	2011-08-20 18:57:23 UTC (rev 13454)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DataNucleus DB4O
 Bundle-SymbolicName: org.datanucleus.store.db4o;singleton:=true
-Bundle-Version: 3.0.0.release
+Bundle-Version: 3.0.1
 Bundle-Localization: plugin
 Require-Bundle: org.datanucleus;bundle-version="3.0.0.release"
 Bundle-Vendor: DataNucleus

Modified: platform/store.db4o/trunk/pom.xml
===================================================================
--- platform/store.db4o/trunk/pom.xml	2011-08-20 18:55:33 UTC (rev 13453)
+++ platform/store.db4o/trunk/pom.xml	2011-08-20 18:57:23 UTC (rev 13454)
@@ -5,7 +5,7 @@
                       http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.datanucleus</groupId>
-	<version>3.0.0-release</version>
+	<version>3.0.1-SNAPSHOT</version>
     <artifactId>datanucleus-db4o</artifactId>
     <name>DataNucleus DB4O plugin</name>
     <description>

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OExtent.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OExtent.java	2011-08-20 18:55:33 UTC (rev 13453)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OExtent.java	2011-08-20 18:57:23 UTC (rev 13454)
@@ -49,6 +49,8 @@
     protected static final Localiser LOCALISER_DB4O = Localiser.getInstance("org.datanucleus.store.db4o.Localisation",
         DB4OStoreManager.class.getClassLoader());
 
+    private DB4OStoreManager db4oStoreMgr;
+
     /** Set of iterators created by this Extent. */
     private Set iterators = new HashSet();
 
@@ -57,14 +59,16 @@
 
     /**
      * Constructor.
+     * @param storeMgr DB4OStoreManager
      * @param ec execution context
      * @param cls candidate class
      * @param subclasses Whether to include subclasses
      * @param cmd MetaData for the candidate class
      */
-    public DB4OExtent(ExecutionContext ec, Class cls, boolean subclasses, AbstractClassMetaData cmd)
+    public DB4OExtent(DB4OStoreManager storeMgr, ExecutionContext ec, Class cls, boolean subclasses, AbstractClassMetaData cmd)
     {
         super(ec, cls, subclasses, cmd);
+        this.db4oStoreMgr = storeMgr;
         this.fetchPlan = ec.getFetchPlan().getCopy();
     }
 
@@ -187,7 +191,7 @@
             ObjectContainer container = (ObjectContainer) mconn.getConnection();
             try
             {
-                DB4OUtils.prepareDB4OObjectForUse(obj, ec, container, cmd, (DB4OStoreManager)ec.getStoreManager());
+                DB4OUtils.prepareDB4OObjectForUse(obj, ec, container, cmd, db4oStoreMgr);
             }
             finally
             {

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2011-08-20 18:55:33 UTC (rev 13453)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OPersistenceHandler.java	2011-08-20 18:57:23 UTC (rev 13454)
@@ -538,7 +538,7 @@
             }
 
             // Process all requested fields so they are managed (loaded) and active now
-            sm.replaceFields(fieldNumbers, new ActivationFieldManager(cont, sm));
+            sm.replaceFields(fieldNumbers, new ActivationFieldManager(storeMgr, cont, sm));
 
             VersionMetaData vermd = cmd.getVersionMetaDataForClass();
             if (vermd != null && vermd.getVersionStrategy() == VersionStrategy.VERSION_NUMBER)

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java	2011-08-20 18:55:33 UTC (rev 13453)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OStoreManager.java	2011-08-20 18:57:23 UTC (rev 13454)
@@ -485,7 +485,7 @@
             throw new NoExtentException(c.getName());
         }
 
-        return new DB4OExtent(ec, c, subclasses, cmd);
+        return new DB4OExtent(this, ec, c, subclasses, cmd);
     }
 
     /**

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OUtils.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OUtils.java	2011-08-20 18:55:33 UTC (rev 13453)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/DB4OUtils.java	2011-08-20 18:57:23 UTC (rev 13454)
@@ -39,19 +39,19 @@
      * @param ec execution context
      * @param cont ObjectContainer that returned the object
      * @param cmd ClassMetaData for the object
-     * @param mgr DB4OManager
+     * @param storeMgr DB4OStoreManager
      * @return The StateManager for this object
      */
     public static ObjectProvider prepareDB4OObjectForUse(Object obj, ExecutionContext ec, ObjectContainer cont, 
-            AbstractClassMetaData cmd, DB4OStoreManager mgr)
+            AbstractClassMetaData cmd, DB4OStoreManager storeMgr)
     {
         if (!ec.getApiAdapter().isPersistable(obj))
         {
             return null;
         }
 
-        ObjectProvider sm = ec.findObjectProvider(obj);
-        if (sm == null)
+        ObjectProvider op = ec.findObjectProvider(obj);
+        if (op == null)
         {
             // Find the identity
             Object id = null;
@@ -66,21 +66,21 @@
             }
 
             // Object not managed so give it a StateManager before returning it
-            sm = ObjectProviderFactory.newForPersistentClean(ec, id, obj);
-            sm.provideFields(cmd.getAllMemberPositions(), new AssignStateManagerFieldManager(cont, sm));
+            op = ObjectProviderFactory.newForPersistentClean(ec, id, obj);
+            op.provideFields(cmd.getAllMemberPositions(), new AssignStateManagerFieldManager(storeMgr, cont, op));
         }
         else
         {
             // Object returned already available with StateManager so make sure it is active for use
             if (!cont.ext().isActive(obj))
             {
-                mgr.activateObject(cont, obj);
+                storeMgr.activateObject(cont, obj);
             }
         }
 
         // Wrap all unwrapped SCO fields of this instance so we can pick up any changes
-        sm.replaceAllLoadedSCOFieldsWithWrappers();
+        op.replaceAllLoadedSCOFieldsWithWrappers();
 
-        return sm;
+        return op;
     }
 }
\ No newline at end of file

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/ActivationFieldManager.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/ActivationFieldManager.java	2011-08-20 18:55:33 UTC (rev 13453)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/ActivationFieldManager.java	2011-08-20 18:57:23 UTC (rev 13454)
@@ -39,11 +39,11 @@
 /**
  * Field Manager responsible for activating a field where the value is placed there
  * by DB4O but needs activating to make it usable by the persistence process.
- * 
- * @version $Revision: 1.1 $
  */
 public class ActivationFieldManager extends AbstractFieldManager
 {
+    private DB4OStoreManager storeMgr = null;
+
     /** DB4O ObjectContainer. */
     private ObjectContainer cont;
 
@@ -53,8 +53,9 @@
     /**
      * Constructor
      */
-    public ActivationFieldManager(ObjectContainer cont, ObjectProvider sm)
+    public ActivationFieldManager(DB4OStoreManager storeMgr, ObjectContainer cont, ObjectProvider sm)
     {
+        this.storeMgr = storeMgr;
         this.cont = cont;
         this.sm = sm;
     }
@@ -67,10 +68,9 @@
     protected void processPersistable(int fieldNumber, Object pc)
     {
         ExecutionContext ec = sm.getExecutionContext();
-        DB4OStoreManager mgr = (DB4OStoreManager)ec.getStoreManager();
 
         // Activate the object in DB4O
-        mgr.activateObject(cont, pc);
+        storeMgr.activateObject(cont, pc);
 
         ObjectProvider pcSM = ec.findObjectProvider(pc);
         if (pcSM == null)
@@ -79,7 +79,7 @@
             Object id = null;
             try
             {
-                id = mgr.getObjectIdForObject(ec, pc);
+                id = storeMgr.getObjectIdForObject(ec, pc);
             }
             catch (ObjectNotActiveException onae)
             {

Modified: platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/AssignStateManagerFieldManager.java
===================================================================
--- platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/AssignStateManagerFieldManager.java	2011-08-20 18:55:33 UTC (rev 13453)
+++ platform/store.db4o/trunk/src/java/org/datanucleus/store/db4o/fieldmanager/AssignStateManagerFieldManager.java	2011-08-20 18:57:23 UTC (rev 13454)
@@ -39,12 +39,11 @@
 /**
  * Field manager that starts from the source object and for all fields will assign StateManagers to all
  * related PersistenceCapable objects found (unless already managed), assuming they are in PersistenceClean state.
- * 
- * @version $Revision: 1.1 $
- **/
+ */
 public class AssignStateManagerFieldManager extends AbstractFieldManager
 {
-    /** DB4O ObjectContainer. */
+    private DB4OStoreManager storeMgr;
+
     private final ObjectContainer cont;
 
     /** StateManager for the owning object whose fields are being fetched. */
@@ -52,11 +51,13 @@
 
     /**
      * Constructor.
+     * @param storeMgr DB4OStoreManager
      * @param cont ObjectContainer
      * @param sm The state manager for the object.
-     **/
-    public AssignStateManagerFieldManager(ObjectContainer cont, ObjectProvider sm)
+     */
+    public AssignStateManagerFieldManager(DB4OStoreManager storeMgr, ObjectContainer cont, ObjectProvider sm)
     {
+        this.storeMgr = storeMgr;
         this.cont = cont;
         this.sm = sm;
     }
@@ -68,13 +69,11 @@
      */
     protected void processPersistable(int fieldNumber, Object pc)
     {
-        DB4OStoreManager mgr = (DB4OStoreManager)sm.getExecutionContext().getStoreManager();
-
         // Find the id for this object stored in this field
         Object id = null;
         try
         {
-            id = mgr.getObjectIdForObject(sm.getExecutionContext(), pc);
+            id = storeMgr.getObjectIdForObject(sm.getExecutionContext(), pc);
         }
         catch (ObjectNotActiveException onae)
         {
@@ -102,8 +101,8 @@
         if (cont.ext().isActive(pc))
         {
             // Add StateManager and mark as deactivated for now - why ?
-            ObjectProvider newStateManager = ObjectProviderFactory.newForHollowPreConstructed(ec, id, pc);
-            mgr.notifyObjectIsOutdated(newStateManager);
+            ObjectProvider newOP = ObjectProviderFactory.newForHollowPreConstructed(ec, id, pc);
+            storeMgr.notifyObjectIsOutdated(newOP);
         }
     }
 


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