[gradebook2-dev] A new merge for GRBK-483 changes

[Thomas Amsler]

We did a calculation's code refactor where things got moved around
quite a bit. Please let me know if you need more details about the
specifics. Most of the changes are tracked in:

https://jira.sakaiproject.org/browse/GRBK-742

At the moment, we don't have any major refactoring planned for trunk,
but this can change, especially around the export/import
functionality.

Best,
-- Thomas

On Thu, Feb 3, 2011 at 11:30 AM, Jim Eng <jimeng at umich.edu> wrote:
> Hi David,
>
> I tried using subversion merge to get your changes into a new branch based on trunk.  Unfortunately, that didn't work very well at all.  I think you will need to merge your work into the new branch by hand and get them committed as soon as possible.  When you have the branch working as you would like, you should ask Thomas to merge from there to trunk of GB2 as soon as possible.  If you don't do this quickly, it is likely we will go through this again.
>
> It looks like the problem with using subversion merge for this is that some classes have been moved and then interfaces were extracted, and the interface has the same name as the class previously had.  The result is that changes you made to the class get merged into the new interface in some cases.  It seems as if this happened with these classes (among others):
>
> /gradebook2/server/src/java/org/sakaiproject/gradebook/gwt/sakai/calculations/CategoryCalculationUnit.java
> /sakai/gradebook2/server/src/java/org/sakaiproject/gradebook/gwt/server/ImportExportUtility.java
> /sakai/dev27x/sakai/gradebook2/server/src/java/org/sakaiproject/gradebook/gwt/sakai/calculations/GradeRecordCalculationUnit.java
>
> You would start by checking out this branch:
>
>        https://source.sakaiproject.org/contrib/gradebook2/branches/GRBK-483-0203
>
> Then you would build and deploy that branch in sakai on your laptop and make sure everything is OK.  Next you would start merging changes in by hand.  In doing that, it is probably a good idea to use the patch file in the JIRA ticket as a guide to the changes that are needed. Pay close attention to Thomas's advice about the changes needed in your code.  And watch out for the places where the GB2 code has been refactored.
>
> Hope this helps.
>
> Jim
>
>