Mailing-List: contact commits-help@ace.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ace.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1292363 - in /ace/site/trunk/content/dev-doc/use-cases:
 uc-01.mdtext uc-02.mdtext uc-03.mdtext usecases.mdtext
Date: Wed, 22 Feb 2012 16:04:13 -0000
To: commits@ace.apache.org
From: marrs@apache.org
Message-Id: <20120222160413.A27C82388A2C@eris.apache.org>

Author: marrs
Date: Wed Feb 22 16:04:12 2012
New Revision: 1292363

URL: http://svn.apache.org/viewvc?rev=1292363&view=rev
Log:
Added 3 new use cases.

Added:
    ace/site/trunk/content/dev-doc/use-cases/uc-02.mdtext
    ace/site/trunk/content/dev-doc/use-cases/uc-03.mdtext
Modified:
    ace/site/trunk/content/dev-doc/use-cases/uc-01.mdtext
    ace/site/trunk/content/dev-doc/use-cases/usecases.mdtext

Modified: ace/site/trunk/content/dev-doc/use-cases/uc-01.mdtext
URL: http://svn.apache.org/viewvc/ace/site/trunk/content/dev-doc/use-cases/uc-01.mdtext?rev=1292363&r1=1292362&r2=1292363&view=diff
==============================================================================
--- ace/site/trunk/content/dev-doc/use-cases/uc-01.mdtext (original)
+++ ace/site/trunk/content/dev-doc/use-cases/uc-01.mdtext Wed Feb 22 16:04:12 2012
@@ -1 +1,17 @@
-Title: Use Case 01 - Template
+Title: Use Case 01 - Checkout
+
+Check out data from a repository.
+
+## Flow
+
+### Basic Flow
+
+1. Editor asks discovery service for a location of aserver for a certain repository.
+2. Editor contacts the repository to ask for a list of versions.
+3. Editor checks out the latest version of the repository.
+
+### Alternative Flows
+
+* Server cannot be found.
+* Repository does not exist.
+* Latest version could not be checked out.

Added: ace/site/trunk/content/dev-doc/use-cases/uc-02.mdtext
URL: http://svn.apache.org/viewvc/ace/site/trunk/content/dev-doc/use-cases/uc-02.mdtext?rev=1292363&view=auto
==============================================================================
--- ace/site/trunk/content/dev-doc/use-cases/uc-02.mdtext (added)
+++ ace/site/trunk/content/dev-doc/use-cases/uc-02.mdtext Wed Feb 22 16:04:12 2012
@@ -0,0 +1,21 @@
+Title: Use Case 02 - Commit
+
+Check out data from a repository.
+
+## Flow
+
+### Basic Flow
+
+1. Editor asks discovery service for a location of a server for the repository.
+2. Editor sends the modified repository the server, together with the version number this edit was based on.
+3. Server reports back that the commit was successful.
+
+### Alternative Flows
+
+* Server cannot be found.
+* Repository does not exist.
+* Commit failed because of a merge conflict.
+
+## Details
+
+When a commit fails because of a merge conflict, the client is expected to check out the newly added version and (with or without interaction from a user) merge all changes and then try again. This is explained in [UC-03 Resolve merge conflict](uc-03.html).

Added: ace/site/trunk/content/dev-doc/use-cases/uc-03.mdtext
URL: http://svn.apache.org/viewvc/ace/site/trunk/content/dev-doc/use-cases/uc-03.mdtext?rev=1292363&view=auto
==============================================================================
--- ace/site/trunk/content/dev-doc/use-cases/uc-03.mdtext (added)
+++ ace/site/trunk/content/dev-doc/use-cases/uc-03.mdtext Wed Feb 22 16:04:12 2012
@@ -0,0 +1,23 @@
+Title: Use Case 03 - Resolve merge conflict
+
+Resolve merge conflicts and commit an updated version to a repository.
+
+This use case extends [commit](uc-02.html).
+
+## Flow
+
+### Basic Flow
+
+When the UC commit scenario fails because someone else committed a version while you were editing yours, the flow continues like this:
+
+1. Editor fetches the latest version and now has three versions locally: the original version he started with, the working copy he is trying to commit and this latest version.
+2. Editor reviews the three way diff and updates the working copy.
+3. Editor tries to commit the working copy again, now referencing the latest version again. This is the normal commit use case.
+
+### Alternative Flows
+
+* None.
+
+## Details
+
+This use case interacts with the commit use case and the user can go back and forward between the two as long as new merge conflicts pop up.

Modified: ace/site/trunk/content/dev-doc/use-cases/usecases.mdtext
URL: http://svn.apache.org/viewvc/ace/site/trunk/content/dev-doc/use-cases/usecases.mdtext?rev=1292363&r1=1292362&r2=1292363&view=diff
==============================================================================
--- ace/site/trunk/content/dev-doc/use-cases/usecases.mdtext (original)
+++ ace/site/trunk/content/dev-doc/use-cases/usecases.mdtext Wed Feb 22 16:04:12 2012
@@ -1,14 +1,14 @@
 Title: Use Cases
 
-Use Case Overview
------------------
+Overview
+--------
 
 TODO add a graphical view of all use cases
 
-Use Cases
----------
+List
+----
 
-* [UC-01 Template](uc-01.html)
-* [UC-01 Template](uc-01.html)
-* [UC-01 Template](uc-01.html)
-* TODO add real use cases
+* [UC-01 Checkout](uc-01.html)
+* [UC-02 Commit](uc-02.html)
+* [UC-03 Resolve merge conflict](uc-03.html)
+* TODO add more use cases