SAK-29863 rsf changes to gradebook

chundcm · Sep 18, 2015 · d818de1 · d818de1
1 parent d1d4929
commit d818de1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/gradebook/app/sakai-tool/src/webapp/WEB-INF/web.xml b/gradebook/app/sakai-tool/src/webapp/WEB-INF/web.xml
@@ -74,7 +74,7 @@
     	<servlet-name>sakai-gradebook-helper</servlet-name>
 
 	    <servlet-class>
-	      uk.ac.cam.caret.sakai.rsf.servlet.ReasonableSakaiServlet
+	      org.sakaiproject.rsf.servlet.ReasonableSakaiServlet
 	    </servlet-class>
   </servlet>
 

diff --git a/gradebook/app/ui/pom.xml b/gradebook/app/ui/pom.xml
@@ -44,29 +44,23 @@
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>uk.org.ponder.sakairsf</groupId>
-      <artifactId>SakaiRSFComponents-templates</artifactId>
-      <version>${sakairsf.components.version}</version>
+      <groupId>org.sakaiproject.rsf</groupId>
+      <artifactId>sakai-rsf-web-templates</artifactId>
+      <version>${project.version}</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>uk.org.ponder.sakairsf</groupId>
-      <artifactId>SakaiRSFComponents-evolvers</artifactId>
-      <version>${sakairsf.components.version}</version>
+      <groupId>org.sakaiproject.rsf</groupId>
+      <artifactId>sakai-rsf-web-evolvers</artifactId>
+      <version>${project.version}</version>
       <type>jar</type>
     </dependency>
     <dependency>
-      <groupId>uk.org.ponder.sakairsf</groupId>
-      <artifactId>sakairsf</artifactId>
-      <version>${sakairsf.version}</version>
+      <groupId>org.sakaiproject.rsf</groupId>
+      <artifactId>sakai-rsf-core</artifactId>
+      <version>${project.version}</version>
       <type>jar</type>
     </dependency>
-    <dependency>
-      <groupId>uk.org.ponder.rsfutil</groupId>
-      <artifactId>RSFComponents-templates</artifactId>
-      <version>${rsfutil.version}</version>
-      <type>war</type>
-    </dependency>
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-gradebook-app-business</artifactId>

diff --git a/...i/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntityProvider.java b/...i/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntityProvider.java
@@ -35,7 +35,7 @@
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.sakaiproject.user.api.UserNotDefinedException;
 
-import uk.ac.cam.caret.sakai.rsf.entitybroker.EntityViewParamsInferrer;
+import org.sakaiproject.rsf.entitybroker.EntityViewParamsInferrer;
 import uk.org.ponder.rsf.viewstate.SimpleViewParameters;
 import uk.org.ponder.rsf.viewstate.ViewParameters;