From 562aa7cb1efdeb882c36f5e1c0a8d92519f0df96 Mon Sep 17 00:00:00 2001
From: Earle Nietzel <enietzel@anisakai.com>
Date: Sun, 6 Sep 2015 15:33:52 -0400
Subject: [PATCH] SAK-29863 rsf changes to polls

---
 polls/tool/pom.xml                            | 19 +++++++++----------
 .../tool/producers/PermissionsProducer.java   |  2 +-
 .../src/webapp/WEB-INF/applicationContext.xml |  2 +-
 polls/tool/src/webapp/WEB-INF/web.xml         |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/polls/tool/pom.xml b/polls/tool/pom.xml
index 53e809d8ada3..f0a7bdc28671 100644
--- a/polls/tool/pom.xml
+++ b/polls/tool/pom.xml
@@ -73,20 +73,19 @@
 		</dependency>
         <!-- RSF dependencies -->
         <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>
         </dependency>
         <dependency>
-            <groupId>uk.org.ponder.sakairsf</groupId>
-            <artifactId>SakaiRSFComponents-evolvers</artifactId>
-            <version>${sakairsf.components.version}</version>
-            <type>jar</type>
+            <groupId>org.sakaiproject.rsf</groupId>
+            <artifactId>sakai-rsf-web-evolvers</artifactId>
+            <version>${project.version}</version>
         </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>
     </dependencies>
diff --git a/polls/tool/src/java/org/sakaiproject/poll/tool/producers/PermissionsProducer.java b/polls/tool/src/java/org/sakaiproject/poll/tool/producers/PermissionsProducer.java
index fda55cc94611..a397b6992bc3 100644
--- a/polls/tool/src/java/org/sakaiproject/poll/tool/producers/PermissionsProducer.java
+++ b/polls/tool/src/java/org/sakaiproject/poll/tool/producers/PermissionsProducer.java
@@ -33,7 +33,7 @@
 import org.sakaiproject.site.api.Site;
 import org.sakaiproject.tool.api.ToolSession;
 
-import uk.ac.cam.caret.sakai.rsf.helper.HelperViewParameters;
+import org.sakaiproject.rsf.helper.HelperViewParameters;
 import uk.org.ponder.localeutil.LocaleGetter;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.rsf.components.UICommand;
diff --git a/polls/tool/src/webapp/WEB-INF/applicationContext.xml b/polls/tool/src/webapp/WEB-INF/applicationContext.xml
index e27b4f4cc70f..9abedb4da7fa 100644
--- a/polls/tool/src/webapp/WEB-INF/applicationContext.xml
+++ b/polls/tool/src/webapp/WEB-INF/applicationContext.xml
@@ -123,7 +123,7 @@
 			</bean>
 		</property>
 	</bean>
-	<bean id="sakai-ErrorFilter" class="uk.ac.cam.caret.sakai.rsf.errors.ErrorFilter">
+	<bean id="sakai-ErrorFilter" class="org.sakaiproject.rsf.errors.ErrorFilter">
 		<property name="ignoredKeys" value="rsf.invalid.date" />
 	</bean> -->
 </beans>
diff --git a/polls/tool/src/webapp/WEB-INF/web.xml b/polls/tool/src/webapp/WEB-INF/web.xml
index c1479365bfa5..311cbd438dd4 100644
--- a/polls/tool/src/webapp/WEB-INF/web.xml
+++ b/polls/tool/src/webapp/WEB-INF/web.xml
@@ -75,7 +75,7 @@
       new Sakai dispatching architecture. Note that this must agree with tool id -->
     <servlet-name>sakai.poll</servlet-name>
     <servlet-class>
-      uk.ac.cam.caret.sakai.rsf.servlet.ReasonableSakaiServlet
+      org.sakaiproject.rsf.servlet.ReasonableSakaiServlet
     </servlet-class>
     <!--<load-on-startup>1</load-on-startup>-->
   </servlet>