The document discusses EMF Compare, a tool for comparing and merging models. EMF Compare 1.0.x brings model diffing and merging capabilities to Eclipse, including support for multiple file formats and integration with version control systems. It allows capturing changes to models and applying or undoing them later. EMF Compare has uses for team development, testing, research, and more.

1. TeamWork with models
Compare and Merge with EMF Compare in Galileo
Cédric Brun cedric.brun@obeo.fr
Obeo
France
© Copyright 2007 Obeo.; made available under the EPL v1.0 | March 24, 2009

2. TeamWork with Models
Compare and Merge with EMF Compare
Eclipse Strategic Member
Eclipse Modeling Project
Model to Text : Acceleo
Model to Model : ATL
EMF Compare
Extended Editing Framework
Papyrus UML
Eclipse STP – SCA
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

3. TeamWork with Models
Compare and Merge with EMF Compare
Models matters ...
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

4. TeamWork with Models
Compare and Merge with EMF Compare
Eclipse Modeling project
Modeling, Meta-modeling
Tooling, Editors and modelers
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

5. TeamWork with Models
Compare and Merge with EMF Compare
Models are used to :
Capture and structure knowledge
Normalization and exchange
Scaffold applications
Code generation
Model transformation
Analyse legacy applications
And many more useful things
(see all the modeling projects !)
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

6. TeamWork with Models
Compare and Merge with EMF Compare
As such, models evolves
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

7. TeamWork with Models
Compare and Merge with EMF Compare
Team support
Compare, merge support
SCM integration
History analysis
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

8. TeamWork with Models
Compare and Merge with EMF Compare
Galileo brings ...
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

9. TeamWork with Models
Compare and Merge with EMF Compare
EMF Compare 1.0.x
End User
Metamodel agnostic diff/merge supporting multiple ressources -> demo
Platform Team API integration (CVS, SVN and GIT) -> demo
EPatch : capturing changes and applying/un-applying them later
Graphical modelers integration (draft) ->demo
Developper
Extensible diff model export -> demo
Match/Diff algorithms extension
Standalone
Developper guide
Community
Graduation from incubation status
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

10. TeamWork with Models
Compare and Merge with EMF Compare
Other use cases
RCP/Standalone
Testbed for Research
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

11. TeamWork with Models
Compare and Merge with EMF Compare
Even more use cases !
Development
Incremental processing
Non regression testing (ATL..)
Research
Graphical Comparison (Tobias Jähnel - University of Applied Science Nuernberg)
Patch model (Davide Di Ruscio - Università degli Studi dell' Aquila )
Selective regression testing (Leila Naslavsky – Donald Bren School of Information and
Computer Science)
Semantic conflicts and refactoring detection (Philip Langer - Vienna University of
Technology)
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009

12. TeamWork with Models
Compare and Merge with EMF Compare
Thanks for your attention
EMFT newsgroup and mailling list
#eclipse-modeling on freenode, meet cbrun and Kellindil
Links
http://www.eclipse.org/modeling/emft?project=compare
http://wiki.eclipse.org/index.php/EMF_Compare
cedric.brun@obeo.fr
© Copyright 2008 Obeo.; made available under the EPL v1.0 | March 24, 2009