jakarta-site-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skitch...@apache.org
Subject svn commit: r171295 - in /jakarta/site: docs/site/source.html xdocs/site/source.xml
Date Sun, 22 May 2005 08:56:30 GMT
Author: skitching
Date: Sun May 22 01:56:30 2005
New Revision: 171295

URL: http://svn.apache.org/viewcvs?rev=171295&view=rev
Log:
Added subversion information.

Modified:
    jakarta/site/docs/site/source.html
    jakarta/site/xdocs/site/source.xml

Modified: jakarta/site/docs/site/source.html
URL: http://svn.apache.org/viewcvs/jakarta/site/docs/site/source.html?rev=171295&r1=171294&r2=171295&view=diff
==============================================================================
--- jakarta/site/docs/site/source.html (original)
+++ jakarta/site/docs/site/source.html Sun May 22 01:56:30 2005
@@ -170,10 +170,11 @@
 <p>
 <div class="section-body">
   <p>
-  The Project's codebase is maintained in shared information
-  repositories using CVS on the dev.apache.org machine. Only
-  Committers have write access to these repositories. Everyone has
-  read access via anonymous CVS.
+  The Project's codebase is maintained in shared information repositories using
+  either Subversion (svn.apache.org) or CVS (cvs.apache.org). Only Committers
+  have write access to these repositories. Everyone has anonymous read access.
+  More information on the Jakarta source code repositories is available 
+  <a href="cvsindex.html">here</a>.
   </p>
 
   <p>
@@ -197,10 +198,10 @@
 
   <p>
   Committers should update the copyright notice on the Apache License to 
-  include the current year when they revise a source file. If it is 2002, 
+  include the current year when they revise a source file. If it is 2005, 
   and you revise a source file from 1999, change the copyright notice in 
-  the license to cite "1999, 2002". If the file was from 2001, we would 
-  change it to 2001-2002. And so forth. This will happen most often in the 
+  the license to cite "1999, 2005". If the file was from 2004, we would 
+  change it to 2004-2005. And so forth. This will happen most often in the 
   early part of a year, but maintenance of the copyright date should occur 
   year-round, as needed.
   </p>
@@ -304,37 +305,42 @@
   The patch should be created by using the <span class="code">diff
   -u</span> command from the original software file(s) to the modified
   software file(s). It is recommended that you submit patches against 
-  the latest CVS versions of the software in order to avoid conflicts. 
-  This will also ensure that you are not submitting a patch for a problem
-  that has already been resolved.
-  </p>
-
-  <p>
-  For example:
+  the latest version of the software in the source code repository
+  in order to avoid conflicts. This will also ensure that you are
+  not submitting a patch for a problem that has already been resolved.
   </p>
 
+  <p>For projects using Subversion</p>
   <div class="source">
-  diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt
+    svn diff Main.java &gt;&gt; patchfile.txt
   </div>
 
-  <p>or (preferred)</p>
+  <p>or for projects using CVS</p>
+  <div class="source">
+    cvs diff -u Main.java &gt;&gt; patchfile.txt
+  </div>
 
+  <p>or if you have to:</p>
   <div class="source">
-  cvs diff -u Main.java &gt;&gt; patchfile.txt
+    diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt
   </div>
 
-  <p>or (Win32)</p>
+  <p>
+  For Subversion access on Win32, there is a native command-line tool
+  available, or there are a number of graphical tools including 
+  <a href="http://tortoisesvn.tigris.org">TortoiseSVN</a>.
+  </p>
 
   <p>
-  You can use <a href="http://www.wincvs.org/">WinCVS</a> for a nice GUI or
-  you can install <a href="http://sources.redhat.com/cygwin/">Cygwin</a> which
-  will enable you to use the bash shell and also installs a lot of other
+  For CVS access on Win32, you can use <a href="http://www.wincvs.org/">WinCVS</a>

+  for a nice GUI or you can install <a href="http://sources.redhat.com/cygwin/">Cygwin</a>

+  which will enable you to use the bash shell and also installs a lot of other
   utilities (such as diff and patch) that will turn your PC into a virtual
   Unix machine.
   </p>
 
- <p>
-<strong>Note:</strong>
+   <p>
+   <strong>Note:</strong>
 <br/>
  If you use <a href="http://www.wincvs.org/">WinCVS</a>, move to 
  <code>[Admin]</code> -&gt; <code>[Command Line]</code> Menu

@@ -355,7 +361,7 @@
  </p>
 
   <p>
-  More detailed instructions for accessing Jakarta's CVS repositories with
+  More detailed instructions for accessing Jakarta's source code repositories with
   various tools and IDEs, including anonymous access, can be found 
   <a href="./cvsindex.html">here</a>.
   </p>
@@ -376,9 +382,9 @@
   </p>
 
   <p>
-  When a patch has been checked into CVS, the person who checked in the
-  patch should send a message to the person who sent the patch in as
-  well as the mailing list specifying that the patch has been checked
+  When a patch has been checked into the source code repository, the person who
+  checked in the patch should send a message to the person who sent the patch
+  in as well as the mailing list specifying that the patch has been checked
   in. The reason is that not everyone watches commit messages and it is
   helpful for others to know what has been checked in and when in order
   to help prevent people from applying the patch at the same time.

Modified: jakarta/site/xdocs/site/source.xml
URL: http://svn.apache.org/viewcvs/jakarta/site/xdocs/site/source.xml?rev=171295&r1=171294&r2=171295&view=diff
==============================================================================
--- jakarta/site/xdocs/site/source.xml (original)
+++ jakarta/site/xdocs/site/source.xml Sun May 22 01:56:30 2005
@@ -24,10 +24,11 @@
 
   <section name="Source Repositories">
   <p>
-  The Project's codebase is maintained in shared information
-  repositories using CVS on the dev.apache.org machine. Only
-  Committers have write access to these repositories. Everyone has
-  read access via anonymous CVS.
+  The Project's codebase is maintained in shared information repositories using
+  either Subversion (svn.apache.org) or CVS (cvs.apache.org). Only Committers
+  have write access to these repositories. Everyone has anonymous read access.
+  More information on the Jakarta source code repositories is available 
+  <a href="cvsindex.html">here</a>.
   </p>
 
   <p>
@@ -52,10 +53,10 @@
 
   <p>
   Committers should update the copyright notice on the Apache License to 
-  include the current year when they revise a source file. If it is 2002, 
+  include the current year when they revise a source file. If it is 2005, 
   and you revise a source file from 1999, change the copyright notice in 
-  the license to cite "1999, 2002". If the file was from 2001, we would 
-  change it to 2001-2002. And so forth. This will happen most often in the 
+  the license to cite "1999, 2005". If the file was from 2004, we would 
+  change it to 2004-2005. And so forth. This will happen most often in the 
   early part of a year, but maintenance of the copyright date should occur 
   year-round, as needed.
   </p>
@@ -158,36 +159,42 @@
   The patch should be created by using the <span class="code">diff
   -u</span> command from the original software file(s) to the modified
   software file(s). It is recommended that you submit patches against 
-  the latest CVS versions of the software in order to avoid conflicts. 
-  This will also ensure that you are not submitting a patch for a problem
-  that has already been resolved.
-  </p>
-
-  <p>
-  For example:
+  the latest version of the software in the source code repository
+  in order to avoid conflicts. This will also ensure that you are
+  not submitting a patch for a problem that has already been resolved.
   </p>
 
+  <p>For projects using Subversion</p>
   <source>
-  diff -u Main.java.orig Main.java >> patchfile.txt
+    svn diff Main.java >> patchfile.txt
   </source>
 
-  <p>or (preferred)</p>
+  <p>or for projects using CVS</p>
+  <source>
+    cvs diff -u Main.java >> patchfile.txt
+  </source>
 
+  <p>or if you have to:</p>
   <source>
-  cvs diff -u Main.java >> patchfile.txt
+    diff -u Main.java.orig Main.java >> patchfile.txt
   </source>
 
-  <p>or (Win32)</p>
+  <p>
+  For Subversion access on Win32, there is a native command-line tool
+  available, or there are a number of graphical tools including 
+  <a href="http://tortoisesvn.tigris.org">TortoiseSVN</a>.
+  </p>
 
   <p>
-  You can use <a href="http://www.wincvs.org/">WinCVS</a> for a nice GUI or
-  you can install <a href="http://sources.redhat.com/cygwin/">Cygwin</a> which
-  will enable you to use the bash shell and also installs a lot of other
+  For CVS access on Win32, you can use <a href="http://www.wincvs.org/">WinCVS</a>

+  for a nice GUI or you can install <a href="http://sources.redhat.com/cygwin/">Cygwin</a>

+  which will enable you to use the bash shell and also installs a lot of other
   utilities (such as diff and patch) that will turn your PC into a virtual
   Unix machine.
   </p>
 
- <p><strong>Note:</strong><br/>
+   <p>
+   <strong>Note:</strong><br/>
  If you use <a href='http://www.wincvs.org/'>WinCVS</a>, move to 
  <code>[Admin]</code> -&gt; <code>[Command Line]</code> Menu

  and type: <br/>
@@ -206,7 +213,7 @@
  </p>
 
   <p>
-  More detailed instructions for accessing Jakarta's CVS repositories with
+  More detailed instructions for accessing Jakarta's source code repositories with
   various tools and IDEs, including anonymous access, can be found 
   <a href="./cvsindex.html">here</a>.
   </p>
@@ -227,9 +234,9 @@
   </p>
 
   <p>
-  When a patch has been checked into CVS, the person who checked in the
-  patch should send a message to the person who sent the patch in as
-  well as the mailing list specifying that the patch has been checked
+  When a patch has been checked into the source code repository, the person who
+  checked in the patch should send a message to the person who sent the patch
+  in as well as the mailing list specifying that the patch has been checked
   in. The reason is that not everyone watches commit messages and it is
   helpful for others to know what has been checked in and when in order
   to help prevent people from applying the patch at the same time.



---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: site-cvs-help@jakarta.apache.org


Mime
View raw message