Team Support

Table of Contents

logo-large

Tutorial Actifsource Tutorial – Team Support
Required Time - 20 Minutes
Prerequisites - Actifsource Tutorial – Actifsource Tutorial – Installing Actifsource
- Actifsource Tutorial – Simple Service
Goal - Compare actifsource Resources using the Local History
- Edit Conflicts using the actifsource Resource Compare Editor
Topics covered - Setup VCS (Version Control System)
- Install Eclipse Team Provider
- Share Project
- Local History
- Edit Conflicts
Notation ↪ To do
ⓘ Information
• Bold: Terms from actifsource or other technologies and tools
• Bold underlined: actifsource Resources
• Monospaced: User input
• Italics: Important terms in current situation
Disclaimer The authors do not accept any liability arising out of the application or use of any information or equipment described herein. The information contained within this document is by its very nature incomplete. Therefore the authors accept no responsibility for the precise accuracy of the documentation contained herein. It should be used rather as a guide and starting point.
Contact Actifsource AG
Täfernstrasse 37
5405 Baden-Dättwil
Switzerland
www.actifsource.com
Trademark Actifsource is a registered trademark of Actifsource AG in Switzerland, the EU, USA, and China. other names appearing on the site may be trademarks of their respective owners.

Overview

  • Setup your VCS (Version Control System)

  • Install an Eclipse Team Provider

  • Share your project using the Eclipse Team Support

  • Compare actifsource Resources using the Local History

    image2 image2

  • Edit Conflicts using the actifsource Resource Compare Editor

    image3 image3

Part I Preparation

  • Prepare a new actifsource Project as seen in the Actifsource Tutorial Simple Service

    • Setup the Target Folder src
    • Create a Generic Domain Model
    • Create a Specific Domain Model
    • Create a Code Template

  • Use any package structure. For Example

image4 image4

Part II Share Project

Info

The Eclipse Team Support comes all ready with the default installation of Eclipse.

Share Project

image5 image5

  • Share your Project via the context menu Team on your project

image6 image6

  • The shared project shows revisions and icon overlays

Part III Local History

  • The Local History is part of the Eclipse Team Support
Info

Note that the Local History works also on non-shared projects

Local History

image7 image7

  • Change any of your Resources
  • Save the Resource

image8 image8

  • The '>' in the Resource Navigator indicates, that the Resource has been changed
  • From the context menu of Patient choose Team/Show Local History…

image2 image2

  • Select two of the shown versions of your interest
  • From the context menu, select Compare with Each Other

image9 image9

  • The actifsource Resource Compare Editor will show you any changes between the selected versions

Part III Edit Conflicts

  • Working in a team may lead to conflicts if more than one developer changes the same resource at the same time
  • The Resource Compare Editor helps to resolve these conflicts

Edit Conflicts

image10 image10

  • In the meantime, another developer (Developer 2) added a new Call DeleteEverything to the Service Patient
  • As we have added the Call DeleteAll in the same resource before, there will be a conflict when updating from the repository
  • To simulate another developer, just check out your project on a different location
  • Modify the resource as shown above
  • Check in the modified resource to your repository

image11 image11

- Back to Developer

  • Before checking in our modification (Call DeleteAll to the Service Patient) let's check for updates
  • From the context menu of your project, select Team/Update

image12 image12

  • As expected, a conflict occurs

image13 image13

  • From the context menu of the conflicting resource Patient select Team/Edit Conflicts…

image3 image3

  • The actifsource Resource Compare Editor will show you the changes
  • Your local version on the left
  • The repository version on the right
  • Use the marked tools to copy changes from one version to the other

image14 image14

  • Once resolved all conflicts, choose Team/Mark as Merged from the context menu

image15 image15

  • From the context menu, select Team/Commit to commit the actual work to your repository

actifsource-point-large