Cleaning up the jbossxb projects

[starksm64]

So the state of the jbossxb project source is confused at this point. Currently there are 3 separate svn trees:

jaxb stuff Adrian is working on:
https://svn.jboss.org/repos/common/jbossxb-builder

The old 1.0.x monolithic jboss-common that includes a jbossxb version:
https://svn.jboss.org/repos/common/common-old/branches/Branch_1_0

The broken out jbossxb:
https://svn.jboss.org/repos/common/jbossxb

Now the current https://svn.jboss.org/repos/common/jbossxb/trunk is further broken because its being used as the basis for jbossas-4.2 (1.0.0.CR9-brew), but the version of jboss/common in there is 1.0.4.GA-brew. The jbossxb/trunk/pom.xml however declares dependencies on the refactored 2.0.x jboss-common projects.

To clean this up I propose:
1. Copy the current https://svn.jboss.org/repos/common/jbossxb/tags/1.0.0.CR9/ tag to a https://svn.jboss.org/repos/common/jbossxb/branch/1_0 branch to use as the basis for 1.0.x releases. This project depends on the old 1.0.x jboss-common project.

2. Update the jbossxb/trunk version to a 2.0.0.snapshot to separate it from the 1.0.x line. The existing JBAS-4110(JBossXB-1.0.0.CR10 release) task will be updated to create a JBossXB-2.0.0.CR1 release from jbossxb/trunk baseline.

Further, can the jbossxb-builder be moved to a jbossxb/branches/2_2 or 3_0 branch? Alternatively, the current jbossxb/trunk could be copied to a jbossxb/branches/2_0 branch and the jbossxb-builder/trunk merged to jbossxb/trunk.

[aloubyansky]

Fine by me. Is there a reason not to merge Adrian's annotations work into trunk? The lesser branches we have the better.

[starksm64]

I would certainly like to merge it, but have not looked at it. Adrian will have to comment on that. Right now I'm just focusing on 1+2 as the trunk situation can be dealt with latter.

[adrian.brock]

The annotation stuff is based on the MC's ClassInfo abstraction
so it is not a trivial integration (given that the container project where
this lives also depends on JBossXB). It might have to wait until we split up the MC build?

[aloubyansky]

branch/1_0 appears to be not a copy of the 1.0.0.CR9 tag but the trunk?

Author: [e-mail]
Date: 2007-03-07 19:05:37 -0500 (Wed, 07 Mar 2007)
New Revision: 2285

Added:
 jbossxb/branches/1_0/
Log:
Make a 1.0 branch from the 1.0.0.CR9 release

Copied: jbossxb/branches/1_0 (from rev 2284, jbossxb/trunk/src)

[starksm64]

It should have been from the https://svn.jboss.org/repos/common/jbossxb/tags/1.0.0.CR9/ tag, but looking at http://fisheye.jboss.com/changelog/JBossCommon/jbossxb/branches/1_0?cs=2285 it does not list the source url of the copy. What your showing is the commit msg? Is there a way to validate what the source of the copy is after the fact?

[aloubyansky]

Yes, it's the commit msg. Not sure about the svn command to check that.

The as405 branch doesn't support global model groups. The trunk does. If the SchemaBinding has an instvar 'groups' the version supports global model groups.

1.0.0.CR9 is a tag on as405 branch and doesn't support global model groups. But the branch/1_0 does.

[starksm64]

If I look at http://fisheye.jboss.com/browse/JBossCommon/jbossxb/branches/1_0/main/java/org/jboss/xb/QNameBuilder.java

it says the root was created from trunk/jbossxb/trunk/src/main/java/org/jboss/xb/QNameBuilder.java
so I must have messed up the source url. I don't see any changes going into this branch so we just need to delete it an create it correctly from the tag. If you don't want to recreate it I will.

[aloubyansky]

No problem, I'll do it.

[aloubyansky]

I renamed the xb405 branch to 1_0. This is what has been used for 1.0.0.CR releases.