powered by Jive Software

Merging smack bosh branch with smack 3.2.2 release

Hi,

I tried to merge the smack bosh branch from

http://svn.igniterealtime.org/svn/repos/smack/branches/bosh with the

smack 3.2.2 release. I imported the full repo from SVN into a Git repo

and tried to to merge the smack-bosh branch into the 3.2.2 tag. I was

able to remove all the syntax errors from the code/xml. And I am

pretty confident about the actual merge of the code/xml itself.

However, my merge includes the switch from ANT to Maven as a build

system. As it is right now in my merge neither building with ANT nor

with Maven works anymore. I was looking at the trunk again and saw

that even there you are not using Maven yet. So it is only included in

the merge since the smack-bosh branch introduced it.

Are you aware of any issues related to merging those two?

Is there an updated version of the bosh branch that contains the fixes

of the 3.2.2 release?

Thanks,

Ingo

I don’t think any work has been done on the bosh branch for awhile, and I believe it was branched from 3.1, so I am not surprised that there would be issues merging it.

Smack is not yet maven based, so that part definitely won’t work properly.

I put a fork of Smack on Github, see https://github.com/electronic-arts/smack. This builds but I did not get all the test cases running yet.

ingo wrote:

Is there an updated version of the bosh branch that contains the fixes

of the 3.2.2 release?

I believe to carry the bosh patches in my master branch which also contains everything from the current svn head plus some more patches for imortant issues that didn’t arrive in the svn trunk yet. The test cases are also horribly broken and won’t run. The branch itself does a good job and is used as base for aSmack. But I don’t use bosh so I can’t comment on the functionality there.

It sure would be nice to see the bosh branch merge into smack. If you find errors or have any suggestions, please report them. Smack could use a dedicated devoloper helping in the process.

Flow

Hi,

looks like your master https://github.com/flowdalic/smack already contains bosh among other extensions/fixes. Can this be considered a stable version of the smack library supporting BOSH?

Thanks,

Ingo

ingo wrote:

looks like your master https://github.com/flowdalic/smack already contains bosh among other extensions/fixes. Can this be considered a stable version of the smack library supporting BOSH?

As I said before: I don’t make use of BOSH therefore I can’t comment on that. You really have to make yourself comfortable with the fact that the bosh patches for smack haven’t got much care in a while and therefore a likley to include bugs. Smack lacks developer power at the moment. So it may not be sufficent to just report a bug, but instead come with a solution for it. You will need some debuging skills if you encounter bugs. That is: Read the XEPs, use the eclipse debugger, set breakpoints and enable Smack debugging. I can take a quick look here and there but I don’t have much time in the next few months.

Oh, and you are welcomed to join ##smack@freenode if you are interested in smack community development.

Message was edited by: Flow

If you want to merge the BOSH branch with Smack and contribute that patch, it would be welcome. Just make sure to provide appropriate test cases and merge with trunk, NOT the 3.2.2 branch.