String replacement comment - do not squash this one into the previous…

… one

assignment/impl/pom.xml

@@ -217,16 +217,16 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
             <version>${sakai.version}</version>
         </dependency>
     </dependencies>

assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java

@@ -104,7 +104,7 @@
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.api.SecurityService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.sakaiproject.calendar.api.Calendar;
 import org.sakaiproject.calendar.api.CalendarEvent;
 import org.sakaiproject.calendar.api.CalendarService;
@@ -4253,7 +4253,7 @@ public Map<String, String> transferCopyEntities(String fromContext, String toCon
                     // If there is a LTI launch associated with this copy it over
                     if ( oAssignment.getContentId() != null ) {
                         Long contentKey = oAssignment.getContentId().longValue();
-                        Object retval = SakaiBLTIUtil.copyLTIContent(contentKey, toContext, fromContext);
+                        Object retval = SakaiLTIUtil.copyLTIContent(contentKey, toContext, fromContext);
                         if ( retval instanceof Long ) {
                             nAssignment.setContentId(((Long) retval).intValue());
                         // If something went wrong, we can't be an LTI submission in the new site

assignment/tool/pom.xml

@@ -92,17 +92,17 @@
             <artifactId>sakai-velocity-tool</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java

@@ -689,7 +689,7 @@ private Map<String, Object> submissionToMap(Set<String> activeSubmitters, Assign
                     if ( content != null ) {
                         String contentItem = StringUtils.trimToEmpty((String) content.get(LTIService.LTI_CONTENTITEM));
                         // Instead of parsing, the JSON we just look for a simple existance of the submission review entry
-                        // Delegate the complex understanding of the launch to SakaiBLTIUtil
+                        // Delegate the complex understanding of the launch to SakaiLTIUtil
                         // TODO: Eventually, Sakai's LTIService will implement a submissionReview checkbox and we should check for that here
                         boolean submissionReviewAvailable = contentItem.indexOf("\"submissionReview\"") > 0;
 
@@ -1098,7 +1098,7 @@ public ActionReturn getGradableForSite(EntityView view , Map<String, Object> par
                             ltiSubmissionLaunch = "/access/lti/site/" + siteId + "/content:" + contentKey + "?for_user=" + submitter.get("id");
 
                             // Instead of parsing, the JSON we just look for a simple existance of the submission review entry
-                            // Delegate the complex understanding of the launch to SakaiBLTIUtil
+                            // Delegate the complex understanding of the launch to SakaiLTIUtil
                             if ( contentItem.indexOf("\"submissionReview\"") > 0 ) {
                                 ltiSubmissionLaunch = ltiSubmissionLaunch + "&message_type=content_review";
                             }

assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java

@@ -165,7 +165,7 @@
 import org.sakaiproject.authz.api.Role;
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.api.SecurityService;
-import org.tsugi.basiclti.BasicLTIUtil;
+import org.tsugi.lti.LTIUtil;
 import org.tsugi.lti13.LTICustomVars;
 import org.tsugi.lti13.DeepLinkResponse;
 import org.tsugi.lti13.LTI13Util;
@@ -256,7 +256,7 @@
 import org.sakaiproject.util.comparator.AlphaNumericComparator;
 import org.sakaiproject.util.comparator.UserSortNameComparator;
 import org.sakaiproject.lti.api.LTIService;
-import org.sakaiproject.basiclti.util.SakaiBLTIUtil;
+import org.sakaiproject.lti.util.SakaiLTIUtil;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -1998,12 +1998,12 @@ private String build_view_external_tool_launch_context(VelocityPortlet portlet,
                 }
 
                 // Ignore the Content Item - use the value in the assignment if tool allows
-                context.put("newpage", Boolean.valueOf(SakaiBLTIUtil.getNewpage(tool, null, newpage)));
-                context.put("height",SakaiBLTIUtil.getFrameHeight(tool, content, "1200px"));
+                context.put("newpage", Boolean.valueOf(SakaiLTIUtil.getNewpage(tool, null, newpage)));
+                context.put("height",SakaiLTIUtil.getFrameHeight(tool, content, "1200px"));
                 context.put("browser-feature-allow", String.join(";", serverConfigurationService.getStrings("browser.feature.allow")));
 
                 // Copy title, description, and dates from Assignment to content if mis-match
-                int protect = SakaiBLTIUtil.getInt(content.get(LTIService.LTI_PROTECT));
+                int protect = SakaiLTIUtil.getInt(content.get(LTIService.LTI_PROTECT));
                 String assignmentTitle = StringUtils.trimToEmpty(assignment.getTitle());
                 String assignmentDesc = StringUtils.trimToEmpty(assignment.getInstructions());
                 Instant visibleDate = assignment.getVisibleDate();
@@ -2021,7 +2021,7 @@ private String build_view_external_tool_launch_context(VelocityPortlet portlet,
                 String placement_secret = StringUtils.trimToNull((String) content.get(LTIService.LTI_PLACEMENTSECRET));
 
                 String content_settings = (String) content.get(LTIService.LTI_SETTINGS);
-                JSONObject content_json = BasicLTIUtil.parseJSONObject(content_settings);
+                JSONObject content_json = LTIUtil.parseJSONObject(content_settings);
                 String contentVisibleDate = StringUtils.trimToEmpty((String) content_json.get(DeepLinkResponse.RESOURCELINK_AVAILABLE_STARTDATETIME));
                 String contentOpenDate = StringUtils.trimToEmpty((String) content_json.get(DeepLinkResponse.RESOURCELINK_SUBMISSION_STARTDATETIME));
                 String contentDueDate = StringUtils.trimToEmpty((String) content_json.get(DeepLinkResponse.RESOURCELINK_SUBMISSION_ENDDATETIME));
@@ -2045,7 +2045,7 @@ private String build_view_external_tool_launch_context(VelocityPortlet portlet,
                     content_json.put(LTIService.LTI_DESCRIPTION, assignmentDesc);
                     content_json.put(LTIService.LTI_PROTECT, new Integer(1));
 
-                    // Copy assignment specific custom parameter substitutions to pass into SakaiBLTIUtil
+                    // Copy assignment specific custom parameter substitutions to pass into SakaiLTIUtil
                     content_json.put(DeepLinkResponse.RESOURCELINK_AVAILABLE_STARTDATETIME, assignmentVisibleDate);
                     content_json.put(DeepLinkResponse.RESOURCELINK_SUBMISSION_STARTDATETIME, assignmentOpenDate);
                     content_json.put(DeepLinkResponse.RESOURCELINK_AVAILABLE_ENDDATETIME, assignmentDueDate);
@@ -2061,8 +2061,8 @@ private String build_view_external_tool_launch_context(VelocityPortlet portlet,
                 }
 
                 // Unlock this assignment for one launch...
-                String launch_code_key = SakaiBLTIUtil.getLaunchCodeKey(content);
-                String launch_code = SakaiBLTIUtil.getLaunchCode(content);
+                String launch_code_key = SakaiLTIUtil.getLaunchCodeKey(content);
+                String launch_code = SakaiLTIUtil.getLaunchCode(content);
                 if ( launch_code_key != null && launch_code != null ) {
                     Session session = sessionManager.getCurrentSession();
                     session.setAttribute(launch_code_key, launch_code);
@@ -3634,7 +3634,7 @@ protected void setAssignmentFormContext(SessionState state, Context context) {
         }
 
         Placement placement = toolManager.getCurrentPlacement();
-        // String contentReturn = SakaiBLTIUtil.getOurServerUrl() + "/portal/tool/" + placement.getId() +
+        // String contentReturn = SakaiLTIUtil.getOurServerUrl() + "/portal/tool/" + placement.getId() +
         String contentReturn = serverConfigurationService.getToolUrl() + "/" + placement.getId()
                 + "/sakai.lti.admin.helper.helper"
                 + "?panel=AssignmentsMain"
@@ -10343,7 +10343,7 @@ public void doEdit_assignment(RunData data) {
                             Map<String, Object> tool = ltiService.getTool(toolKey, site.getId());
                             String toolTitle = (String) tool.get(LTIService.LTI_TITLE);
                             state.setAttribute(NEW_ASSIGNMENT_CONTENT_TITLE, toolTitle);
-                            Long toolNewpage = SakaiBLTIUtil.getLong(tool.get(LTIService.LTI_NEWPAGE));
+                            Long toolNewpage = SakaiLTIUtil.getLong(tool.get(LTIService.LTI_NEWPAGE));
                             state.setAttribute(NEW_ASSIGNMENT_CONTENT_TOOL_NEWPAGE, toolNewpage);
                         }
                     } catch(org.sakaiproject.exception.IdUnusedException e ) {

assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm

@@ -579,7 +579,7 @@
         </div>
 		<div class="form-group row">
 			<div class="col-sm-6">
-                    <a title="$tlang.getString('external.tool.find')" target="sakai-basiclti-admin-iframe" onclick="showExternalIframe(this.title, false);"
+                    <a title="$tlang.getString('external.tool.find')" target="sakai-lti-admin-iframe" onclick="showExternalIframe(this.title, false);"
                         class="btn btn-primary" role="button"
                         href="$findExternalToolUrl">$tlang.getString('external.tool.find')</a>
             </div>
@@ -598,7 +598,7 @@
 		</fieldset>
         </div>
         <div id="external-modal-iframe-div" style="display:none" tabindex="-1" role="dialog">
-            <iframe name="sakai-basiclti-admin-iframe" id="sakai-basiclti-admin-iframe" src="/library/image/sakai/spinner.gif" tabindex="0"></iframe>
+            <iframe name="sakai-lti-admin-iframe" id="sakai-lti-admin-iframe" src="/library/image/sakai/spinner.gif" tabindex="0"></iframe>
         </div>
 <style>
 .ui-widget-overlay.ui-front {
@@ -617,25 +617,25 @@ function showExternalIframe(title, doreload) {
         open: function() {
             $("#external-modal-iframe-div").dialog("option", "width", modalDialogWidth());
             $("#external-modal-iframe-div").dialog("option", "height", modalDialogHeight());
-            $('#sakai-basiclti-admin-iframe').attr('width', '100%');
-            $('#sakai-basiclti-admin-iframe').attr('height', '100%');
+            $('#sakai-lti-admin-iframe').attr('width', '100%');
+            $('#sakai-lti-admin-iframe').attr('height', '100%');
             // https://stackoverflow.com/questions/1202079/prevent-jquery-ui-dialog-from-setting-focus-to-first-textbox
             $(this).parent().focus();
         },
         close: function() {
             if ( doreload ) {
                 location.reload();
             } else {
-                $('#sakai-basiclti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
+                $('#sakai-lti-admin-iframe').attr('src','/library/image/sakai/spinner.gif');
             }
         }
     });
 
     $(window).resize(function() {
         $("#external-modal-iframe-div").dialog("option", "width", modalDialogWidth());
         $("#external-modal-iframe-div").dialog("option", "height", modalDialogHeight());
-        $('#sakai-basiclti-admin-iframe').attr('width', '100%');
-        $('#sakai-basiclti-admin-iframe').attr('height', '100%');
+        $('#sakai-lti-admin-iframe').attr('width', '100%');
+        $('#sakai-lti-admin-iframe').attr('height', '100%');
     });
 }
 //]]>

config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

@@ -2241,12 +2241,12 @@
 # DEFAULT: false
 # lti.provider.enabled=true
 
-# BasicLTI Provider-enabled tools
+# LTI Provider-enabled tools
 # Colon separated list of tool ids
 # DEFAULT: none
 # lti.provider.allowedtools=sakai.announcements:sakai.singleuser:sakai.assignment.grades:blogger:sakai.dropbox:sakai.mailbox:sakai.forums:sakai.gradebook.tool:sakai.podcasts:sakai.poll:sakai.resources:sakai.schedule:sakai.samigo:sakai.rwiki
 
-# BasicLTI Provider secret - you must provide a password
+# LTI Provider secret - you must provide a password
 # DEFAULT: none (null)
 # lti.provider.[hostname].secret=
 
@@ -5579,7 +5579,7 @@ rubrics.integration.token-secret=12345678900909091234
 # They don't have any "--- BEGIN" headers and are not broken into short lines but they contain the
 # same material as PEM format keys with the headers.
 # You can see sample Java code to generate these keys in Java in:
-# basiclti/tsugi-util/src/test/org/tsugi/lti13/LTI13UtilTest.java
+# lti/tsugi-util/src/test/org/tsugi/lti13/LTI13UtilTest.java
 # DEFAULT: None
 # lti.advantage.lti13servlet.public=MIIBIjANBgkqhkidjkssdhjk...
 # lti.advantage.lti13servlet.private=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYw...
@@ -5909,15 +5909,15 @@ rubrics.integration.token-secret=12345678900909091234
 
 # Override the default outbound Sakai role to LTI role mapping. The LTI roles are documented at https://www.imsglobal.org/spec/lti/v1p3/#role-vocabularies
 # lti.outbound.role.map
-# DEFAULT: The default is a long set of roles defined in the SakaiBLTIUtil class and documented in basiclti/docs/LTIROLES.md
+# DEFAULT: The default is a long set of roles defined in the SakaiLTIUtil class and documented in lti/docs/LTIROLES.md
 
 # Override the default inbound LTI role to Sakai role mapping. The LTI roles are documented at https://www.imsglobal.org/spec/lti/v1p3/#role-vocabularies
 # lti.inbound.role.map
-# DEFAULT: The default is a long set of roles defined in the SakaiBLTIUtil class and documented in basiclti/docs/LTIROLES.md
+# DEFAULT: The default is a long set of roles defined in the SakaiLTIUtil class and documented in lti/docs/LTIROLES.md
 
 # Override the legacy LTI roles to modern LTI roles. The LTI roles are documented at https://www.imsglobal.org/spec/lti/v1p3/#role-vocabularies
 # lti.legacy.role.map
-# DEFAULT: The default is a set of roles defined in the SakaiBLTIUtil class.  These are roles like 'urn:lti:instrole:ims/lis/Administrator' from LTI 1.0.  The default setting is likely all you need.
+# DEFAULT: The default is a set of roles defined in the SakaiLTIUtil class.  These are roles like 'urn:lti:instrole:ims/lis/Administrator' from LTI 1.0.  The default setting is likely all you need.
 
 # In order to protect "at rest" LTI 1.1 secrets stored in the database, Sakai provides
 # a property to encrypt the secrets.  # The string can be a passphrase or

gradebookng/impl/pom.xml

@@ -88,14 +88,14 @@
             <artifactId>sakai-plus-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

help/help/src/sakai_screensteps_plusAdminAdministratorGuide/howdoIinstallSakaiPlusinmyenterpriseLMS.html

@@ -104,7 +104,7 @@ <h2 class="step-title screensteps-heading">Enter the information for your new te
 <strong>Realm Template: </strong>This specifies an existing Sakai realm (for example, !site.template.lti) which will be copied to set the roles and permissions used when creating a new site when Sakai Plus receives an incoming site. The default is !site.template.lti unless it is changed using the plus.new.site.realm Sakai property.</li>
 <li>
 <strong>Inbound Role Map:</strong><em> </em>This field allows for overriding the default mapping from incoming LTI roles to Sakai roles. See this documentation for detail on how role mapping works and the format for role mapping entries.<ol style="list-style-type:lower-alpha;">
-<li><a href="https://github.com/sakaiproject/sakai/blob/master/basiclti/docs/LTIROLES.md">Sakai to LTI Role Mapping</a></li>
+<li><a href="https://github.com/sakaiproject/sakai/blob/master/lti/docs/LTIROLES.md">Sakai to LTI Role Mapping</a></li>
 </ol>
 </li>
 <li>

lessonbuilder/tool/pom.xml

@@ -20,16 +20,16 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-api</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-util</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.basiclti</groupId>
-            <artifactId>basiclti-common</artifactId>
+            <groupId>org.sakaiproject.lti</groupId>
+            <artifactId>lti-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.portal</groupId>