Subversion Repositories DevTools

Rev

Rev 7047 | Rev 7049 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7047 Rev 7048
Line 2... Line 2...
2
 
2
 
3
 
3
 
4
import java.sql.SQLException;
4
import java.sql.SQLException;
5
import java.util.ArrayList;
5
import java.util.ArrayList;
6
import java.util.Date;
6
import java.util.Date;
-
 
7
import java.util.Iterator;
7
 
8
 
8
import com.erggroup.buildtool.daemon.BuildDaemon;
9
import com.erggroup.buildtool.daemon.BuildDaemon;
9
import com.erggroup.buildtool.daemon.BuildThread;
10
import com.erggroup.buildtool.daemon.BuildThread;
10
import com.erggroup.buildtool.daemon.MasterThread;
11
import com.erggroup.buildtool.daemon.MasterThread;
11
import com.erggroup.buildtool.daemon.SlaveThread;
12
import com.erggroup.buildtool.daemon.SlaveThread;
Line 43... Line 44...
43
     *  the data being used
44
     *  the data being used
44
     */
45
     */
45
    public class myReleaseManager extends ReleaseManagerUtf
46
    public class myReleaseManager extends ReleaseManagerUtf
46
	{
47
	{
47
        int mAmyReleaseManager = 1;
48
        int mAmyReleaseManager = 1;
-
 
49
        boolean mPackageInitDone = false;
-
 
50
        ArrayList<Package> testPackageCollection = new ArrayList<Package>();
-
 
51
       
48
        
52
        
49
		public myReleaseManager(final String connectionString, final String username, final String password)
53
		public myReleaseManager(final String connectionString, final String username, final String password)
50
		{
54
		{
51
			super(connectionString, username, password);
55
			super(connectionString, username, password);
52
		}
56
		}
Line 55... Line 59...
55
		{
59
		{
56
			super();
60
			super();
57
		}
61
		}
58
		
62
		
59
		@Override
63
		@Override
60
		public void queryPackageVersions(RippleEngine rippleEngine, ArrayList<Package> packageCollection,
64
		public void queryPackageVersions(RippleEngine rippleEngine, ArrayList<Package> packageCollection, int baseline) throws SQLException, Exception
61
				int baseline) throws SQLException, Exception
-
 
62
		{
65
		{
-
 
66
		 
-
 
67
		    //    Filter for the packages that are in the release
-
 
68
            initTestPackages( rippleEngine,testPackageCollection);
-
 
69
		    for (Iterator<Package> it = testPackageCollection.iterator(); it.hasNext(); )
-
 
70
	        {
-
 
71
	            Package p = it.next();
-
 
72
	            if (!p.mDirectlyPlanned && p.mTestBuildInstruction == 0 && p.mForcedRippleInstruction == 0)
-
 
73
	            {
-
 
74
	                p.mIsNotReleased = false;
-
 
75
	                packageCollection.add(p);
-
 
76
	            }
-
 
77
	        }
-
 
78
 
-
 
79
		}
-
 
80
		
-
 
81
		@Override
-
 
82
        public void queryWips(RippleEngine rippleEngine, ArrayList<Package> packageCollection, int baseline) throws SQLException, Exception
-
 
83
        {
-
 
84
            //    Filter for the packages that are WIPs
-
 
85
	        initTestPackages( rippleEngine,testPackageCollection);
-
 
86
            for (Iterator<Package> it = testPackageCollection.iterator(); it.hasNext(); )
-
 
87
            {
-
 
88
                Package p = it.next();
-
 
89
                if (p.mDirectlyPlanned )
-
 
90
                {
-
 
91
                    p.mIsNotReleased = true;
-
 
92
                    p.mDirectlyPlanned = true;
-
 
93
                    p.mBuildReason = BuildReason.NewVersion;
-
 
94
                    packageCollection.add(p);
-
 
95
                }
-
 
96
            }
-
 
97
 
-
 
98
        }
-
 
99
		
-
 
100
		@Override
-
 
101
        public void queryTest(RippleEngine rippleEngine, ArrayList<Package> packageCollection, int baseline) throws SQLException, Exception
-
 
102
        {
-
 
103
		    //    Filter for the packages that are TEST builds
-
 
104
            initTestPackages( rippleEngine,testPackageCollection);		    
-
 
105
            for (Iterator<Package> it = testPackageCollection.iterator(); it.hasNext(); )
-
 
106
            {
-
 
107
    		    Package p = it.next();
-
 
108
                if (p.mTestBuildInstruction != 0 )
-
 
109
                {
-
 
110
                    p.mIsNotReleased = true;
-
 
111
                    p.mDirectlyPlanned = false;
-
 
112
                    p.mBuildReason = BuildReason.Test;
-
 
113
                    packageCollection.add(p);
-
 
114
                }
-
 
115
            }
-
 
116
            
-
 
117
        }
-
 
118
		
-
 
119
		@Override
-
 
120
        public void queryRipples(RippleEngine rippleEngine, ArrayList<Package> packageCollection, int baseline) throws SQLException, Exception
-
 
121
        {
-
 
122
		    //    Filter for the packages that are forced Ripples
-
 
123
            initTestPackages(rippleEngine,testPackageCollection);		    
-
 
124
            for (Iterator<Package> it = testPackageCollection.iterator(); it.hasNext(); )
-
 
125
            {		    
-
 
126
    		    Package p = it.next();
-
 
127
                if (p.mForcedRippleInstruction != 0)
-
 
128
                {
-
 
129
                    p.mIsNotReleased = true;
-
 
130
                    p.mDirectlyPlanned = false;
-
 
131
                    p.mBuildReason = BuildReason.Ripple;
-
 
132
                    packageCollection.add(p);
-
 
133
                } 
-
 
134
            }
-
 
135
        }
-
 
136
		
-
 
137
		/** Build a single package collection
-
 
138
		 * It will be split up when requested by the classes under test 
-
 
139
		 * 
-
 
140
		 * @param packageCollection
-
 
141
		 */
-
 
142
		private void initTestPackages(RippleEngine rippleEngine, ArrayList<Package> packageCollection)
-
 
143
		{
-
 
144
		    if (mPackageInitDone)
-
 
145
		    {
-
 
146
		        return;
-
 
147
		    }
-
 
148
		    mPackageInitDone = true;
-
 
149
		    packageCollection.clear();
63
 
150
 
64
	        /* a highly unlikely set of packages
151
	        /* a highly unlikely set of packages
65
	         * planned info
152
	         * planned info
66
	         * pv_id pkg_id pkg_name                     v_ext pkg_vcs_tag                            change_type
153
	         * pv_id pkg_id pkg_name                     v_ext pkg_vcs_tag                            change_type
67
	         * 0     76     UncommonDependency           .tim  0.TIM.WIP \vob\UncommonDependency           P
154
	         * 0     76     UncommonDependency           .tim  0.TIM.WIP \vob\UncommonDependency           P
Line 337... Line 424...
337
	         * 24    227    Car                          1.0.10000.tim    .tim  Car_1.0.10000.tim                   \vob\Car
424
	         * 24    227    Car                          1.0.10000.tim    .tim  Car_1.0.10000.tim                   \vob\Car
338
	         */
425
	         */
339
	         if ( mConnectionString.compareTo("iteration1") != 0 )
426
	         if ( mConnectionString.compareTo("iteration1") != 0 )
340
	         {
427
	         {
341
	           p = new Package(76, 0, "UncommonDependency", "0.0.1000.tim", ".tim", "UncommonDependency.tim", "CC::/vob/UncommonDependency::UncommonDependency_0.0.1000.tim", 'x');
428
	           p = new Package(76, 0, "UncommonDependency", "0.0.1000.tim", ".tim", "UncommonDependency.tim", "CC::/vob/UncommonDependency::UncommonDependency_0.0.1000.tim", 'x');
342
	           Integer pv_id = new Integer(0);
-
 
343
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
344
	           Package plannedPackage = findPackage(p.mAlias, packageCollection);
429
	           Package plannedPackage = findPackage(p.mAlias, packageCollection);
345
	           
430
	           
346
	           if ( plannedPackage == NULL_PACKAGE )
431
	           if ( plannedPackage == NULL_PACKAGE )
347
	           {
432
	           {
348
	             packageCollection.add(p);
433
	             packageCollection.add(p);
Line 356... Line 441...
356
	         if ( mConnectionString.compareTo("iteration1") != 0 
441
	         if ( mConnectionString.compareTo("iteration1") != 0 
357
	           && mConnectionString.compareTo("iteration2") != 0
442
	           && mConnectionString.compareTo("iteration2") != 0
358
	           && mConnectionString.compareTo("iteration3") != 0 )
443
	           && mConnectionString.compareTo("iteration3") != 0 )
359
	         {
444
	         {
360
	           p = new Package(908, 3, "SolarisCentricProduct", "1.1.0000.tim", ".tim", "SolarisCentricProduct.tim", "CC::/vob/SolarisCentricProduct::SolarisCentricProduct_1.1.0000.tim", 'm');
445
	           p = new Package(908, 3, "SolarisCentricProduct", "1.1.0000.tim", ".tim", "SolarisCentricProduct.tim", "CC::/vob/SolarisCentricProduct::SolarisCentricProduct_1.1.0000.tim", 'm');
361
	           Integer pv_id = new Integer(3);
-
 
362
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
363
	           Package plannedPackage = findPackage(p.mAlias, packageCollection);
446
	           Package plannedPackage = findPackage(p.mAlias, packageCollection);
364
	           
447
	           
365
	           if ( plannedPackage == NULL_PACKAGE )
448
	           if ( plannedPackage == NULL_PACKAGE )
366
	           {
449
	           {
367
	             packageCollection.add(p);
450
	             packageCollection.add(p);
Line 376... Line 459...
376
	           && mConnectionString.compareTo("iteration2") != 0
459
	           && mConnectionString.compareTo("iteration2") != 0
377
	           && mConnectionString.compareTo("iteration3") != 0
460
	           && mConnectionString.compareTo("iteration3") != 0
378
	           && mConnectionString.compareTo("iteration4") != 0 )
461
	           && mConnectionString.compareTo("iteration4") != 0 )
379
	         {
462
	         {
380
	           p = new Package(6, 4, "GenericProduct", "1.0.1000.tim", ".tim", "GenericProduct.tim", "CC::/vob/GenericProduct::GenericProduct_1.0.1000.tim", 'M');
463
	           p = new Package(6, 4, "GenericProduct", "1.0.1000.tim", ".tim", "GenericProduct.tim", "CC::/vob/GenericProduct::GenericProduct_1.0.1000.tim", 'M');
381
	           Integer pv_id = new Integer(4);
-
 
382
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
383
	           Package plannedPackage = findPackage(p.mAlias, packageCollection);
464
	           Package plannedPackage = findPackage(p.mAlias, packageCollection);
384
	           
465
	           
385
	           if ( plannedPackage == NULL_PACKAGE )
466
	           if ( plannedPackage == NULL_PACKAGE )
386
	           {
467
	           {
387
	             packageCollection.add(p);
468
	             packageCollection.add(p);
Line 397... Line 478...
397
	           && mConnectionString.compareTo("iteration3") != 0
478
	           && mConnectionString.compareTo("iteration3") != 0
398
	           && mConnectionString.compareTo("iteration4") != 0
479
	           && mConnectionString.compareTo("iteration4") != 0
399
	           && mConnectionString.compareTo("iteration5") != 0 )
480
	           && mConnectionString.compareTo("iteration5") != 0 )
400
	         {
481
	         {
401
	           p = new Package(11, 5, "Product", "1.0.0000.tim", ".tim", "Product.tim", "CC::/vob/Product::Product_1.0.0000.tim", 'M');
482
	           p = new Package(11, 5, "Product", "1.0.0000.tim", ".tim", "Product.tim", "CC::/vob/Product::Product_1.0.0000.tim", 'M');
402
	           Integer pv_id = new Integer(5);
-
 
403
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
404
	           Package plannedPackage = findPackage(p.mAlias, packageCollection);
483
	           Package plannedPackage = findPackage(p.mAlias, packageCollection);
405
	           
484
	           
406
	           if ( plannedPackage == NULL_PACKAGE )
485
	           if ( plannedPackage == NULL_PACKAGE )
407
	           {
486
	           {
408
	             packageCollection.add(p);
487
	             packageCollection.add(p);
Line 412... Line 491...
412
	             plannedPackage.mVersion = "1.0.0000";
491
	             plannedPackage.mVersion = "1.0.0000";
413
	           }
492
	           }
414
	         }
493
	         }
415
	        
494
	        
416
	         p = new Package(8, 7, "CotsWithFunnyVersion", "hoopla2_x.cots", ".cots", "CotsWithFunnyVersion.cots", "CC::/vob/CotsWithFunnyVersion::CotsWithFunnyVersion_hoopla2_x", 'x');
495
	         p = new Package(8, 7, "CotsWithFunnyVersion", "hoopla2_x.cots", ".cots", "CotsWithFunnyVersion.cots", "CC::/vob/CotsWithFunnyVersion::CotsWithFunnyVersion_hoopla2_x", 'x');
417
	         Integer pv_id = new Integer(7);
-
 
418
	         rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
419
	         Package plannedPackage = findPackage(p.mAlias, packageCollection);
496
	         Package plannedPackage = findPackage(p.mAlias, packageCollection);
420
	         
497
	         
421
	         if ( plannedPackage == NULL_PACKAGE )
498
	         if ( plannedPackage == NULL_PACKAGE )
422
	         {
499
	         {
423
	           packageCollection.add(p);
500
	           packageCollection.add(p);
Line 426... Line 503...
426
	         {
503
	         {
427
	           plannedPackage.mVersion = "hoopla2_x";
504
	           plannedPackage.mVersion = "hoopla2_x";
428
	         }
505
	         }
429
	         
506
	         
430
	         p = new Package(17, 8, "NotInAnyWayReproducible", "1.0.0.tim", ".tim", "NotInAnyWayReproducible.tim", "CC::NA::NA", 'x');
507
	         p = new Package(17, 8, "NotInAnyWayReproducible", "1.0.0.tim", ".tim", "NotInAnyWayReproducible.tim", "CC::NA::NA", 'x');
431
	         pv_id = new Integer(8);
-
 
432
	         rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
433
	         plannedPackage = findPackage(p.mAlias, packageCollection);
508
	         plannedPackage = findPackage(p.mAlias, packageCollection);
434
	        
509
	        
435
	         if ( plannedPackage == NULL_PACKAGE )
510
	         if ( plannedPackage == NULL_PACKAGE )
436
	         {
511
	         {
437
	           packageCollection.add(p);
512
	           packageCollection.add(p);
Line 444... Line 519...
444
	         if ( mConnectionString.compareTo("iteration1") == 0 
519
	         if ( mConnectionString.compareTo("iteration1") == 0 
445
	           || mConnectionString.compareTo("iteration2") == 0
520
	           || mConnectionString.compareTo("iteration2") == 0
446
	           || mConnectionString.compareTo("iteration3") == 0 )
521
	           || mConnectionString.compareTo("iteration3") == 0 )
447
	         {
522
	         {
448
	           p = new Package(908, 10, "SolarisCentricProduct", "1.0.0000.tim", ".tim", "SolarisCentricProduct.tim", "CC::/vob/SolarisCentricProduct::SolarisCentricProduct_1.0.0000.tim", 'm');
523
	           p = new Package(908, 10, "SolarisCentricProduct", "1.0.0000.tim", ".tim", "SolarisCentricProduct.tim", "CC::/vob/SolarisCentricProduct::SolarisCentricProduct_1.0.0000.tim", 'm');
449
	           pv_id = new Integer(10);
-
 
450
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
451
	           plannedPackage = findPackage(p.mAlias, packageCollection);
524
	           plannedPackage = findPackage(p.mAlias, packageCollection);
452
	          
525
	          
453
	           if ( plannedPackage == NULL_PACKAGE )
526
	           if ( plannedPackage == NULL_PACKAGE )
454
	           {
527
	           {
455
	             packageCollection.add(p);
528
	             packageCollection.add(p);
Line 459... Line 532...
459
	             plannedPackage.mVersion = "1.0.0000";
532
	             plannedPackage.mVersion = "1.0.0000";
460
	           }
533
	           }
461
	         }
534
	         }
462
	        
535
	        
463
	         p = new Package(16, 11, "LinuxCentricProduct", "1.0.0000.tim", ".tim", "LinuxCentricProduct.tim", "CC::/vob/LinuxCentricProduct::LinuxCentricProduct_1.0.0000.tim", 'x');
536
	         p = new Package(16, 11, "LinuxCentricProduct", "1.0.0000.tim", ".tim", "LinuxCentricProduct.tim", "CC::/vob/LinuxCentricProduct::LinuxCentricProduct_1.0.0000.tim", 'x');
464
	         pv_id = new Integer(11);
-
 
465
	         rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
466
	         plannedPackage = findPackage(p.mAlias, packageCollection);
537
	         plannedPackage = findPackage(p.mAlias, packageCollection);
467
	        
538
	        
468
	         if ( plannedPackage == NULL_PACKAGE )
539
	         if ( plannedPackage == NULL_PACKAGE )
469
	         {
540
	         {
470
	           packageCollection.add(p);
541
	           packageCollection.add(p);
Line 473... Line 544...
473
	         {
544
	         {
474
	           plannedPackage.mVersion = "1.0.0000";
545
	           plannedPackage.mVersion = "1.0.0000";
475
	         }
546
	         }
476
	        
547
	        
477
	         p = new Package(312, 12, "Win32CentricProduct", "1.0.0000.tim", ".tim", "Win32CentricProduct.tim", "CC::/vob/Win32CentricProduct::Win32CentricProduct_1.0.0000.tim", 'x');
548
	         p = new Package(312, 12, "Win32CentricProduct", "1.0.0000.tim", ".tim", "Win32CentricProduct.tim", "CC::/vob/Win32CentricProduct::Win32CentricProduct_1.0.0000.tim", 'x');
478
	         pv_id = new Integer(12);
-
 
479
	         rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
480
	         plannedPackage = findPackage(p.mAlias, packageCollection);
549
	         plannedPackage = findPackage(p.mAlias, packageCollection);
481
	        
550
	        
482
	         if ( plannedPackage == NULL_PACKAGE )
551
	         if ( plannedPackage == NULL_PACKAGE )
483
	         {
552
	         {
484
	           packageCollection.add(p);
553
	           packageCollection.add(p);
Line 492... Line 561...
492
	           || mConnectionString.compareTo("iteration2") == 0
561
	           || mConnectionString.compareTo("iteration2") == 0
493
	           || mConnectionString.compareTo("iteration3") == 0
562
	           || mConnectionString.compareTo("iteration3") == 0
494
	           || mConnectionString.compareTo("iteration4") == 0 )
563
	           || mConnectionString.compareTo("iteration4") == 0 )
495
	         {
564
	         {
496
	           p = new Package(6, 13, "GenericProduct", "1.0.0000.tim", ".tim", "GenericProduct.tim", "CC::/vob/ToBeMovedFromHere::GenericProduct_1.0.0000.tim", 'M');
565
	           p = new Package(6, 13, "GenericProduct", "1.0.0000.tim", ".tim", "GenericProduct.tim", "CC::/vob/ToBeMovedFromHere::GenericProduct_1.0.0000.tim", 'M');
497
	           pv_id = new Integer(13);
-
 
498
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
499
	           plannedPackage = findPackage(p.mAlias, packageCollection);
566
	           plannedPackage = findPackage(p.mAlias, packageCollection);
500
	         }
567
	         }
501
	        
568
	        
502
	         if ( plannedPackage == NULL_PACKAGE )
569
	         if ( plannedPackage == NULL_PACKAGE )
503
	         {
570
	         {
Line 507... Line 574...
507
	         {
574
	         {
508
	           plannedPackage.mVersion = "1.0.0000";
575
	           plannedPackage.mVersion = "1.0.0000";
509
	         }
576
	         }
510
	        
577
	        
511
	         p = new Package(81, 14, "AdvisoryDependency", "1.0.0000.tim", ".tim", "AdvisoryDependency.tim", "CC::/vob/AdvisoryDependency::AdvisoryDependency_1.0.0000.tim", 'x');
578
	         p = new Package(81, 14, "AdvisoryDependency", "1.0.0000.tim", ".tim", "AdvisoryDependency.tim", "CC::/vob/AdvisoryDependency::AdvisoryDependency_1.0.0000.tim", 'x');
512
	         pv_id = new Integer(14);
-
 
513
	         rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
514
	         plannedPackage = findPackage(p.mAlias, packageCollection);
579
	         plannedPackage = findPackage(p.mAlias, packageCollection);
515
	        
580
	        
516
	         if ( plannedPackage == NULL_PACKAGE )
581
	         if ( plannedPackage == NULL_PACKAGE )
517
	         {
582
	         {
518
	           packageCollection.add(p);
583
	           packageCollection.add(p);
Line 528... Line 593...
528
	           || mConnectionString.compareTo("iteration4") == 0
593
	           || mConnectionString.compareTo("iteration4") == 0
529
	           || mConnectionString.compareTo("iteration5") == 0
594
	           || mConnectionString.compareTo("iteration5") == 0
530
	           || mConnectionString.compareTo("iteration6") == 0 )
595
	           || mConnectionString.compareTo("iteration6") == 0 )
531
	         {
596
	         {
532
	           p = new Package(1, 15, "MergedProduct", "1.0.0000.tim", ".tim", "MergedProduct.tim", "CC::/vob/MergedProduct::MergedProduct_1.0.0000.tim", 'm');
597
	           p = new Package(1, 15, "MergedProduct", "1.0.0000.tim", ".tim", "MergedProduct.tim", "CC::/vob/MergedProduct::MergedProduct_1.0.0000.tim", 'm');
533
	           pv_id = new Integer(15);
-
 
534
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
535
	           plannedPackage = findPackage(p.mAlias, packageCollection);
598
	           plannedPackage = findPackage(p.mAlias, packageCollection);
536
	         }
599
	         }
537
	         else
600
	         else
538
	         {
601
	         {
539
	           p = new Package(1, 16, "MergedProduct", "1.0.0000.tim", ".tim", "MergedProduct.tim", "CC::/vob/MergedProduct::MergedProduct_1.0.0000.tim", 'm');
602
	           p = new Package(1, 16, "MergedProduct", "1.0.0000.tim", ".tim", "MergedProduct.tim", "CC::/vob/MergedProduct::MergedProduct_1.0.0000.tim", 'm');
540
	           pv_id = new Integer(16);
-
 
541
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
542
	           plannedPackage = findPackage(p.mAlias, packageCollection);
603
	           plannedPackage = findPackage(p.mAlias, packageCollection);
543
	         }
604
	         }
544
	        
605
	        
545
	         if ( plannedPackage == NULL_PACKAGE )
606
	         if ( plannedPackage == NULL_PACKAGE )
546
	         {
607
	         {
Line 552... Line 613...
552
	         }
613
	         }
553
	         
614
	         
554
	         if ( mConnectionString.compareTo("iteration1") == 0 )
615
	         if ( mConnectionString.compareTo("iteration1") == 0 )
555
	         {
616
	         {
556
	           p = new Package(45, 22, "Banana", "1.1.0000.tim", ".tim", "Banana.tim", "CC::/vob/Banana::Banana_1.1.0000.tim", 'x');
617
	           p = new Package(45, 22, "Banana", "1.1.0000.tim", ".tim", "Banana.tim", "CC::/vob/Banana::Banana_1.1.0000.tim", 'x');
557
	           pv_id = new Integer(22);
-
 
558
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
559
	           plannedPackage = findPackage(p.mAlias, packageCollection);
618
	           plannedPackage = findPackage(p.mAlias, packageCollection);
560
	          
619
	          
561
	           if ( plannedPackage == NULL_PACKAGE )
620
	           if ( plannedPackage == NULL_PACKAGE )
562
	           {
621
	           {
563
	             packageCollection.add(p);
622
	             packageCollection.add(p);
Line 566... Line 625...
566
	           {
625
	           {
567
	             plannedPackage.mVersion = "1.1.0000";
626
	             plannedPackage.mVersion = "1.1.0000";
568
	           }
627
	           }
569
	  
628
	  
570
	           p = new Package(18, 23, "Aardvark", "1.1.1000.tim", ".tim", "Aardvark.tim", "CC::/vob/Aardvark::Aardvark_1.1.1000.tim", 'x');
629
	           p = new Package(18, 23, "Aardvark", "1.1.1000.tim", ".tim", "Aardvark.tim", "CC::/vob/Aardvark::Aardvark_1.1.1000.tim", 'x');
571
	           pv_id = new Integer(18);
-
 
572
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
573
	           plannedPackage = findPackage(p.mAlias, packageCollection);
630
	           plannedPackage = findPackage(p.mAlias, packageCollection);
574
	          
631
	          
575
	           if ( plannedPackage == NULL_PACKAGE )
632
	           if ( plannedPackage == NULL_PACKAGE )
576
	           {
633
	           {
577
	             packageCollection.add(p);
634
	             packageCollection.add(p);
Line 580... Line 637...
580
	           {
637
	           {
581
	             plannedPackage.mVersion = "1.1.1000";
638
	             plannedPackage.mVersion = "1.1.1000";
582
	           }
639
	           }
583
	           
640
	           
584
	           p = new Package(227, 24, "Car", "1.0.10000.tim", ".tim", "Car.tim", "CC::/vob/Car::Car_1.0.10000.tim", 'x');
641
	           p = new Package(227, 24, "Car", "1.0.10000.tim", ".tim", "Car.tim", "CC::/vob/Car::Car_1.0.10000.tim", 'x');
585
	           pv_id = new Integer(24);
-
 
586
	           rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
587
	           plannedPackage = findPackage(p.mAlias, packageCollection);
642
	           plannedPackage = findPackage(p.mAlias, packageCollection);
588
	          
643
	          
589
	           if ( plannedPackage == NULL_PACKAGE )
644
	           if ( plannedPackage == NULL_PACKAGE )
590
	           {
645
	           {
591
	             packageCollection.add(p);
646
	             packageCollection.add(p);
Line 597... Line 652...
597
	         }
652
	         }
598
 
653
 
599
             if ( mConnectionString.compareTo("iteration1") != 0 && mConnectionString.compareTo("iteration2") != 0 )
654
             if ( mConnectionString.compareTo("iteration1") != 0 && mConnectionString.compareTo("iteration2") != 0 )
600
             {
655
             {
601
               p = new Package(34, 2, "CommonDependency", "2.0.0000.tim", ".tim", "CommonDependency.tim", "CC::/vob/CommonDependency::CommonDependency_2.0.0000.tim", 'x');
656
               p = new Package(34, 2, "CommonDependency", "2.0.0000.tim", ".tim", "CommonDependency.tim", "CC::/vob/CommonDependency::CommonDependency_2.0.0000.tim", 'x');
602
               pv_id = new Integer(2);
-
 
603
               rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
604
               plannedPackage = findPackage(p.mAlias, packageCollection);
657
               plannedPackage = findPackage(p.mAlias, packageCollection);
605
               
658
               
606
               if ( plannedPackage == NULL_PACKAGE )
659
               if ( plannedPackage == NULL_PACKAGE )
607
               {
660
               {
608
                 packageCollection.add(p);
661
                 packageCollection.add(p);
Line 614... Line 667...
614
             }	         
667
             }	         
615
	         
668
	         
616
	           if ( mConnectionString.compareTo("iteration1") == 0 || mConnectionString.compareTo("iteration2") == 0 )
669
	           if ( mConnectionString.compareTo("iteration1") == 0 || mConnectionString.compareTo("iteration2") == 0 )
617
	             {
670
	             {
618
	               p = new Package(34, 9, "CommonDependency", "1.0.0000.tim", ".tim", "CommonDependency.tim", "CC::/vob/CommonDependency::CommonDependency_1.0.0000.tim", 'x');
671
	               p = new Package(34, 9, "CommonDependency", "1.0.0000.tim", ".tim", "CommonDependency.tim", "CC::/vob/CommonDependency::CommonDependency_1.0.0000.tim", 'x');
619
	               pv_id = new Integer(9);
-
 
620
	               rippleEngine.mReleasedPvIDCollection.add(pv_id);
-
 
621
	               plannedPackage = findPackage(p.mAlias, packageCollection);
672
	               plannedPackage = findPackage(p.mAlias, packageCollection);
622
	              
673
	              
623
	               if ( plannedPackage == NULL_PACKAGE )
674
	               if ( plannedPackage == NULL_PACKAGE )
624
	               {
675
	               {
625
	                 packageCollection.add(p);
676
	                 packageCollection.add(p);
Line 949... Line 1000...
949
	           p.mAdvisoryRipple = true;
1000
	           p.mAdvisoryRipple = true;
950
	         }
1001
	         }
951
 
1002
 
952
	         p = findPackage(14, packageCollection);
1003
	         p = findPackage(14, packageCollection);
953
	         p.mAdvisoryRipple = true;
1004
	         p.mAdvisoryRipple = true;
-
 
1005
	         
-
 
1006
	         
-
 
1007
	         
-
 
1008
	         
-
 
1009
	         // Insert sequence for later sorting
-
 
1010
	         Package.setSequence(packageCollection);
954
	      	
1011
	      	
955
		}
1012
		}
956
	
1013
	
957
		@Override
1014
		@Override
958
		public void queryReleaseConfig(final String hostname) throws SQLException, Exception
1015
		public void queryReleaseConfig(final String hostname) throws SQLException, Exception