CVS to SVN modules and Alias Mapping Sanity Check

[dsicore]

Since we use aliases in the CVSROOT/modules file, we need to tranform SVN repository urls post cvs2svn conversion and import. For example, after an import of our cvs repository, we will have an svn repo that contains a trunk branch:

http://anonsvn.jboss.org/repos/test/trunk/

On checkout from svn, you wouldn't be able to build JBoss or any branch or tag. So, we have to transform the repository to resemble what our CVS alias file builds on checkout. I've written a script to do this, but I need to make sure I have the correct aliases for each of the cvs branches and tags. I've chosen only to include the branches and tags below.

If we need to include more branches or tags (there are a lot of them, like 500+), please let me know which ones need to be included. Also, please verify the aliases (right column) I have listed below. I need to know it is the correct alias to use per the branch or tag on the left.

/branches/Branch_2_4 jboss-2.4
/branches/Branch_3_0 jboss-3.0
/branches/Branch_3_2 jboss-3.2.x
/branches/Branch_4_0 jboss-4.0.x
/branches/Branch_4_0_1_SP1 jboss-4.0
/branches/Branch_4_0_3_SP1 jboss-4.0.x
/branches/Branch_4_0_DR3 jboss-4.0
# tags
/tags/JBoss_2_4_0 jboss-2.4
/tags/JBoss_2_4_1 jboss-2.4
/tags/JBoss_2_4_10 jboss-2.4
/tags/JBoss_2_4_11 jboss-2.4
/tags/JBoss_2_4_2 jboss-2.4
/tags/JBoss_2_4_3 jboss-2.4
/tags/JBoss_2_4_4 jboss-2.4
/tags/JBoss_2_4_5 jboss-2.4
/tags/JBoss_2_4_6 jboss-2.4
/tags/JBoss_2_4_7 jboss-2.4
/tags/JBoss_2_4_7_1 jboss-2.4
/tags/JBoss_2_4_8 jboss-2.4
/tags/JBoss_2_4_9 jboss-2.4
/tags/JBoss_3_0_0 jboss-3.0
/tags/JBoss_3_0_0_8 jboss-3.0
/tags/JBoss_3_0_1 jboss-3.0
/tags/JBoss_3_0_2 jboss-3.0
/tags/JBoss_3_0_3 jboss-3.0
/tags/JBoss_3_0_4 jboss-3.0
/tags/JBoss_3_0_5 jboss-3.0
/tags/JBoss_3_0_6 jboss-3.0
/tags/JBoss_3_0_7 jboss-3.0
/tags/JBoss_3_0_8 jboss-3.0
/tags/JBoss_3_1_0_1 jboss-3.0
/tags/JBoss_3_2_0 jboss-3.2
/tags/JBoss_3_2_0_1 jboss-3.2
/tags/JBoss_3_2_1 jboss-3.2
/tags/JBoss_3_2_2 jboss-3.2
/tags/JBoss_3_2_3 jboss-3.2
/tags/JBoss_3_2_4 jboss-3.2
/tags/JBoss_3_2_5 jboss-3.2
/tags/JBoss_3_2_6 jboss-3.2
/tags/JBoss_3_2_7 jboss-3.2
/tags/JBoss_3_2_8 jboss-3.2.x
/tags/JBoss_4_0_0 jboss-4.0
/tags/JBoss_4_0_1 jboss-4.0
/tags/JBoss_4_0_1_SP1 jboss-4.0
/tags/JBoss_4_0_2 jboss-4.0
/tags/JBoss_4_0_2_RC1 jboss-4.0
/tags/JBoss_4_0_2_beta jboss-4.0
/tags/JBoss_4_0_3 jboss-4.0.x
/tags/JBoss_4_0_3_RC1 jboss-4.0.x
/tags/JBoss_4_0_3_RC2 jboss-4.0.x
/tags/JBoss_4_0_3_RC3 jboss-4.0.x
/tags/JBoss_4_0_3_SP1 jboss-4.0.x
/tags/JBoss_4_0_4_RC1 jboss-4.0.x
/trunk jboss-head

[ryan.campbell]

You also need:

/tags/JBoss_3_2_8_SP1 jboss-3.2.x

[dsicore]

Also, I'll also need to patch up the current CVSROOT/modules file in our CVS repo before we grab the archive tarball. There are a few places that are missing end of line "\" flags or contain extras.

Below is a diff of the current CVSROOT/modules file with the modules file I've been using to test:

belial:/Volumes/JBoss/cvs damon$ diff ./CVSROOT/modules ./svn_CVSROOT/modules
1c1
< # $Id: modules,v 1.586 2006/05/03 09:00:36 julien Exp $
---
> # $Id: modules 57096 2006-05-05 01:22:11Z [e-mail] $
58d57
< _jboss_aspects_jdk5 -d aspects-jdk5 build/aspects-jdk5
129a129,130
> &_jboss_container \
> &_jboss_dependency \
141a143
> &_jboss_kernel \
143a146
> &_jboss_media \
158c161
< &_jboss_webservice \
---
> &_jboss_webservice
205c208
< &_jboss_webservice \
---
> &_jboss_webservice
394d396
< &_jboss_aspects_jdk5 \
413a416
> &_jboss_media \
749c752
< &_jboss_varia \
---
> &_jboss_varia
1108d1110
< _jboss-portal_identity -d identity jboss-portal/identity
1143c1145
< _jboss-portal_thirdparty_jakarta_fileupload -d jakarta-fileupload jboss-portal-thirdparty/jakarta/fileupload
---
> _jboss-portal_thirdparty_jakarta_fileupload -d jakarta-fileupload jboss-portal-thirdparty/jakarta/fileupload
1158,1159c1160
< _jboss-portal_thirdparty_jboss_jbossretro -d jboss-jbossretro jboss-portal-thirdparty/jboss/jbossretro
< _jboss-portal_thirdparty_jboss_backport-concurrent -d jboss-backport-concurrent jboss-portal-thirdparty/jboss/backport-concurrent
---
> _jboss-portal_thirdparty_retrotranslator -d retrotranslator-retrotranslator jboss-portal-thirdparty/retrotranslator/retrotranslator
1311,1313c1312,1314
< &_jboss-portal_thirdparty_ibm_wsdl4j \
< &_jboss-portal_thirdparty_jboss_jbossretro \
< &_jboss-portal_thirdparty_jboss_backport-concurrent
---
> &_jboss-portal_thirdparty_retrotranslator \
> &_jboss-portal_thirdparty_ibm_wsdl4j
>
1373d1373
< &_jboss-portal_identity \

[ryan.campbell]

We also need all of the service pack branches. So we need every branch that starts with JBoss*. ie, JBoss_4_0_3_SP1_JBAS-1234. There will be 30-40 of these, I expect.

[ryan.campbell]

So when will I be able to:

svn co http://anonsvn.jboss.org/repos/test/branches/Branch_4_0

and build jboss?

[ryan.campbell]

Ok, Damon hooked me up. I did a

svn co https://svn.jboss.org/repos/test/mutated/tags/JBoss_4_0_3_SP1/

and then compared it to a corresponding cvs co:

diff --brief --exclude-from=ignore --ignore-matching-lines="$" -r svn/jboss-4.0.3.sp1/ cvs/jboss-4.0.3.sp1/

and svn has an extra "media" module which should not exist in jboss-4.0.x.

On the other tags (4.0.2) I see thirdparty screwed up in various ways. Some thirdparty modules are at top-level (4.0.2*), some are named incorrrectly (3.2.*).

Damon, let me know when 4.0.2 is ready and I'll dig into it.

[dsicore]

and svn has an extra "media" module which should not exist in jboss-4.0.x.

The CVSROOT/modules I'm using has 'media' in the jboss-4.0.x alias:

https://svn.jboss.org/repos/test/trunk/CVSROOT/modules

Looks like it was removed after I grabbed the tarball of our cvs repo.

What are the items that are messed up in the 3.2.* tags?

[ryan.campbell]

When did you get your snapshot of modules? It looks like Adrian removed media from 4.0.x at the beginning of April:

http://fisheye.jboss.com/changelog/JBoss?cs=MAIN:adrian:20060403133513

[ryan.campbell]

Or really, the correct question is, can you merge in the latest changes to your modules file?

[dsicore]

We'll need to get a fresh cvs.tar.gz of the entire cvs repo. I'd suggest we simply update the modules file with a few of the simple syntax fixes we require and then get the new tarball.