Overview

There are several different branches under the httpd + module in the Apache SVN repository that pertain to the different + releases. The top level can be perused with the + SVN ViewCVS pages. + The main modules pertaining to the httpd server source + are:

Maintaining the Sources =20

Almost all files relating to Apache, either the actual sources or the -files that aren't part of the distribution, are maintained in a -CVS repository. Here is the way i= n=20 -which changes are applied:

+files that aren't part of the distribution, are now maintained in an +SVN repository. Here is the= way +in which changes are applied:

=20

Developer checks out a copy of the files on which it wants to - work, into a private working directory: + work (in this case, the trunk), into a private working directory + called httpd-trunk:

-
% cvs checkout apache +
% svn co http://svn.apache.org/repos/asf/httpd/httpd/trunk + httpd-trunk

- This step only needs to be performed once. + This step only needs to be performed once (unless the private working + directory is tainted or deleted.) Committers should use a URI prefix + of https on the checkout, to save themselves headaches la= ter.
Developer keeps its working directory synchronised with changes +
Developer keeps his/her working directory synchronised with changes made to the repository:

-
% cvs update apache +
% svn up httpd-trunk

@@ -51,12 +96,13 @@ them:

-
% cvs diff -u apache/src/mod_mime.c > /tmp/foo +
% svn diff httpd-trunk/modules/http/mod_mime.c > /tmp/fo= o

- The /tmp/foo file is mailed to the developers list so + The /tmp/foo file is mailed to the + developers lis= t so they can consider the value/validity of the patch. It is also worth making sure your code follows the Apache style, as described by the GNU indent flags in the .indent.pro file in every source directory. @@ -66,7 +112,7 @@ Thing, the developer checks the changes into the repository:

-
% cvs commit apache/src/mod_mime.c +
% svn commit httpd-trunk/modules/http/mod_mime.c

@@ -75,78 +121,65 @@

-CVS Modules -

There are several different modules in the Apache CVS repository:

- -

apache-1.3 -

To create a directory tree containing the 1.3 sources, - and call it apache-1.3, change your current directory - to the parent of the tree and then check the 1.3 sources - out as follows:

- +SVN Modules +

+ +

httpd-1.3 +

To create a directory tree containing the 1.3 sources, + and call it apache-1.3, change your current directory + to the parent of the tree and then check the 1.3 sources + out as follows:

+ % cd /usr/local/apache -% cvs checkout apache-1.3 +% svn co http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x apache= -1.3

=20

httpd-2.0 -

To create a directory tree containing the 2.0 sources, - and call it httpd-2.0, change your current directory - to the parent of the tree and then check the 2.0 sources - out as follows:

- +

To create a directory tree containing the 2.0 sources, + and call it httpd-2.0, change your current directory + to the parent of the tree and then check the 2.0 sources + out as follows:

+ % cd /usr/local/apache -% cvs checkout -d httpd-2.0 -r APACHE_2_0_BRANCH httpd-2.0 -% cd httpd-2.0/srclib -% cvs checkout -r APR_0_9_BRANCH apr -% cvs checkout -r APU_0_9_BRANCH apr-util -

The httpd-2.0 repository takes advantage of APR and APR-util from the - Apache portable run-time, so those must be checked out separately. - Because not all httpd contributors have access to APR, you may need to - use anonymous CVS to get those repositories. We are looking in to=20 - solving this problem.

+% svn co http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x httpd-= 2=2E0

=20

httpd-2.1 -

If you want to check out the bleeding edge of development, the httpd-2.1 - development tree (slated for a release 2.2), use cvs HEAD as follows:

- +

If you want to check out the bleeding edge of development, the + httpd-2.1 development tree (slated for a release 2.2), and call it + httpd-trunk, checkout as follows:

+ % cd /usr/local/apache -% cvs checkout -d httpd-2.1 httpd-2.0 -% cd httpd-2.1/srclib -% cvs checkout apr apr-util -

- -

site -

This module contains the files that live at - http://www.apache.org/. The directory on the host that - maps to that URL is actually a set of checked-out working copies of - the CVS files.

- - It is important that the files on the Web host not be modified - directly. If you want or need to change one, check it out into a - private working copy, modify that, commit the - change into CVS, and then perform a cvs update -dP to - bring the host directory into sync with the CVS sources. - -

- The Web site directories are not maintained in synch with - the CVS files automatically. They are manually updated from CVS by - various people as they consider appropriate. This is usually not an - issue, unless a group of files are being updated according to an - ongoing group discussion. -

+% svn co http://svn.apache.org/repos/asf/httpd/httpd/trunk httpd-trunk

=20

httpd-site -

Like the site module, this one is used to=20 - maintain the files that comprise a website - in this case, - http://httpd.apache.org/. Also like the previous module, - the directory on the server is a checked-out working copy of this - module.

This module contains the files that live at http://httpd.apach= e=2Eorg/. + The directory on the host that maps to that URL is actually a set of + checked-out working copies of the SVN files.

The SVN URI is + https://svn.apache.org/repos/asf/httpd/site/trunk/docs. + + It is important that the files on the Web host not be modified + directly. If you want or need to change one, check it out into a + private working copy, modify that, commit the + change into SVN, and then perform a svn update to + bring the host directory into sync with the SVN sources. + +

The Web site directories (as opposed to files) are not + maintained in synch with the SVN files automatically. They are + manually updated from SVN by various people as they consider + appropriate. This is usually not an issue, unless a group of files + are being updated according to an ongoing group discussion.

=20

httpd-dist -

Like the site module, this one is used ot +

Like the httpd-site module, this one is used to maintain the files that comprise a website - in this case, http://www.apache.org/dist/httpd/. Also like the previous module, the directory on the server is a checked-out @@ -154,68 +187,25 @@ directory, we only have the surrounding documentation and control files checked into this module -- the actual tarballs are simply copied to www.apache.org.

The SVN URI is + https://svn.apache.org/repos/asf/httpd/httpd/dist.

Committers would generally deal with this module when "rolling" a + release. This is a series of steps that comprise an actual new + release of the Apache httpd software. Amongst other things, the + key to this module is the tools/ directory, which + contains the release.sh shell script. More information + on the policies and procedures relating to rolling releases can be + found on the Release Guidelines page.

=20

-Setting Up Remote CVS - -

Most of the Apache Group members with access to the CVS repository -actually do their work on their local machines and keep synchronised -with the repository through remote CVS. See the ABOUT APACHE -page for information about how the group works and people get access -to the CVS repository.) One way to set this up using the -ssh=20 -(secure shell) tool:

- -

You need an account on the Apache repository - system. =20 - If you've been "voted in" for direct access to the=20 - repository, this should have been set up for you. - (You know if you have it.) -
Include the following in your login files on your - local (UNIX) machine: -
```
-       setenv CVSROOT repository-system:/home/cvs
-       setenv CVS_RSH /usr/local/bin/ssh
-       setenv CVS_SERVER /usr/local/bin/cvs
-    
```
- Adjust the last two paths to correctly reflect the locations of - cvs and ssh on your local system. -
Set up the following environment in your account on the Apache - repository system:
-
```
-      setenv CVSROOT /home/cvs
-      setenv CVS_RSH /usr/local/bin/ssh
-      setenv CVS_SERVER /usr/local/bin/cvs
-    
```
-
These are the correct locations for the repository system, - so you don't need to edit them.
-
On your local system generate your SSH public key file=20 - ~/.ssh/identity.pub via ssh-keygen and then = put - it in ~/.ssh/authorized_keys on the repository system. If= you - use the ssh-agent this will allow you to access the repos= itory - without having to enter a password for each CVS operation. Use - ssh-add and enter your passphrase once when you start a - session, and ssh-add -D at the end of the session to - delete your unencrypted key(s) from the agent. -

- -

-Working with the Apache Source CVS Repository remotely - -

Ralf Engelschall has written an excellent explanation on how to use -remote CVS with the "cvsup" functionality we have available now.

+Setting Up Remote SVN =20 -

-http://www.engelschall.com/pw/apache/cvsguide/

A brief overview of getting started with SVN committer access can be +found +here. One key change to note is that SSH is not used anymore for +committer access, due to the functional differences with SVN.

=20