Hi David, This was not intential, but an oversight on my part. I will fix it when I get a chance. Thanks for pointing it out. /Craig
"David H. DeWolf" <[EMAIL PROTECTED]> 08/06/2007 08:14 AM Please respond to [email protected] To [email protected] cc Subject Re: New SVN branch to jump start Pluto's future: 1.1-286-trunk-merge Craig, one thing I noticed with the commits is that there seemed to be a lot of "adds". I would have expected copies. . .By manually adding files instead of copying to the branch, we will loose history. Was this intentional? David [EMAIL PROTECTED] wrote: > Hi all, > > In order to jump start the merging of the JSR-286 Reference > Implementation work at Pluto with our SVN trunk, I have created a > 1.1-286-trunk-merge branch in Subversion. This branch starts with the > 1.1-286-COMPATIBILITY branch (JSR-286 RI) as a base line. The SVN trunk > will be gradually merged into this branch. So, far I have worked on > merging the following modules: > maven-pluto-plugin > pluto-util > pluto-ant-tasks > pluto-descriptor-api > pluto-descriptor-impl > My initial work in this branch has involved a number of educated guesses > as to how to resolve code conflicts. Still, all of these modules except > the maven-pluto-plugin appear to compile, package and install without > error right now. Errors in the maven-plugin-module causes errors in > building the container or portal driver with maven. The assembly module > has also been added to this new branch from the SVN trunk, but it has > not been tested. Clearly, this is a work-in-progress at this time. > > It is my understanding that the work by the JSR-286 Expert Group is > winding down and the current Public Review Draft of the specification is > pretty much feature complete (Stefan, please correct me if I am wrong). > Still, the JSR-286 RI is the future of Pluto, and I feel that we need to > start moving in that direction. The SVN trunk has improved greatly since > the 1.1-286-COMPATIBILITY branch was formed from it about 10 months (and > about four Pluto 1.1.x releases) ago. These changes and bug fixes should > be incorporated into the JSR-286 RI. To complete this work I need help > from the whole Pluto community including the Univ of Jena (Torsten's) > group who have concentrated on the 1.1-286-COMPATIBILITY branch and > those who have been working on the SVN trunk and various 1.1.x releases. > One step in that direction is to make sure that any changes or patches > to the 1.1-286-COMPATIBILITY branch or SVN trunk be propagated into this > new branch. > > When the merge is completed and all maven builds work properly, the next > step could be to either move this branch to the trunk or use this branch > for JSR-286 RI work, retiring the 1.1-286-COMPATIBILITY branch. This is > up to the community to decide at that time. Right now I'm just trying to > move the work forward. Everyone -- including those who are not Pluto > committers -- are invited to help. > > TIA > /Craig
