Merging Branch_Stable and Branch_CP as a single branch...

[clebert.suconic]

Looking at the diffs from both branches, they basically differ on the documentation, few config changes and the security integration code.

As we were talking today, if we separate the necessary integration layer (configs and eventually java classes) we could have a single branch for both JBoss5 and JBoss4.

The only big difference now is the Executors change done by Howard, but if we choose to keep only one branch maybe that should be okay.

[timfox]

If this will only take a couple of days, I think we should bite the bullet.

[clebert.suconic]

I have created https://svn.jboss.org/repos/messaging/branches/Branch_1_4

From now on we should use that Branch.

You change build.properties to the version you need (AS5 or EAP4) and build it.

The only thing I don't like about this new structure, is we still have two ServerPeers, One for each version. I'm not sure if we could merge it one as that would change XML configs on EAP, and as far as I know we shouldn't allow that.

I haven't merged the documentation yet. The documentation for 1.4.0 still on its original place... Maybe we should just change the documentation to be independent of version.


Also.. notice that the .classpath will only be placed after building the project. so if you use eclipse to download this Branch, you won't see any classes until you build it on the command line and refresh the workspace.

[timfox]

I'm a bit confused how you've configured it for eclipse.

I tried to "create project from existing source", but eclipse wouldn't recognise the dir as a eclipse project dir.

You probably need to add two projects to svn for this branch - one for AS5 and one for EAP 43, with all the settings etc, then people can just go the correct dir and create the project.

It would make life a lot easier.

[jmesnil]

Also.. notice that the .classpath will only be placed after building the project. so if you use eclipse to download this Branch, you won't see any classes until you build it on the command line and refresh the workspace.

One thing you could try is to add a Ant builder to the project
(right-click on the project >Properties > Builder > New...) so that the target which creates the .classpath is automagically executed.
I did not try it but it is worth a look.

[clebert.suconic]

"timfox" wrote:
I'm a bit confused how you've configured it for eclipse.

I tried to "create project from existing source", but eclipse wouldn't recognise the dir as a eclipse project dir.

You probably need to add two projects to svn for this branch - one for AS5 and one for EAP 43, with all the settings etc, then people can just go the correct dir and create the project.

It would make life a lot easier.

You build (ant), and then go back to eclipse and refresh the workspace.


We should give a try o Jeff's idea.

[timfox]

This is still broken.

It needs to be fixed ASAP, right now I can't use this project in eclipse. We have a lot of work to do for the next EAP release and this is currently preventing me from working on that branch.

[timfox]

Ok I worked out why it is broken.

If I check out the project first into the directory Branch_1_4 (the default) and try to import into eclipse, it doesn't work since eclipse mandates the directory name is the same as the project name.

But the project name in the project file is jboss-messaging not Branch_1_4. This works ok if you check out project directly from inside eclipse since Eclispe puts it in a directory called jboss-messaging

[timfox]

jboss-messaging is not a good name for the project. I have many branches checked out locally so the project name should be the branch name. This is how we did it with all the other branches

[timfox]

I changed the project name to Branch_1_4. It now loads into eclipse

[timfox]

I also added our eclipse format settings to that branch

[clebert.suconic]

"timfox" wrote:
Ok I worked out why it is broken.

If I check out the project first into the directory Branch_1_4 (the default) and try to import into eclipse, it doesn't work since eclipse mandates the directory name is the same as the project name.

But the project name in the project file is jboss-messaging not Branch_1_4. This works ok if you check out project directly from inside eclipse since Eclispe puts it in a directory called jboss-messaging

That's weird. On the Eclipse-version I use it aways ask the project name I want to use. Maybe that's something that used to happen on older Eclipse versions?