[sakai] svn commit: r78170 - in msub/uct.ac.za/vula/trunk/gradebook: . app/standalone-app/src/test/org/sakaiproject/tool/gradebook/test service service/api/src/java/org/sakaiproject/service/gradebook/shared service/impl/src/java/org/sakaiproject/component/gradebook

[david.horwitz at uct.ac.za]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=78170

Author: david.horwitz at uct.ac.za
Date: 2010-05-31 08:30:06 -0400 (Mon, 31 May 2010)
New Revision: 78170

Added:
   msub/uct.ac.za/vula/trunk/gradebook/service/api/src/java/org/sakaiproject/service/gradebook/shared/CategoryDefinition.java
   msub/uct.ac.za/vula/trunk/gradebook/service/api/src/java/org/sakaiproject/service/gradebook/shared/InvalidCategoryException.java
Modified:
   msub/uct.ac.za/vula/trunk/gradebook/
   msub/uct.ac.za/vula/trunk/gradebook/app/standalone-app/src/test/org/sakaiproject/tool/gradebook/test/GradebookServiceNewTest.java
   msub/uct.ac.za/vula/trunk/gradebook/app/standalone-app/src/test/org/sakaiproject/tool/gradebook/test/GradebookServiceTest.java
   msub/uct.ac.za/vula/trunk/gradebook/service/
   msub/uct.ac.za/vula/trunk/gradebook/service/api/src/java/org/sakaiproject/service/gradebook/shared/GradebookExternalAssessmentService.java
   msub/uct.ac.za/vula/trunk/gradebook/service/api/src/java/org/sakaiproject/service/gradebook/shared/GradebookService.java
   msub/uct.ac.za/vula/trunk/gradebook/service/impl/src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java
   msub/uct.ac.za/vula/trunk/gradebook/service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
Log:
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/gradebook/service>
svn log -r69131
https://source.sakaiproject.org/svn/edu-services/trunk/gradebook-service/
------------------------------------------------------------------------
r69131 | wagnermr at iupui.edu | 2009-11-20 16:42:32 +0200 (Fri, 20 Nov
2009) | 4 lines

SAK-16973
http://jira.sakaiproject.org/browse/SAK-16973
When adding an assignment to the gradebook, should be able to select the
category as well
New gradebook service methods for retrieving/saving category information
------------------------------------------------------------------------
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/gradebook/service>
svn merge -c69131
https://source.sakaiproject.org/svn/edu-services/trunk/gradebook-service/
--- Merging r69131 into '.':
U
impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
U
impl/src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java
A
api/src/java/org/sakaiproject/service/gradebook/shared/InvalidCategoryException.java
U
api/src/java/org/sakaiproject/service/gradebook/shared/GradebookService.java
A
api/src/java/org/sakaiproject/service/gradebook/shared/CategoryDefinition.java
U
api/src/java/org/sakaiproject/service/gradebook/shared/GradebookExternalAssessmentService.java
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/gradebook/service>
cd ..
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/gradebook>
svn merge -c69138
https://source.sakaiproject.org/svn/edu-services/trunk/
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/gradebook>
svn merge -c69138 https://source.sakaiproject.org/svn/gradebook
--- Merging r69138 into '.':
   C trunk
Summary of conflicts:
  Tree conflicts: 1
dhorwitz at david-horwitz-4:~/branchManagement/uct.ac.za/vula/trunk/gradebook>
svn merge -c69138 https://source.sakaiproject.org/svn/gradebook/trunk
--- Merging r69138 into '.':
U
app/standalone-app/src/test/org/sakaiproject/tool/gradebook/test/GradebookServiceTest.java
U
app/standalone-app/src/test/org/sakaiproject/tool/gradebook/test/GradebookServiceNewTest.java