Abstract
The growing complexity of current software systems naturally conveyed their development toward incremental and distributed approaches to speed up the process. Several developers update the same artefact operating concurrent manipulations which need to be coherently combined. The interaction among those changes inevitably involves conflicts which must be detected and reconciled.
This paper proposes a domain specific language able to define and manage conflicts caused by cooperative updates over the same model elements. The approach relies on a model-based representation of model differences and enables the specification and the detection of both syntactical and semantic conflicts.
This is a preview of subscription content, log in via an institution to check access.
Access this chapter
Tax calculation will be finalised at checkout
Purchases are for personal use only
Preview
Unable to display preview. Download preview PDF.
References
Whitehead, J.: Collaboration in software engineering: A roadmap. In: FOSE 2007: 2007 Future of Software Engineering, Washington, DC, USA, pp. 214–225. IEEE Computer Society, Los Alamitos (2007)
Favre, J.M.: Meta-Model and Model Co-evolution within the 3D Software Space. In: Procs. of the Int. Workshop ELISA at ICSM (September 2003)
Mens, T.: A State-of-the-Art Survey on Software Merging. IEEE Trans. Softw. Eng. 28(5), 449–462 (2002)
Cicchetti, A., Di Ruscio, D., Pierantonio, A.: A Metamodel Independent Approach to Difference Representation. Journal of Object Technology 6(9), 165–185 (2007)
Lin, Y., Zhang, J., Gray, J.: Model Comparison: A Key Challenge for Transformation Testing and Version Control in Model Driven Software Development. In: OOPSLA Work. MDSD (2004)
Cicchetti, A., Di Ruscio, D., Eramo, R., Pierantonio, A.: Automating co-evolution in model-driven engineering. In: 12th IEEE International EDOC Conference (EDOC 2008), München (Germany) (to appear, 2008)
Gamma, E., Helm, R., Johnson, R., Vlissides, J.: Design Patterns. Addison-Wesley, Reading (1995)
Mens, T., Taentzer, G., Runge, O.: Detecting Structural Refactoring Conflicts Using Critical Pair Analysis. Electr. Notes Theor. Comput. Sci. 127(3), 113–128 (2005)
Stein, D., Hanenberg, S., Unland, R.: A Graphical Notation to Specify Model Queries for MDA Transformations on UML Models. In: Aßmann, U., Akşit, M., Rensink, A. (eds.) MDAFA 2003. LNCS, vol. 3599, pp. 77–92. Springer, Heidelberg (2005)
Filman, R., Elrad, T., Clarke, S., Aksit, M.: Aspect-Oriented Software Development. Addison-Wesley, Reading (2004)
Object Management Group (OMG): OCL 2.0 Specification, OMG Document formal/2006-05-01 (2006)
Cicchetti, A.: Difference Representation and Conflict Management in Model-Driven Engineering. PhD thesis, University of L’Aquila, Computer Science Dept. (2008)
Jouault, F., Kurtev, I.: Transforming Models with ATL. In: Bruel, J.M. (ed.) MoDELS 2005. LNCS, vol. 3844, pp. 128–138. Springer, Heidelberg (2006)
Cicchetti, A., Di Ruscio, D., Pierantonio, A.: Management of conflicts on the AMMA platform (May 2008), http://www.di.univaq.it/cicchetti/conflictManagement.php
Altmanninger, K., Bergmayr, A., Schwinger, W., Kotsis, G.: Semantically Enhanced Conflict Detection between Model Versions in SMoVer by Example. In: Procs of the Int. Workshop on Semantic-Based Software Development at OOPSLA 2007, Montral, Canada (October 2007) (to appear)
Cicchetti, A., Rossini, A.: Weaving models in conflict detection specifications. In: Procs of the ACM Symposium on Applied Computing (SAC 2007), Model Transformation track, pp. 1035–1036. ACM, New York (2007)
Thione, G.L., Perry, D.E.: Parallel Changes: Detecting Semantic Interferences. In: COMPSAC, pp. 47–56. IEEE Computer Society, Los Alamitos (2005)
Egyed, A.: Fixing Inconsistencies in UML Design Models. In: Procs. of the 29th ICSE 2007, pp. 292–301. IEEE Computer Society, Los Alamitos (2007)
Nentwich, C., Emmerich, W., Finkelstein, A.: Consistency Management with Repair Actions. In: Procs. of the 25th ICSE 2003, May 3-10, pp. 455–464. IEEE Computer Society, Los Alamitos (2003)
Bézivin, J., Bouzitouna, S., Fabro, M.D.D., Gervais, M.P., Jouault, F., Kolovos, D., Kurtev, I., Paige, R.: A Canonical Scheme for Model Composition. In: Rensink, A., Warmer, J. (eds.) ECMDA-FA 2006. LNCS, vol. 4066. Springer, Heidelberg (2006)
Reiter, T., Kapsammer, E., Retschitzegger, W., Wimmer, M.: Model Integration Through Mega Operations. In: Workshop on MDWE 2005 (July 2005)
Kolovos, D.S., Paige, R.F., Polack, F.: Merging Models with the Epsilon Merging Language (EML). In: Nierstrasz, O., Whittle, J., Harel, D., Reggio, G. (eds.) MoDELS 2006. LNCS, vol. 4199, pp. 215–229. Springer, Heidelberg (2006)
Engel, K.D., Paige, R.F., Kolovos, D.S.: Using a Model Merging Language for Reconciling Model Versions. In: Rensink, A., Warmer, J. (eds.) ECMDA-FA 2006. LNCS, vol. 4066, pp. 143–157. Springer, Heidelberg (2006)
Pottinger, R., Bernstein, P.A.: Merging Models Based on Given Correspondences. In: VLDB, pp. 826–873 (2003)
Author information
Authors and Affiliations
Editor information
Rights and permissions
Copyright information
© 2008 Springer-Verlag Berlin Heidelberg
About this paper
Cite this paper
Cicchetti, A., Di Ruscio, D., Pierantonio, A. (2008). Managing Model Conflicts in Distributed Development. In: Czarnecki, K., Ober, I., Bruel, JM., Uhl, A., Völter, M. (eds) Model Driven Engineering Languages and Systems. MODELS 2008. Lecture Notes in Computer Science, vol 5301. Springer, Berlin, Heidelberg. https://doi.org/10.1007/978-3-540-87875-9_23
Download citation
DOI: https://doi.org/10.1007/978-3-540-87875-9_23
Publisher Name: Springer, Berlin, Heidelberg
Print ISBN: 978-3-540-87874-2
Online ISBN: 978-3-540-87875-9
eBook Packages: Computer ScienceComputer Science (R0)