Linked this to [CONTINUUM-2106] and [CONTINUUM-2140] Thanks Wendy! -- Marica
On Sun, Apr 12, 2009 at 12:39 AM, Wendy Smoak <[email protected]> wrote: > Does this belong to an existing JIRA issue or does it need a new one? > I can open it and/or link things up if you provide a summary of what > this fixed. Thanks, -Wendy > > On Sun, Mar 29, 2009 at 5:59 PM, <[email protected]> wrote: > > Author: ctan > > Date: Mon Mar 30 00:59:58 2009 > > New Revision: 759817 > > > > URL: http://svn.apache.org/viewvc?rev=759817&view=rev > > Log: > > some more fixes in data management tool > > > > Modified: > > > > continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java > > > > continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml > > > > continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java > > > > continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java > > > > Modified: > continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java > > URL: > http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java?rev=759817&r1=759816&r2=759817&view=diff > > > ============================================================================== > > --- > continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java > (original) > > +++ > continuum/trunk/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java > Mon Mar 30 00:59:58 2009 > > @@ -257,6 +257,7 @@ > > Map<Integer, BuildQueue> buildQueues = new HashMap<Integer, > BuildQueue>(); > > for ( BuildQueue buildQueue : > (List<BuildQueue>)database.getBuildQueues() ) > > { > > + buildQueue = (BuildQueue) PlexusJdoUtils.addObject( > pmf.getPersistenceManager(), buildQueue ); > > buildQueues.put( buildQueue.getId(), buildQueue ); > > } > > > > @@ -408,6 +409,25 @@ > > releaseResult.setProjectGroup( projectGroups.get( > > Integer.valueOf( > releaseResult.getProjectGroup().getId() ) ) ); > > > > + ProjectGroup group = releaseResult.getProjectGroup(); > > + > > + for ( Project project : (List<Project>) group.getProjects() > ) > > + { > > + if ( project.getId() == > releaseResult.getProject().getId() ) > > + { > > + try > > + { > > + Project proj = > > + (Project) PlexusJdoUtils.getObjectById( > pmf.getPersistenceManager(), Project.class, project.getId(), null ); > > + releaseResult.setProject( proj ); > > + } > > + catch ( Exception e ) > > + { > > + throw new DataManagementException( e ); > > + } > > + } > > + } > > + > > releaseResult = > > (ContinuumReleaseResult) PlexusJdoUtils.addObject( > pmf.getPersistenceManager(), releaseResult ); > > } > > @@ -466,6 +486,7 @@ > > { > > buildQueues.add( allBuildQueues.get( Integer.valueOf( > buildQueue.getId() ) ) ); > > } > > + > > return buildQueues; > > } > > } > > > > Modified: > continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml > > URL: > http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml?rev=759817&r1=759816&r2=759817&view=diff > > > ============================================================================== > > --- > continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml > (original) > > +++ > continuum/trunk/continuum-data-management/data-management-jdo/src/test/resources/expected.xml > Mon Mar 30 00:59:58 2009 > > @@ -455,6 +455,7 @@ > > <delay>2</delay> > > <cronExpression>cronExpression2</cronExpression> > > <buildQueues> > > + <buildQueue id="2"></buildQueue> > > <buildQueue id="3"></buildQueue> > > </buildQueues> > > </schedule> > > > > Modified: > continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java > > URL: > http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java?rev=759817&r1=759816&r2=759817&view=diff > > > ============================================================================== > > --- > continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java > (original) > > +++ > continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java > Mon Mar 30 00:59:58 2009 > > @@ -312,6 +312,7 @@ > > testSchedule1.addBuildQueue( buildQueue2 ); > > > > testSchedule2 = createTestSchedule( "name2", "description2", 2, > "cronExpression2", true ); > > + testSchedule2.addBuildQueue( buildQueue2 ); > > testSchedule2.addBuildQueue( buildQueue3 ); > > > > testSchedule3 = createTestSchedule( "name3", "description3", 3, > "cronExpression3", true ); > > > > Modified: > continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java > > URL: > http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java?rev=759817&r1=759816&r2=759817&view=diff > > > ============================================================================== > > --- > continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java > (original) > > +++ > continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java > Mon Mar 30 00:59:58 2009 > > @@ -372,8 +372,9 @@ > > > > schedule = (Schedule) schedules.get( 1 ); > > assertScheduleEquals( testSchedule2, schedule ); > > - assertEquals( "check size of buildQueues", 1, > schedule.getBuildQueues().size() ); > > - assertBuildQueueEquals( buildQueue3, (BuildQueue) > schedule.getBuildQueues().get( 0 ) ); > > + assertEquals( "check size of buildQueues", 2, > schedule.getBuildQueues().size() ); > > + assertBuildQueueEquals( buildQueue2, (BuildQueue) > schedule.getBuildQueues().get( 0 ) ); > > + assertBuildQueueEquals( buildQueue3, (BuildQueue) > schedule.getBuildQueues().get( 1 ) ); > > > > schedule = (Schedule) schedules.get( 2 ); > > assertScheduleEquals( testSchedule3, schedule ); > > > > > > >
