Index: continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
===================================================================
--- continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java	(revision 749099)
+++ continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java	(working copy)
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.continuum.dao.BuildQueueDao;
 import org.apache.continuum.dao.DaoUtils;
 import org.apache.continuum.dao.DirectoryPurgeConfigurationDao;
 import org.apache.continuum.dao.InstallationDao;
@@ -33,6 +34,7 @@
 import org.apache.continuum.model.repository.LocalRepository;
 import org.apache.continuum.utils.ProjectSorter;
 import org.apache.maven.continuum.model.project.BuildDefinition;
+import org.apache.maven.continuum.model.project.BuildQueue;
 import org.apache.maven.continuum.model.project.ContinuumDatabase;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
@@ -128,6 +130,11 @@
      * @plexus.requirement
      */
     private ProjectScmRootDao projectScmRootDao;
+    
+    /**
+     * @plexus.requirement
+     */
+    private BuildQueueDao buildQueueDao;
 
     protected static final String BUILDS_XML = "builds.xml";
 
@@ -169,7 +176,16 @@
         database.setDirectoryPurgeConfigurations( directoryPurgeConfigurationDao.getAllDirectoryPurgeConfigurations() );
 
         database.setProjectScmRoots( projectScmRootDao.getAllProjectScmRoots() );
-
+        
+        try  // TODO: use getAllObjectsDetached in DAO to avoid try-catch.
+        {
+            database.setBuildQueues( buildQueueDao.getAllBuildQueues() );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            log.error( "Error encountered retrieving all buildQueues", e );
+        }
+        
         ContinuumStaxWriter writer = new ContinuumStaxWriter();
 
         File backupFile = new File( backupDirectory, BUILDS_XML );
@@ -227,13 +243,23 @@
         PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( properties );
 
         PlexusJdoUtils.addObject( pmf.getPersistenceManager(), database.getSystemConfiguration() );
-
+        
+        Map<Integer, BuildQueue> buildQueues = new HashMap<Integer, BuildQueue>();
+        
+        for ( Iterator i = database.getBuildQueues().iterator(); i.hasNext(); )
+        {            
+            BuildQueue buildQueue =  (BuildQueue) i.next();
+            
+            buildQueues.put( Integer.valueOf( buildQueue.getId() ), buildQueue );
+        }        
+        
         Map<Integer, Schedule> schedules = new HashMap<Integer, Schedule>();
         for ( Iterator i = database.getSchedules().iterator(); i.hasNext(); )
         {
             Schedule schedule = (Schedule) i.next();
-
-            schedule = (Schedule) PlexusJdoUtils.addObject( pmf.getPersistenceManager(), schedule );
+            schedule.setBuildQueues( getBuildQueuesBySchedule( buildQueues, schedule ) );
+            
+            schedule = (Schedule) PlexusJdoUtils.addObject( pmf.getPersistenceManager(), schedule );            
             schedules.put( Integer.valueOf( schedule.getId() ), schedule );
         }
 
@@ -336,7 +362,20 @@
                     "' when creating ProjectScmRoot data. Cycle detected: " + e.getMessage() );
                 continue;
             }
+        }               
+    }
+    
+    private List<BuildQueue> getBuildQueuesBySchedule ( Map<Integer, BuildQueue> allBuildQueues, Schedule schedule )
+    {
+        List<BuildQueue> buildQueuesRefs = schedule.getBuildQueues();
+        List<BuildQueue> buildQueues = new ArrayList<BuildQueue>();
+        
+        for ( BuildQueue buildQueue : buildQueuesRefs )
+        {
+            buildQueues.add( allBuildQueues.get( new Integer(buildQueue.getId()) ) );
         }
+        
+        return buildQueues;
     }
     
     private List<Project> getProjectsByGroupIdWithDependencies( PersistenceManagerFactory pmf, int projectGroupId )
Index: continuum-model/src/main/mdo/continuum.xml
===================================================================
--- continuum-model/src/main/mdo/continuum.xml	(revision 749099)
+++ continuum-model/src/main/mdo/continuum.xml	(working copy)
@@ -107,6 +107,14 @@
             <multiplicity>*</multiplicity>
           </association>
         </field>
+        <field>
+          <name>buildQueues</name>
+          <version>1.1.4+</version>
+          <association>
+            <type>BuildQueue</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>        
       </fields>
     </class>