SAK-29863 rsf changes to site-manage

bethkirschner · Sep 18, 2015 · e825189 · e825189
1 parent 2c7023f
commit e825189
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 61 deletions.
diff --git a/site-manage/pageorder/tool/pom.xml b/site-manage/pageorder/tool/pom.xml
@@ -45,15 +45,15 @@
             <artifactId>spring-webmvc</artifactId>
         </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>
     </dependencies>

diff --git a/...pageorder/tool/src/java/org/sakaiproject/site/tool/helper/order/rsf/PageListProducer.java b/...pageorder/tool/src/java/org/sakaiproject/site/tool/helper/order/rsf/PageListProducer.java
@@ -10,8 +10,8 @@
 import org.sakaiproject.tool.api.SessionManager;
 import org.sakaiproject.tool.api.Tool;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.rsf.components.UIBoundString;
 import uk.org.ponder.rsf.components.UIBranchContainer;

diff --git a/site-manage/pageorder/tool/src/webapp/WEB-INF/web.xml b/site-manage/pageorder/tool/src/webapp/WEB-INF/web.xml
@@ -69,7 +69,7 @@
       new Sakai dispatching architecture. Note that this must agree with tool id -->
     <servlet-name>sakai-site-pageorder-helper</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>

diff --git a/site-manage/site-manage-group-helper/tool/pom.xml b/site-manage/site-manage-group-helper/tool/pom.xml
@@ -49,20 +49,21 @@
             <artifactId>spring-webmvc</artifactId>
         </dependency>
         <dependency>
-            <groupId>uk.org.ponder.sakairsf</groupId>
-            <artifactId>sakairsf</artifactId>
-            <version>${sakairsf.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>SakaiRSFComponents-evolvers</artifactId>
-            <version>${sakairsf.components.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.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/...per/tool/src/java/org/sakaiproject/site/tool/helper/managegroup/rsf/GroupDelProducer.java b/...per/tool/src/java/org/sakaiproject/site/tool/helper/managegroup/rsf/GroupDelProducer.java
@@ -10,7 +10,7 @@
 import org.sakaiproject.site.api.Group;
 import org.sakaiproject.site.tool.helper.managegroup.impl.SiteManageGroupHandler;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessageList;
 import uk.org.ponder.rsf.components.UIBranchContainer;

diff --git a/...er/tool/src/java/org/sakaiproject/site/tool/helper/managegroup/rsf/GroupEditProducer.java b/...er/tool/src/java/org/sakaiproject/site/tool/helper/managegroup/rsf/GroupEditProducer.java
@@ -19,7 +19,7 @@
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.sakaiproject.util.SortedIterator;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;

diff --git a/...er/tool/src/java/org/sakaiproject/site/tool/helper/managegroup/rsf/GroupListProducer.java b/...er/tool/src/java/org/sakaiproject/site/tool/helper/managegroup/rsf/GroupListProducer.java
@@ -18,8 +18,8 @@
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.sakaiproject.util.Validator;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessageList;
 import uk.org.ponder.rsf.components.UIBranchContainer;

diff --git a/site-manage/site-manage-group-helper/tool/src/webapp/WEB-INF/web.xml b/site-manage/site-manage-group-helper/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-site-manage-group-helper</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>

diff --git a/site-manage/site-manage-group-section-role-helper/tool/pom.xml b/site-manage/site-manage-group-section-role-helper/tool/pom.xml
@@ -53,20 +53,21 @@
             <artifactId>spring-webmvc</artifactId>
         </dependency>
         <dependency>
-            <groupId>uk.org.ponder.sakairsf</groupId>
-            <artifactId>sakairsf</artifactId>
-            <version>${sakairsf.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>SakaiRSFComponents-evolvers</artifactId>
-            <version>${sakairsf.components.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.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>

diff --git a/...org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupAutoCreateProducer.java b/...org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupAutoCreateProducer.java
@@ -14,8 +14,8 @@
 import org.sakaiproject.tool.cover.ToolManager;
 import org.sakaiproject.user.api.UserDirectoryService;
 
-import uk.ac.cam.caret.sakai.rsf.copies.Web;
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.copies.Web;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessageList;
 import uk.org.ponder.rsf.components.UIBoundBoolean;

diff --git a/...c/java/org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupDelProducer.java b/...c/java/org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupDelProducer.java
@@ -17,8 +17,8 @@
 import org.sakaiproject.tool.api.Tool;
 import org.sakaiproject.user.api.User;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessageList;
 import uk.org.ponder.rsf.components.UIBranchContainer;

diff --git a/.../java/org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupEditProducer.java b/.../java/org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupEditProducer.java
@@ -25,7 +25,7 @@
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.user.api.UserDirectoryService;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;

diff --git a/...rg/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupImportStep1Producer.java b/...rg/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupImportStep1Producer.java
@@ -10,8 +10,8 @@
 import org.sakaiproject.tool.api.SessionManager;
 import org.sakaiproject.tool.api.Tool;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.rsf.components.UIBranchContainer;
 import uk.org.ponder.rsf.components.UICommand;

diff --git a/...rg/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupImportStep2Producer.java b/...rg/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupImportStep2Producer.java
@@ -16,8 +16,8 @@
 import org.sakaiproject.tool.api.SessionManager;
 import org.sakaiproject.tool.api.Tool;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.rsf.components.UIBranchContainer;
 import uk.org.ponder.rsf.components.UICommand;

diff --git a/.../java/org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupListProducer.java b/.../java/org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupListProducer.java
@@ -18,8 +18,8 @@
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.user.api.UserDirectoryService;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessageList;
 import uk.org.ponder.rsf.components.UIBranchContainer;

diff --git a/site-manage/site-manage-group-section-role-helper/tool/src/webapp/WEB-INF/web.xml b/site-manage/site-manage-group-section-role-helper/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-site-manage-group-section-role-helper</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>

diff --git a/site-manage/site-manage-participant-helper/pom.xml b/site-manage/site-manage-participant-helper/pom.xml
@@ -83,15 +83,15 @@
             <artifactId>spring-webmvc</artifactId>
         </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>
     </dependencies>

diff --git a/...cipant-helper/src/java/org/sakaiproject/site/tool/helper/participant/rsf/AddProducer.java b/...cipant-helper/src/java/org/sakaiproject/site/tool/helper/participant/rsf/AddProducer.java
@@ -11,8 +11,8 @@
 import org.sakaiproject.tool.api.Tool;
 import org.sakaiproject.user.api.UserDirectoryService;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;

diff --git a/...nt-helper/src/java/org/sakaiproject/site/tool/helper/participant/rsf/ConfirmProducer.java b/...nt-helper/src/java/org/sakaiproject/site/tool/helper/participant/rsf/ConfirmProducer.java
@@ -17,8 +17,8 @@
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.user.api.UserDirectoryService;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;

diff --git a/...per/src/java/org/sakaiproject/site/tool/helper/participant/rsf/DifferentRoleProducer.java b/...per/src/java/org/sakaiproject/site/tool/helper/participant/rsf/DifferentRoleProducer.java
@@ -16,8 +16,8 @@
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.user.api.UserDirectoryService;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;

diff --git a/...-helper/src/java/org/sakaiproject/site/tool/helper/participant/rsf/EmailNotiProducer.java b/...-helper/src/java/org/sakaiproject/site/tool/helper/participant/rsf/EmailNotiProducer.java
@@ -14,8 +14,8 @@
 import org.sakaiproject.tool.api.Tool;
 import org.sakaiproject.user.api.UserDirectoryService;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;

diff --git a/...t-helper/src/java/org/sakaiproject/site/tool/helper/participant/rsf/SameRoleProducer.java b/...t-helper/src/java/org/sakaiproject/site/tool/helper/participant/rsf/SameRoleProducer.java
@@ -17,8 +17,8 @@
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.user.api.UserDirectoryService;
 
-import uk.ac.cam.caret.sakai.rsf.producers.FrameAdjustingProducer;
-import uk.ac.cam.caret.sakai.rsf.util.SakaiURLUtil;
+import org.sakaiproject.rsf.producers.FrameAdjustingProducer;
+import org.sakaiproject.rsf.util.SakaiURLUtil;
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;

diff --git a/site-manage/site-manage-participant-helper/src/webapp/WEB-INF/web.xml b/site-manage/site-manage-participant-helper/src/webapp/WEB-INF/web.xml
@@ -69,7 +69,7 @@
       new Sakai dispatching architecture. Note that this must agree with tool id -->
     <servlet-name>sakai-site-manage-participant-helper</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>