cancel
Showing results for 
Search instead for 
Did you mean: 

until ACT-60 is done, development should go in branch dev

tombaeyens
Champ in-the-making
Champ in-the-making
Hi All,

The PVM refactoring is having a big impact on the codebase.  E.g. pvm classes are being extracted into a separate module.  They are now starting with packages org.activiti.pvm and all engine classes remain in the engine module, but they now al start with org.activiti.engine.  So e.g. all the public api classes have moved from org.activiti to org.activiti.engine.  In the course of the next weeks, the whole org.activiti.impl will move gradually to org.activiti.engine.impl packages.

As mentioned before, it's best that there is as little activity as possible outside this refactoring.  Synchronize very well with me and Joram before starting on tasks in this iteration.  After all we are in the JIRA flux.  I will clean up JIRA shortly so that there can be no confusion about issues for beta1.

For work that doesn't get impacted a lot by all this big ACT-60 refactorings, i've created a branch that is a copy from the 5.0.alpha4 release branch called https://svn.codehaus.org/activiti/activiti/branches/dev  That branch can be used as a stable point from which you can create your own branches for specific work.  Please commit to your own branches and not to the dev branch itself.  Me and Joram can give advice on how to best apply your changes so that they are mergable after the refactoring.
4 REPLIES 4

bernd_ruecker
Champ in-the-making
Champ in-the-making
Hi Tom.

That raises a question for us: Where do we put teh cacle stuff? I would propose to NOT move it below the engine package, but to move it to "org.activiti.cycle" and "org.activiti.cycle.impl". If that is OK with you, it shouldn't have impact on our development and I would move that now in trunk and create a branch from that if you wish? But since it is pretty seperated from the PVM refactorings, we could keep working in trunk as well?

One question just because I am curious: In which packages will the "BPMN" language go? In engine.impl? Or will the languages be seperated?

Thanks
Bernd

tombaeyens
Champ in-the-making
Champ in-the-making
I think I prefer org.activiti.cycle too. But to be consistent we might reconsider putting it in a different module.

bernd_ruecker
Champ in-the-making
Champ in-the-making
Hmm, as I remeber, that was my proposal from the beginning 😉

Okay, but I would be happy with it: It would make the cycle development more independant for now and it would make things better seperated. So I do that in trunk, OK?

bernd_ruecker
Champ in-the-making
Champ in-the-making
Okay, as discussed on the phone I moved cycle to an own module called "activiti-cycle". The webapp moved to "activiti-webapp-cycle" (explorer and probe will follow that naming pattern). Everything seems to compile and build here on my machine and is committed (so I can go ahead make the stuff I wanted to do in cycle today, finally ;-)).

I think Nils can check tomorrow if the distro and webapp is still working.