SAK-30308 - Rename basiclti-util to tsugi-util

fk-snyk · Feb 3, 2016 · cf00a93 · cf00a93
1 parent 05f1e54
commit cf00a93
Show file tree

Hide file tree

Showing 104 changed files with 255 additions and 196 deletions.
diff --git a/basiclti/basiclti-blis/pom.xml b/basiclti/basiclti-blis/pom.xml
@@ -21,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>tsugi-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java b/basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java
@@ -51,7 +51,7 @@
 import net.oauth.server.OAuthServlet;
 import net.oauth.signature.OAuthSignatureMethod;
 
-import org.imsglobal.basiclti.XMLMap;
+import org.tsugi.basiclti.XMLMap;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.Element;
@@ -64,7 +64,7 @@
 import org.sakaiproject.component.cover.ComponentManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.imsglobal.basiclti.BasicLTIUtil;
+import org.tsugi.basiclti.BasicLTIUtil;
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.Role;
 import org.sakaiproject.authz.api.AuthzGroupService;
@@ -85,11 +85,11 @@
 import org.sakaiproject.user.cover.UserDirectoryService;
 import org.sakaiproject.util.ResourceLoader;
 import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
-import org.imsglobal.basiclti.BasicLTIConstants;
+import org.tsugi.basiclti.BasicLTIConstants;
 import org.sakaiproject.basiclti.util.LegacyShaUtil;
 import org.sakaiproject.util.FormattedText;
 
-import org.imsglobal.pox.IMSPOXRequest;
+import org.tsugi.pox.IMSPOXRequest;
 
 import org.sakaiproject.lti.api.LTIService;
 import org.sakaiproject.util.foorm.SakaiFoorm;

diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti2/LTI2Service.java b/basiclti/basiclti-blis/src/java/org/sakaiproject/lti2/LTI2Service.java
@@ -36,17 +36,17 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.imsglobal.basiclti.BasicLTIConstants;
-import org.imsglobal.json.IMSJSONRequest;
-import org.imsglobal.lti2.LTI2Config;
-import org.imsglobal.lti2.LTI2Constants;
-import org.imsglobal.lti2.LTI2Messages;
-import org.imsglobal.lti2.LTI2Util;
-import org.imsglobal.lti2.ToolProxy;
-import org.imsglobal.lti2.ContentItem;
-import org.imsglobal.lti2.objects.Service_offered;
-import org.imsglobal.lti2.objects.StandardServices;
-import org.imsglobal.lti2.objects.ToolConsumer;
+import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.json.IMSJSONRequest;
+import org.tsugi.lti2.LTI2Config;
+import org.tsugi.lti2.LTI2Constants;
+import org.tsugi.lti2.LTI2Messages;
+import org.tsugi.lti2.LTI2Util;
+import org.tsugi.lti2.ToolProxy;
+import org.tsugi.lti2.ContentItem;
+import org.tsugi.lti2.objects.Service_offered;
+import org.tsugi.lti2.objects.StandardServices;
+import org.tsugi.lti2.objects.ToolConsumer;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
@@ -216,7 +216,7 @@ protected ToolConsumer getToolConsumerProfile(Map<String, Object> deploy, String
 			M_log.error("* LTI2 NOT CONFIGURED - Using Sample Data   *");
 			M_log.error("* Do not use this in production.  Test only *");
 			M_log.error("*********************************************");
-			// cnf = new org.imsglobal.lti2.LTI2ConfigSample();
+			// cnf = new org.tsugi.lti2.LTI2ConfigSample();
 			cnf = new SakaiLTI2Base();
 		}
 

diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti2/SakaiLTI2Services.java b/basiclti/basiclti-blis/src/java/org/sakaiproject/lti2/SakaiLTI2Services.java
@@ -1,7 +1,7 @@
 
 package org.sakaiproject.lti2;
 
-import org.imsglobal.lti2.objects.*;
+import org.tsugi.lti2.objects.*;
 
 public class SakaiLTI2Services {
 

diff --git a/basiclti/basiclti-blis/src/webapp/WEB-INF/web.xml b/basiclti/basiclti-blis/src/webapp/WEB-INF/web.xml
@@ -16,7 +16,7 @@
 
   <servlet>
     <servlet-name>SampleServlet</servlet-name>
-    <servlet-class>org.imsglobal.lti2.LTI2Servlet</servlet-class>
+    <servlet-class>org.tsugi.lti2.LTI2Servlet</servlet-class>
   </servlet>
 
   <servlet-mapping>

diff --git a/basiclti/basiclti-common/pom.xml b/basiclti/basiclti-common/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>tsugi-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.kernel</groupId>

diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java b/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java
@@ -39,19 +39,19 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.imsglobal.basiclti.BasicLTIUtil;
-import org.imsglobal.basiclti.BasicLTIConstants;
-
-import org.imsglobal.lti2.LTI2Constants;
-import org.imsglobal.lti2.LTI2Vars;
-import org.imsglobal.lti2.LTI2Caps;
-import org.imsglobal.lti2.LTI2Util;
-import org.imsglobal.lti2.LTI2Messages;
-import org.imsglobal.lti2.ToolProxy;
-import org.imsglobal.lti2.ToolProxyBinding;
-import org.imsglobal.lti2.ContentItem;
-import org.imsglobal.lti2.objects.ToolConsumer;
-import org.imsglobal.lti2.LTI2Config;
+import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.basiclti.BasicLTIConstants;
+
+import org.tsugi.lti2.LTI2Constants;
+import org.tsugi.lti2.LTI2Vars;
+import org.tsugi.lti2.LTI2Caps;
+import org.tsugi.lti2.LTI2Util;
+import org.tsugi.lti2.LTI2Messages;
+import org.tsugi.lti2.ToolProxy;
+import org.tsugi.lti2.ToolProxyBinding;
+import org.tsugi.lti2.ContentItem;
+import org.tsugi.lti2.objects.ToolConsumer;
+import org.tsugi.lti2.LTI2Config;
 
 import org.sakaiproject.alias.api.AliasService;
 import org.sakaiproject.lti.api.LTIService;

diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/lti2/SakaiLTI2Base.java b/basiclti/basiclti-common/src/java/org/sakaiproject/lti2/SakaiLTI2Base.java
@@ -1,6 +1,6 @@
 package org.sakaiproject.lti2;
 
-import org.imsglobal.lti2.LTI2Config;
+import org.tsugi.lti2.LTI2Config;
 
 /*
 # A globally unique identifier for the service.  The domain name is typical.

diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/lti2/SakaiLTI2Config.java b/basiclti/basiclti-common/src/java/org/sakaiproject/lti2/SakaiLTI2Config.java
@@ -1,7 +1,7 @@
 
 package org.sakaiproject.lti2;
 
-import org.imsglobal.lti2.LTI2Config;
+import org.tsugi.lti2.LTI2Config;
 import org.sakaiproject.lti2.SakaiLTI2Base;
 
 import org.sakaiproject.component.cover.ComponentManager;

diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>tsugi-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/...ti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java b/...ti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java
@@ -38,7 +38,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.imsglobal.basiclti.BasicLTIUtil;
+import org.tsugi.basiclti.BasicLTIUtil;
 import org.sakaiproject.authz.cover.SecurityService;
 import org.sakaiproject.entity.api.Entity;
 import org.sakaiproject.entity.api.EntityAccessOverloadException;

diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java
@@ -7,8 +7,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.imsglobal.basiclti.BasicLTIConstants;
-import org.imsglobal.basiclti.BasicLTIUtil;
+import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.basiclti.BasicLTIUtil;
 
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.Role;

diff --git a/...lti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipsSynchroniserImpl.java b/...lti/basiclti-impl/src/java/org/sakaiproject/lti/impl/SiteMembershipsSynchroniserImpl.java
@@ -9,7 +9,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import org.imsglobal.basiclti.BasicLTIConstants;
+import org.tsugi.basiclti.BasicLTIConstants;
 
 import net.oauth.*;
 import net.oauth.signature.OAuthSignatureMethod;

diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserFinderOrCreatorImpl.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserFinderOrCreatorImpl.java
@@ -22,8 +22,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.imsglobal.basiclti.BasicLTIConstants;
-import org.imsglobal.basiclti.BasicLTIUtil;
+import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.basiclti.BasicLTIUtil;
 
 import org.sakaiproject.id.cover.IdManager;
 import org.sakaiproject.lti.api.LTIException;

diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserLocaleSetterImpl.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserLocaleSetterImpl.java
@@ -21,7 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.imsglobal.basiclti.BasicLTIConstants;
+import org.tsugi.basiclti.BasicLTIConstants;
 
 import org.sakaiproject.entity.api.ResourcePropertiesEdit;
 import org.sakaiproject.exception.IdUnusedException;

diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserPictureSetterImpl.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/UserPictureSetterImpl.java
@@ -21,7 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.imsglobal.basiclti.BasicLTIConstants;
+import org.tsugi.basiclti.BasicLTIConstants;
 
 import org.sakaiproject.lti.api.UserPictureSetter;
 import org.sakaiproject.profile2.logic.ProfileImageLogic;

diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/jobs/SiteMembershipsSyncJob.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/jobs/SiteMembershipsSyncJob.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.imsglobal.basiclti.BasicLTIProviderUtil;
+import org.tsugi.basiclti.BasicLTIProviderUtil;
 
 import java.util.List;
 import java.util.Map;

diff --git a/basiclti/basiclti-pack/pom.xml b/basiclti/basiclti-pack/pom.xml
@@ -25,7 +25,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>tsugi-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/basiclti/basiclti-portlet/pom.xml b/basiclti/basiclti-portlet/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <artifactId>tsugi-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/basiclti/basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java b/basiclti/basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java
@@ -39,9 +39,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.imsglobal.basiclti.BasicLTIConstants;
-import org.imsglobal.basiclti.BasicLTIUtil;
-import org.imsglobal.basiclti.BasicLTIProviderUtil;
+import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.basiclti.BasicLTIProviderUtil;
 
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.cover.SecurityService;

diff --git a/basiclti/basiclti-portlet/src/java/org/sakaiproject/portlets/IMSBLTIPortlet.java b/basiclti/basiclti-portlet/src/java/org/sakaiproject/portlets/IMSBLTIPortlet.java
@@ -19,7 +19,7 @@
 
 package org.sakaiproject.portlets;
 
-import org.imsglobal.basiclti.BasicLTIUtil;
+import org.tsugi.basiclti.BasicLTIUtil;
 
 import java.lang.Integer;
 

diff --git a/basiclti/basiclti-tool/src/java/org/sakaiproject/blti/tool/LTIAdminTool.java b/basiclti/basiclti-tool/src/java/org/sakaiproject/blti/tool/LTIAdminTool.java
@@ -35,21 +35,21 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.imsglobal.basiclti.BasicLTIUtil;
-import org.imsglobal.basiclti.BasicLTIConstants;
-import org.imsglobal.lti2.LTI2Config;
-import org.imsglobal.lti2.LTI2Constants;
-import org.imsglobal.lti2.LTI2Messages;
-import org.imsglobal.lti2.LTI2Util;
-import org.imsglobal.lti2.ToolProxy;
-import org.imsglobal.lti2.ContentItem;
-import org.imsglobal.lti2.ToolProxyBinding;
+import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.basiclti.BasicLTIConstants;
+import org.tsugi.lti2.LTI2Config;
+import org.tsugi.lti2.LTI2Constants;
+import org.tsugi.lti2.LTI2Messages;
+import org.tsugi.lti2.LTI2Util;
+import org.tsugi.lti2.ToolProxy;
+import org.tsugi.lti2.ContentItem;
+import org.tsugi.lti2.ToolProxyBinding;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONValue;
-import static org.imsglobal.lti2.LTI2Util.getObject;
-import static org.imsglobal.lti2.LTI2Util.getArray;
-import static org.imsglobal.lti2.LTI2Util.getString;
+import static org.tsugi.lti2.LTI2Util.getObject;
+import static org.tsugi.lti2.LTI2Util.getArray;
+import static org.tsugi.lti2.LTI2Util.getString;
 import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
 import org.sakaiproject.cheftool.Context;
 import org.sakaiproject.cheftool.JetspeedRunData;

diff --git a/basiclti/basiclti-util/src/main/resources/META-INF/NOTICE b/basiclti/basiclti-util/src/main/resources/META-INF/NOTICE
diff --git a/basiclti/pom.xml b/basiclti/pom.xml
@@ -29,9 +29,9 @@
         <module>basiclti-pack</module>
         <module>basiclti-portlet</module>
         <module>basiclti-blis</module>
-        <module>basiclti-util</module>
         <module>basiclti-tool</module>
         <module>portlet-util</module>
+        <module>tsugi-util</module>
         <module>web-ifp</module>
     </modules>
 
@@ -159,7 +159,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>basiclti-util</artifactId>
+                <artifactId>tsugi-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

diff --git a/...-util/src/main/resources/META-INF/LICENSE → basiclti/tsugi-util/LICENSE b/...-util/src/main/resources/META-INF/LICENSE → basiclti/tsugi-util/LICENSE
@@ -204,7 +204,7 @@
 
 ===============================================================================
 
-The BasicLTI Utilities (basiclti-util) distribution includes a number of subcomponents
+The Tsugi Utilities (tsugi-util) distribution includes a number of subcomponents
 with separate copyright notices and license terms. Your use of the
 code for the these subcomponents is subject to the terms and
 conditions of the following licenses.