Task #183

Manually merge Manlio's branch into trunk

Added by Stefano Lenzi over 5 years ago. Updated over 5 years ago.

Status:Closed Start date:02/24/2013
Priority:Immediate Due date:
Assignee:Stefano Lenzi % Done:

100%

Category:all Spent time: -
Target version:unplanned

Description

Considering that the last Manlio's merge has caused some issue(i.e. some bugfixes completed on trunk where overridden), see related issue, we are going to merge again the code. For this reason we created a copy of the last version trunk before manlio's merge to the premerge branch

svn cp https://svn.aaloa.org/projects/zb4osgi/trunk@576 https://svn.aaloa.org/projects/zb4osgi/sandbox/premerge

After that the merging will be completed the

https://svn.aaloa.org/projects/zb4osgi/sandbox/premerge

will be used as new trunk with the following command
svn mv https://svn.aaloa.org/projects/zb4osgi/trunk https://svn.aaloa.org/projects/zb4osgi/sandbox/broken-merged-trunk
svn mv https://svn.aaloa.org/projects/zb4osgi/sandbox/premerge https://svn.aaloa.org/projects/zb4osgi/trunk

So that all the history will be tracked by Subversion correctly

At this point we will have to merge back all the chages from r604 to r628 so that the new trunk will contains all the latest bug fixing


Related issues

related to Bug #176: Test unit broken afer marging Manlio's branch Closed 01/29/2013
related to Bug #174: Test unit disable, and issue after merge from sandbox Closed 01/26/2013
related to Bug #180: Problem discovering devices after revision 584 Closed 02/01/2013
blocks Improvement #170: SimpleSensor device (deviceID 0x000c) Closed 01/04/2013
blocks Bug #185: Level Control Switch home automation device wrong Closed 02/24/2013

Associated revisions

Revision 636
Added by Stefano Lenzi over 5 years ago

Merging of CC2530 has been completed ( refs #183 )

Revision 637
Added by Stefano Lenzi over 5 years ago

Completed merging for zigbee.zcl.library ( refs #183 )
We will have to merge back r607 because one of the tests unit fails

Revision 640
Added by Stefano Lenzi over 5 years ago

Merging zigbee.basedriver in progress ( refs #183 ), merging incomplete see following note:
- Activator depends to it.cnr.isti.zb4osgi.api.Eventing which is going to be removed?
- NetworkBrowserThreadi, ImportingQueue replace the old discovery algorithm whihc should be added instead of removed ( refs #180 )
- DeviceBuilderThread defines a sort of blacklisting which has to be discussed ( refs #35 )
- ConfigurationService is not used anymore, why?

Fixed wrong end-of-line coding

Revision 642
Added by Stefano Lenzi over 5 years ago

Merging zigbee.basedriver ( refs #183 )
Added the LQI network browser without replacing the old network discorvery ( refs #180 )
Removed experimental API it.cnr.isti.zb4osgi.api.Eventing
Fixed configuration changes on updates ( see ConfigurationService )
Removed permitJoin and lqi attribute from ImportingQueue.ZigBeeAddress type
Removed addressesAlreadyInserted from ImportingQueue because it is a duplicate check perfomed with AFLayer.getAFLayer(driver).getZigBeeNetwork().containsDevice( String, short ) method

Revision 643
Added by Stefano Lenzi over 5 years ago

Added check for duplicate cluster in HADeviceBase
Fixed parent pom dependencies
Completed merging for zigbee.ha.driver ( refs #183 )

Revision 644
Added by Stefano Lenzi over 5 years ago

Removed unused dependencies ( refs #183 )

Revision 645
Added by Stefano Lenzi over 5 years ago

Completed merging back from r604i to r630 for zigbee.zcl.library project ( refs #183 )
Verified all the JUnit
The definition of Attributes does not require anymore to use the setType changed visibility as private

Revision 646
Added by Stefano Lenzi over 5 years ago

Completed merging back from r604 to r630 for zigbee.tester project ( refs #183 )

Revision 647
Added by Stefano Lenzi over 5 years ago

Completed merging back from r604 to r630 for zigbee.ha.driver project ( refs #183 )

Revision 648
Added by Stefano Lenzi over 5 years ago

Completed merging back from r604 to r630 for zigbee.CC2530.driver project ( refs #183 )

Revision 649
Added by Stefano Lenzi over 5 years ago

Completed merging back from r604 to r630 for zigbee.basedriver.api project ( refs #183 )

Revision 650
Added by Stefano Lenzi over 5 years ago

Completed merging back from r604 to r630 for zigbee.basedriver project ( refs #183 )

Revision 651
Added by Stefano Lenzi over 5 years ago

Completed merging back from r604 to r630 for the remaing project ( refs #183 )

Revision 653
Added by Stefano Lenzi over 5 years ago

Moving trunk that contains a problematic set of changeset from r559 to r563 that delated some bugfixes to the sandbox ( #refs 183 )

Revision 654
Added by Stefano Lenzi over 5 years ago

Moving the correctly merged code as new trunk ( fixes #183 )

History

#1 Updated by Stefano Lenzi over 5 years ago

See also r638 and r639 , which were committed with a wrong ticket number :(

#2 Updated by Stefano Lenzi over 5 years ago

  • % Done changed from 0 to 20

Merginging of the project completed, we now have to fix all the JUnit issues, and then merge back all the changset from r604 to r628 which where applied on
trunk ( source:trunk )

#3 Updated by Stefano Lenzi over 5 years ago

Only zigbee.zcl.library test unit fails at r644, due to a bugfix introduce in r616

#4 Updated by Stefano Lenzi over 5 years ago

  • % Done changed from 20 to 80

The merging is complete we only have to move the premerge ( source:sandbox/premerge ) to trunk ( source:trunk )
Also the changeset r652 is part of this task

#5 Updated by Stefano Lenzi over 5 years ago

  • Status changed from In Progress to Closed
  • % Done changed from 80 to 100

Applied in changeset r654.

Also available in: Atom PDF