SAK-22054 merge r110717,110787 from trunk


git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@110998 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21971 merge r110682 from trunk


git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@111177 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22580 Can't delete a Gradebook category without one of the 'enable' checkboxs checked



git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@112449 66ffb92e-73f9-0310-93c1-f5514f145a0a
2.9.x merge

svn merge -c112395 https://source.sakaiproject.org/svn/edu-services/trunk/
--- Merging r112395 into '.':
U    gradebook-service/impl/src/java/org/sakaiproject/component/gradebook/BaseHibernateManager.java

svn log -c112395 https://source.sakaiproject.org/svn/edu-services/trunk/
------------------------------------------------------------------------
r112395 | nbotimer@unicon.net | 2012-09-13 09:11:13 -0400 (Thu, 13 Sep 2012) | 7 lines

SAK-11485 - Fix course grades with grouped assignments

This commit is one half of the fix for this issue. It implements a method to
check the visibility of an assignment for a student and uses this to avoid
scoring inaccessible items as zero points.


------------------------------------------------------------------------

svn merge -c112396 https://source.sakaiproject.org/svn/gradebook/trunk/
--- Merging r112396 into '.':
U    app/sakai-tool/src/webapp/WEB-INF/spring-db.xml
U    app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
U    app/ui/src/webapp/WEB-INF/spring-beans.xml

svn log -c112396 https://source.sakaiproject.org/svn/gradebook/trunk/
------------------------------------------------------------------------
r112396 | nbotimer@unicon.net | 2012-09-13 09:16:03 -0400 (Thu, 13 Sep 2012) | 13 lines

SAK-11485 - Fix course grades with grouped assignments

This is part two of the fix. It wires up the beans so the external assessments
can be checked and checks visibility when computing the total points available
for a given student.

Note that there were some strange Spring-Hibernate transaction errors when
attempting to use the GradebookExternalAssessmentService directly, so there is
a new proxy bean for it that is marked to be non-transactional and read-only.
This is coarser-grained than I would like, but it is appropriate enough for the
need here.


------------------------------------------------------------------------



git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113236 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-15145 merge r112464 from trunk

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113306 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22087 merge r110718 from trunk

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113316 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22204 merge r109909 from trunk

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113319 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22417 merge r111653 from trunk

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113335 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22445 merge r111187 from trunk

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113354 66ffb92e-73f9-0310-93c1-f5514f145a0a
NL-532 monster merge for 2.9.x encompassing 105130:105167


git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113396 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22498 SAK-22448 RSF version change. merge r113497 from trunk


git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113502 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22556 merge r113738 from trunk

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113831 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22569 merge r113737 from trunk

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113832 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22570 merge r113741 from trunk

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.9.x@113833 66ffb92e-73f9-0310-93c1-f5514f145a0a