I'm working on migrating from 1.4.2 to 1.5 and unfortunately it wont be as easy as other updates I've done. The reason for this is that I normally use the verndor branch approach to merge the code coming from the release to my own cvs repository. When I merge this code using cvs I get a report of the conflicts and I fix each of them, but now that the code has been broken up I'm not going to be able to use cvs to let me know where conflicts exists ( ouch! ), and I have done a fair number of customizations to java files. It is doable I belive to merge my code with 1.5 "by hand", and I will try it.
I believe I know how to apprach the merging of the java files, but I have also made changes to the dspace-web.xml, and being new to maven, I'm not sure what file I should look at to get my changes in there. I have created new filters, and I have some of our local auth customization in there. Can you let me know what file(s) I should look at. Thanks! Jose ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ DSpace-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dspace-tech
