Author: rgoers Date: Sat Dec 11 12:22:08 2004 New Revision: 111621 URL: http://svn.apache.org/viewcvs?view=rev&rev=111621 Log: Converted discussion of cvs to svn
Modified: cocoon/site/src/documentation/content/xdocs/community/contrib.xml Modified: cocoon/site/src/documentation/content/xdocs/community/contrib.xml Url: http://svn.apache.org/viewcvs/cocoon/site/src/documentation/content/xdocs/community/contrib.xml?view=diff&rev=111621&p1=cocoon/site/src/documentation/content/xdocs/community/contrib.xml&r1=111620&p2=cocoon/site/src/documentation/content/xdocs/community/contrib.xml&r2=111621 ============================================================================== --- cocoon/site/src/documentation/content/xdocs/community/contrib.xml (original) +++ cocoon/site/src/documentation/content/xdocs/community/contrib.xml Sat Dec 11 12:22:08 2004 @@ -35,10 +35,9 @@ </p> <p>You can get your local working copy of the - <link href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/";>latest and - greatest code</link> (which you find in the cocoon-2.1 module in - the cvs.apache.org CVS code repository, or from the - <link href="http://xml.apache.org/cocoon/mirror.cgi#nightly";>CVS snapshots</link>). + <link href="http://svn.apache.org/viewcvs.cgi/cocoon/branches/BRANCH_2_1_X/?root=Apache-SVN";>latest + and greatest code</link> (which you find in the cocoon-2.1 module in + the svn.apache.org CVS code repository). Review the <link href="http://cocoon.apache.org/2.1/todo.html";>todo</link> list, choose a task (or perhaps you have noticed something that needs patching). Make the changes, do the testing, generate a patch, if you need then discuss it on @@ -104,7 +103,7 @@ <p> The Cocoon committers have been granted access by a vote of confidence, so they are assumed to be trustworthy enough to make changes directly in - CVS. Other contributors need to submit a patch via the Cocoon issue + the source repository. Other contributors need to submit a patch via the Cocoon issue tracker, Bugzilla. </p> @@ -128,7 +127,7 @@ <li>A UNIX-type operating system</li> <li>At least JDK version 1.3.x</li> </ul> - <p>And obviously, it should be tested against the current CVS snapshot of Cocoon!</p> + <p>And obviously, it should be tested using the current Cocoon source code!</p> <p>This testing is designed to iron out the most common kinds of incompatibility problems (Servlet >2.2 requirements; platform-dependent assumptions; JDK >1.2 code). @@ -177,8 +176,8 @@ </s1> <anchor id="cvshowto"/> - <s1 title="CVS Usage Precis"> - <p>An overview of how to use CVS to participate in Cocoon development. + <s1 title="Subversion Usage Precis"> + <p>An overview of how to use Subversion to participate in Cocoon development. Do not be afraid - you cannot accidently destroy the actual code repository, because you are working with a local copy as an anonymous user. Therefore, you do not have the system permissions to change anything. You can only @@ -187,10 +186,10 @@ </p> <p> - (Further general CVS usage information is at - <link href="http://www.cvshome.org/";>www.cvshome.org</link> and your local - <code>info cvs</code> pages or <code>man cvs</code> pages or user - documentation.) + (Further general Subversion usage information is at + <link href="http://subversion.tigris.org/";>subversion.tigris.org</link>. Other resources include + <link href="http://softech.informatik.uni-kl.de/softech/content/einfothek/e2348/e2328/index_ger.html";>a fast introduction</link> + and <link href="http://svnbook.red-bean.com/";>"Version Control with Subversion"</link>. </p> <p> @@ -202,22 +201,19 @@ <s2 title="How to Establish your Local Repository"> <p> - This will checkout the current copy of the master cvs repository and + This will checkout the current copy of the master repository and download it to your local disk. It will create a sub-directory called - <code>cocoon-2.1</code> + <code>BRANCH-2.1.X</code> </p> <ol> - <li><code>cd /usr/local/cvs</code></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic login</code></li> - <li>... use this password: <code>anoncvs</code></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout cocoon-2.1</code></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic logout</code></li> - <li><code>cd cocoon-2.1</code></li> + <li><code>cd /usr/local/svn/cocoon</code></li> + <li><code>svn co http://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X/</code></li> + <li><code>cd BRANCH-2.1.X</code></li> </ol> <p> - You now have the HEAD branch of the current development cvs repository + You now have the HEAD branch of the current development repository for Cocoon on your local system. Go ahead and build and deploy as usual. Make some changes, re-build, and see the effect. </p> @@ -237,11 +233,9 @@ </p> <ol> - <li><code>cd /usr/local/cvs</code></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic login</code></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic update -d -P cocoon-2.1</code></li> + <li><code>cd /usr/local/svn/cocoon/BRANCH-2.1.X</code></li> + <li><code>svn update</code></li> <li><strong>... pay attention to the update messages</strong></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic logout</code></li> </ol> </s2> @@ -265,48 +259,36 @@ <ol> <li>Make the desired changes in your local repository, build, test it thoroughly</li> - <li><code>cd /usr/local/cvs/cocoon-2.1/xdocs</code></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic login</code></li> - <li><code>cvs diff -u contrib.xml > $WORK/cocoon/contrib.xml.diff</code></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic logout</code></li> + <li><code>cd /usr/local/svn/cocoon/BRANCH-2.1.X/xdocs</code></li> + <li><code>svn diff contrib.xml > $WORK/cocoon/contrib.xml.diff</code></li> </ol> </s2> - <s2 title="How to get other CVS branches"> - <p>OK that got the HEAD branch of CVS into your local working copy. + <s2 title="How to get other branches"> + <p>OK that got the current branch of Cocoon into your local working copy. If you want some other branch, then find the relevant branch name from ViewCVS - <link href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/";>http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/</link> (see the Tags list at the bottom). + <link href="http://svn.apache.org/viewcvs.cgi/cocoon/";>http://svn.apache.org/viewcvs.cgi/cocoon/</link> (see the Tags list at the bottom). Then follow the same checkout procedure described above, using this ... </p> <ul> - <li><code>cd /usr/local/cvs/cocoon_some_branch</code></li> - <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout cocoon-2.0</code></li> + <li><code>cd /usr/local/svn/cocoon</code></li> + <li><code>svn co http://svn.apache.org/repos/asf/cocoon/branches/<i>branchname</i></code></li> </ul> </s2> </s1> - <anchor id="ssh"/> - <s1 title="CVS Committer with Secure Shell access"> + <anchor id="committer"/> + <s1 title="Committer repository access"> <p>After a developer has consistently provided contributions (code, documentation and discussion), then the rest of the cocoon-dev community - may vote to grant this developer commit access to CVS. - </p> - - <p>You will need secure access to the repository to be able to commit - patches. Here are some resources that help to get your machine configured - to use the repository over SSH. - </p> - - <ul> - <li><link href="http://cvsbook.red-bean.com/";>The CVS Book</link></li> - <li><link href="http://www.cvshome.org/";>www.cvshome.org</link></li> - <li><link href="http://jakarta.apache.org/site/cvsindex.html";>Jakarta - Guide: CVS Repository</link> - - See the bottom of the page for links to tips for UNIX and Windows. - Even if you are on UNIX, the Windows page will also help.</li> - </ul> + may vote to grant this developer commit access to the repository. To be able to + commit you will first need to generate a subversion password. To do this, ssh to + minotaur.apache.org and run <code>svnpasswd username</code>. This will ask + you for a subversion password. This is the user and password you can use when + checking in code. + </p> </s1> <anchor id="procedure"/> @@ -465,7 +447,8 @@ Reduce clutter. </li> <li> - You would usually do any development work against the HEAD branch of CVS. + You would usually do any development work against the BRANCH-2.1.X branch of the + subversion repository. </li> <li> When sending a patch, you usually do not need to worry about which CVS
