[sakai] svn commit: r69293 - in kernel/trunk: . api api/src/main/java/org/sakaiproject api/src/main/java/org/sakaiproject/conditions api/src/main/java/org/sakaiproject/conditions/api api/src/main/java/org/sakaiproject/content/api api/src/main/java/org/sakaiproject/content/cover api/src/main/java/org/sakaiproject/event/api api/src/main/java/org/sakaiproject/util kernel-component/src/main/webapp/WEB-INF kernel-impl kernel-impl/src/main/java/org/sakaiproject kernel-impl/src/main/java/org/sakaiproject/conditions kernel-impl/src/main/java/org/sakaiproject/conditions/impl kernel-impl/src/main/java/org/sakaiproject/conditions/impl/job kernel-impl/src/main/java/org/sakaiproject/content/impl kernel-impl/src/main/java/org/sakaiproject/event/impl kernel-impl/src/test/java/org/sakaiproject kernel-impl/src/test/java/org/sakaiproject/conditions kernel-impl/src/test/java/org/sakaiproject/conditions/impl kernel-tim test-harness test-harness/src/resources test-harness/src/test

[david.horwitz at uct.ac.za]

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

Author: david.horwitz at uct.ac.za
Date: 2009-11-30 05:06:36 -0500 (Mon, 30 Nov 2009)
New Revision: 69293

Added:
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/Condition.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/ConditionProvider.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/ConditionService.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/ConditionTemplate.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/ConditionTemplateSet.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/EvaluationAction.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/EventKey.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/Operator.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/Rule.java
   kernel/trunk/api/src/main/java/org/sakaiproject/event/api/Obsoletable.java
   kernel/trunk/kernel-component/src/main/webapp/WEB-INF/conditions-components.xml
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/AssignmentGrading.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/AssignmentUpdate.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/BaseConditionService.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/BaseRule.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/BooleanExpression.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/ResourceReleaseRule.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/job/
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/job/DatetimeEventJob.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/MyConditionTemplate.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/MyConditionTemplateSet.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/TestConditionService.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyCommand.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyConditionsService.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyGradebook.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyMessagePad.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyTool.java
Removed:
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/Condition.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/ConditionProvider.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/ConditionService.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/ConditionTemplate.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/ConditionTemplateSet.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/EvaluationAction.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/EventKey.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/Operator.java
   kernel/trunk/api/src/main/java/org/sakaiproject/conditions/api/Rule.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/AssignmentGrading.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/AssignmentUpdate.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/BaseConditionService.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/BaseRule.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/BooleanExpression.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/ResourceReleaseRule.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/job/
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/conditions/impl/job/DatetimeEventJob.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/MyConditionTemplate.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/MyConditionTemplateSet.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/TestConditionService.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyCommand.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyConditionsService.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyGradebook.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyMessagePad.java
   kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/conditions/impl/ToyTool.java
Modified:
   kernel/trunk/
   kernel/trunk/api/pom.xml
   kernel/trunk/api/src/main/java/org/sakaiproject/content/api/ContentHostingService.java
   kernel/trunk/api/src/main/java/org/sakaiproject/content/cover/ContentHostingService.java
   kernel/trunk/api/src/main/java/org/sakaiproject/util/RequestFilter.java
   kernel/trunk/kernel-component/src/main/webapp/WEB-INF/components.xml
   kernel/trunk/kernel-impl/pom.xml
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java
   kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/event/impl/BaseNotificationService.java
   kernel/trunk/kernel-tim/
   kernel/trunk/test-harness/.classpath
   kernel/trunk/test-harness/src/resources/
   kernel/trunk/test-harness/src/test/
Log:
KNL-136 merge changes from branch