diff --git a/Documentation/Models/Docbook/Tcar-ug/Repository.ent b/Documentation/Models/Docbook/Tcar-ug/Repository.ent index d47213b..f9060ee 100644 --- a/Documentation/Models/Docbook/Tcar-ug/Repository.ent +++ b/Documentation/Models/Docbook/Tcar-ug/Repository.ent @@ -1,7 +1,7 @@ - + diff --git a/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions.docbook b/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions.docbook index f85e960..a4c0b5e 100644 --- a/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions.docbook +++ b/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions.docbook @@ -3,7 +3,7 @@ Repository Conventions &repo-convs-mission; - &repo-convs-layout; + &repo-convs-infra; &repo-convs-worklines; &repo-convs-filenames; &repo-convs-relbdirs; diff --git a/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/infra.docbook b/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/infra.docbook new file mode 100644 index 0000000..69f49ba --- /dev/null +++ b/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/infra.docbook @@ -0,0 +1,142 @@ +
+ + Repository Infrastructure + + + &TCAR; is made of one central repository and + many working copies of that central repository. + The working copies are independent one another, can be + distributed all around the world and provide a local place for + designers, documenters, translators and programmers to perform + their work in a decentralized way. The central repository, on + the other hand, provides a common place for all independent + working copies to exchange data in the community. + + +
+ Repository infrastructure + + Repository infrastructure + + + + + + +
+ +
+ Subversion + + + The current infrastructure that holds &TCAR;, on the Internet, + is made of the following components: + + + + + + Subversion + — Modern Version Control System designed to replace CVS. + + + + + Trac + — Enhanced wiki and issue tracking system. + + + + + Httpd+WebDav as data exchanging route between the workstations + and the central repository, through the Internet. Httpd was + configured to provide service through SSL, so all traffic + between the workstations and the server be protected while it + travels across the Internet. + + + + The access rights are controlled by using a combination of both + Subversion's authorization files and Httpd's password files. + These files can be managed consistently through Trac's WebAdmin + plug-in. + + + + + + In this infrastructure, the first level of directories in the + repository provides the Subversion's standard + trunk-branches-tags layout. The second level of directories + provides organization for different work lines, as described + in . All other + subsequent directory levels from second level on exist to + organize specific concepts related to the work line they + belong to. + + +
+ +
+ Git + + + In addition to current Subversion infrastructure, we are + working on a Git infrastructure with the intention of + migrating the current Subversion infrastructure up to it, + progressively. The Git infrastructure we are working on is + made of the following components: + + + + + + Git — Fast version control system. + + + + + Gitolite — Highly flexible + server for git directory version tracker. + + + + + Gitweb — Simple web interface + to git repositories. + + + + + MantisBT — Web-based issue + tracking system. + + + + + The data exchanging route between the working copies and the + central repository takes place through SSH. + + + + + The access rights are controlled by using a combination of SSH + public keys and Gitolite's repository configuration file. + + + + + + In this infrastructure, the first level of directories in the + repository provides organization for different work lines, as + described in . All + other subsequent directory levels from second level on exist + to organize specific concepts related to the work line they + belong to. + + +
+ +
diff --git a/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/layout.docbook b/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/layout.docbook deleted file mode 100644 index e651a73..0000000 --- a/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/layout.docbook +++ /dev/null @@ -1,69 +0,0 @@ -
- - Repository Layout - - - &TCAR; is made of one central repository and - many working copies of that central repository. - The working copies are independent one another, can be - distributed all around the world and provide a local place for - designers, documenters, translators and programmers to perform - their work in a decentralized way. The central repository, on - the other hand, provides a common place for all independent - working copies to interchange data in the community. - - - - The current infrastructure that holds &TCAR; is supported by - Subversion, - a version control system which allows you to keep old versions - of files and directories (usually source code), keep a log of - who, when, and why changes occurred, etc., like CVS, RCS or - SCCS and Trac, - a web-based software project management and bug/issue tracking - system emphasizing ease of use and low ceremony. - - - - In addition to current Subversion infrastructure, we are - working on a Git infrastructure with the intention of - migrating the central repository to it, progressively. Here we - use Gitolite to manage Git repositories, Gitweb to make - changes browsable through the web and Mantis to track - repository issues. The main reason for this migration is to - take advantage of distributed version control system inside - &TCAR;. It also let people to commit changes locally, without - any network access, and later push local commits up to central - repository, when the network access be re-established. This - could be very useful in very different kind of situations. - - -
- Subversion - - - In this layout, the first level of directories inside &TCAR; - provides the Subversion's standard trunk-branches-tags layout. - The second level of directories provides organization for - different work lines, as described in . All other subsequent - directory levels from second level - on exist to organize specific concepts related to the work - line they belong to. - - -
- -
- Git - - In this layout, the first level of directories provides - organization for different work lines, as described in . All other subsequent - directory levels from second level on exist to organize - specific concepts related to the work line they belong to. - - -
- -