User: starksm
Date: 01/06/21 01:19:52
Modified: . CVSAdmin.jsp
Log:
Add section on CHECKING IN A PATCH ON A NON-JBOSS CVS MODULE RELEASE BRANCH
Fix some typos and clarify a bit
Revision Changes Path
1.4 +97 -30 newsite/CVSAdmin.jsp
Index: CVSAdmin.jsp
===================================================================
RCS file: /cvsroot/jboss/newsite/CVSAdmin.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CVSAdmin.jsp 2001/06/18 19:59:50 1.3
+++ CVSAdmin.jsp 2001/06/21 08:19:52 1.4
@@ -1,6 +1,6 @@
<jsp:include page="head.jsp" flush="true" />
<jsp:include page="slogan.jsp" flush="true" >
- <jsp:param name="SLOGAN" value="JBoss CVS Administration Policy"/>
+ <jsp:param name="SLOGAN" value="JBoss CVS Administration Policy"/>
</jsp:include>
@@ -66,46 +66,62 @@
<li>
Prior to event 1, the latest alpha development build is Rel_2_1_0_57. At this
point it is decided to create a new binary release.
+</li>
<li>
-Event 1 is the creation of a 2.2 branch. It is labeled with a branch tag of
Branch_2_2. This fixes the
+This is the creation of a 2.2 branch. It is labeled with a branch tag of
Branch_2_2. This fixes the
major version to 2 and the minor version to 2 for all tags on this branch.
+</li>
<li>
-Event 2 is the creation of a Rel_2_2_0_0 beta release tag in the branch. It serves
as
-an alias to the state of the main branch at the time the 2.2 branch was created.
-<li>
-Event 3 is the creation of a Rel_2_3_0_0 alpha release tag on the main trunk. It
+This is the creation of a Rel_2_3_0_0 alpha release tag on the main trunk. It
it is also an alias to the state of the main branch at the time of the 2.2 branch
creation.
+</li>
<li>
-Event 4 is the integration of the first patch/change into the 2.2 branch. After
+This is the creation of a Rel_2_2_0_0 beta release tag in the branch. It serves as
+an alias to the state of the main branch at the time the 2.2 branch was created.
+</li>
+<li>
+This is the integration of the first patch/change into the 2.2 branch. After
the code is commited the Rel_2_2_0_1 tag is applied.
+</li>
<li>
-Event 5 is the release of the initial 2.2 branch binary. The release is tagged
+This is the release of the initial 2.2 branch binary. The release is tagged
as JBoss_2_2_0 as well as Rel_2_2_1_0 to start the next beta series.
+</li>
<li>
-Event 6 is the integration of the first patch/change after the 2.2.0 binary
+This is the integration of the first patch/change after the 2.2.0 binary
release. After the code is commited the Rel_2_2_1_1 tag is applied.
<li>
-Event 7 is the release of the second 2.2 branch binary. The release is tagged
+This is the release of the second 2.2 branch binary. The release is tagged
as JBoss_2_2_1 as well as Rel_2_2_2_0 to start the next beta series.
+</li>
+<li>
+This is the release of a development binary. The release is tagged
+as JBoss_2_3_1 as well as Rel_2_3_1_0 to start the next alpha series.
+Prior to this there had also been a JBoss_2_3_0 development binary
+not shown in the diagram.
+</li>
<li>
-Event 8 is the creation of a new binary release branch. After some period of
-development on the 2.3 releases(Rel_2_3_0_0 to Rel_2_3_1_37), it is decided
+This is the creation of a new binary release branch. After some period of
+development on the 2.3 portion of the trunk(Rel_2_3_0_0 to Rel_2_3_1_37), it is
decided
to release a final binary incorporating the main trunk functionality. The
new 2.4 branch is labeled with a branch tag of Branch_2_4. This fixes the
major version to 2 and the minor version to 4 for all tags on this branch.
+</li>
<li>
-Event 9 is the creation of a Rel_2_4_0_0 beta release tag in the branch. It serves
as
-an alias to the state of the main branch at the time the 2.4 branch was created.
-<li>
-Event 10 is the creation of a Rel_2_5_0_0 alpha release tag on the main trunk. It
+This is the creation of a Rel_2_5_0_0 alpha release tag on the main trunk. It
it is also an alias to the state of the main branch at the time of the 2.4 branch
creation.
+</li>
+<li>
+This is the creation of a Rel_2_4_0_0 beta release tag in the branch. It serves as
+an alias to the state of the main branch at the time the 2.4 branch was created.
+</li>
<li>
-Event 11 is the integration of the first patch/change into the 2.4 branch. After
+This is the integration of the first patch/change into the 2.4 branch. After
the code is commited the Rel_2_4_0_1 tag is applied.
<li>
-Event 12 is the release of the initial 2.4 branch binary. The release is tagged
+This is the release of the initial 2.4 branch binary. The release is tagged
as JBoss_2_4_0 as well as Rel_2_4_1_0 to start the next beta series.
</ol>
@@ -130,7 +146,7 @@
<li>(optional) Tag the code with the next alpha build tag. For example,
to tag the jboss source tree with a Rel_2_3_1_3 tag, do:
<pre>cvs tag Rel_2_3_1_3</pre>
-from within the jboss/src working directory.
+from within the jboss working directory.
</ol>
<p class="head">CREATING A NEW BINARY RELEASE BRANCH
@@ -143,6 +159,15 @@
cvs co jboss
</pre>
<li>
+Label the main branch with the next initial alpha development build tag:
+Rel_<major>_<odd_minor>_0_0. For the case of a 2.2 release case this
would
+mean that main development would be for a 2.3 cycle and so main should
+be tagged with Rel_2_3_0_0 as follows from within the working directory
+created in step 1:
+<pre>
+cvs tag Rel_2_3_0_0
+</pre>
+<li>
Create the new branch giving it a branch tag of Branch_<major>_<minor>.
For
example, to create a 2.2 branch, perform the following within the working directory
created by the previous check out:
@@ -153,7 +178,7 @@
Create a working directory for the new branch by checking it out using the
Branch_2_2 tag:
<pre>
-cvs co -r Branch_2_2
+cvs co -r Branch_2_2 jboss
</pre>
<li>
Label the branch working directory with the initial beta release tag of
@@ -163,15 +188,13 @@
<pre>
cvs tag Rel_2_2_0_0
</pre>
-<li>
-Label the main branch with the next initial alpha development build tag:
-Rel_<major>_<odd_minor>_0_0. For the case of a 2.2 release case this would
-mean that main development would be for a 2.3 cycle and so main should
-be tagged with Rel_2_3_0_0 as follows from within the working directory
-created in step 1:
-<pre>
-cvs tag Rel_2_3_0_0
-</pre>
+</li>
+<li>Branch all non-jboss modules that contribute jars to the jboss module.
+Create a branch for each cvs module for which there is one or more jars included
+in the jboss module. This allows patches to be made to these modules and
+to be tagged with the JBoss_X_Y_Z final release tag so that all source can
+be obtained for the final release.
+</li>
</ol>
<p class="head">CHECKING IN A PATCH ON A RELEASE BRANCH
@@ -228,7 +251,7 @@
Existing Tags:
Rel_2_3_1_0 (revision: 1.34)
- Rel_2_2_2_0 (revision: 1.30.2.6)
+ Rel_2_2_2_0 (revision: 1.30.2.6)
JBoss_2_2_2 (revision: 1.30.2.6)
JBoss_2_2_1 (revision: 1.30.2.3)
Rel_2_2_1_0 (revision: 1.30.2.3)
@@ -251,6 +274,50 @@
from within the jboss working directory you just checked out.
</ul>
+<p class="head">CHECKING IN A PATCH ON A NON-JBOSS CVS MODULE RELEASE BRANCH
+<p class="text">When you have changes that need to go into one of the
+modules other than the jboss cvs module for integration as a jar in a
+jboss release branch, perform the following steps. These steps are
+for an example of making a change in the jbosscx module for incorporation
+into the jboss 2.4 release branch.
+
+<ol>
+<li>Checkout the module using the branch tag you want to work on(if
+the branch has not been created do so). To checkout the 2.4 branch of the
+jbosscx module do:
+<pre>cvs co -r Branch_2_4 jbosscx</pre>
+</li>
+<li>Make your chages to the source in the jbosscx working directory created
+by the previous check out.
+</li>
+<li>Commit your changes. Do this by executing the following command in the
+directory you made the changes in, or any common parent directory:
+<pre>cvs commit -m "Your commit msg"</pre>
+</li>
+<li>(Required) Tag the branch with the next beta binary release tag on the
+<em>jboss</em> module release branch, not the jbosscx. The non-jboss modules
+are not labeled independent of the jboss module. This allows one to see
+what changes from the modules were merged into jboss. So, if the
+latest beta binary release tag in the jboss module is Rel_2_4_0_0, the
+jbosscx module would be tagged with Rel_2_4_0_1. Do this from within the
+root jbosscx working directory:
+<pre>cvs tag Rel_2_4_0_1</pre>
+</li>
+
+<li>Perform the build of the module jars that are to be incorporated into
+the jboss module.
+</li>
+<li>Copy the module jars into the approriate jboss/src subdirectory locations.
+</li>
+<li>Commit the jar changes in the jboss module by running the following
+from within the jboss/src directory:
+<pre>cvs commit -m "Your commit msg"</pre>
+</li>
+<li>(Required) Tag the jboss module with the same tag used in step 4. From
+within the jboss root working directory tag the release:
+<pre>cvs tag Rel_2_4_0_1</pre>
+</li>
+</ol>
<jsp:include page="navigation.jsp" flush="true" />
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
