Skip to content

Commit

Permalink
SAK-46983 LTI rename visible "basiclti" to "lti" (sakaiproject#10922)
Browse files Browse the repository at this point in the history
* SAK-46983 - Rename visible "basislti" -> "lti"

This renames easily changed visible basic lti values to lti

This does not reorganize the siurce folders or package names

* Fix review comments from Earle and Brian

* Another tranche of name changing
  • Loading branch information
csev authored Oct 9, 2022
1 parent 0236b05 commit 9ed1339
Show file tree
Hide file tree
Showing 103 changed files with 301 additions and 333 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ public ActionReturn getGradableForSite(EntityView view , Map<String, Object> par
Integer contentKey = assignment.getContentId();
if ( contentKey != null ) {
// Fall back launch for SimpleAssignments without any user-submission
simpleAssignment.ltiGradableLaunch = "/access/basiclti/site/" + siteId + "/content:" + contentKey;
simpleAssignment.ltiGradableLaunch = "/access/lti/site/" + siteId + "/content:" + contentKey;
Map<String, Object> content = ltiService.getContent(contentKey.longValue(), site.getId());
String contentItem = StringUtils.trimToEmpty((String) content.get(LTIService.LTI_CONTENTITEM));

Expand All @@ -716,7 +716,7 @@ public ActionReturn getGradableForSite(EntityView view , Map<String, Object> par
String ltiSubmissionLaunch = null;
for ( SimpleSubmitter submitter: submission.submitters ) {
if ( submitter.id != null ) {
ltiSubmissionLaunch = "/access/basiclti/site/" + siteId + "/content:" + contentKey + "?for_user=" + submitter.id;
ltiSubmissionLaunch = "/access/lti/site/" + siteId + "/content:" + contentKey + "?for_user=" + submitter.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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3479,7 +3479,7 @@ protected void setAssignmentFormContext(SessionState state, Context context) {
Placement placement = toolManager.getCurrentPlacement();
// String contentReturn = SakaiBLTIUtil.getOurServerUrl() + "/portal/tool/" + placement.getId() +
String contentReturn = serverConfigurationService.getToolUrl() + "/" + placement.getId()
+ "/sakai.basiclti.admin.helper.helper"
+ "/sakai.lti.admin.helper.helper"
+ "?panel=AssignmentsMain"
+ "&flow=assignment";
context.put("findExternalToolUrl", contentReturn);
Expand Down
8 changes: 4 additions & 4 deletions basiclti/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ BASE_URL/portal/site/SITE_ID/tool/TOOL_ID?panel=ToolSite&sakai_action=doSearch&f

New URLs used in export service :
--------------------------------------------------------------------------------
- CSV : BASE_URL/access/basiclti/site/SITE_ID/export:CSV
- Excel : BASE_URL/access/basiclti/site/SITE_ID/export:EXCEL
- CSV : BASE_URL/access/lti/site/SITE_ID/export:CSV
- Excel : BASE_URL/access/lti/site/SITE_ID/export:EXCEL

You can also specify a filter with a TOOL_ID
- CSV : BASE_URL/access/basiclti/site/SITE_ID/export:CSV:TOOL_ID
- Excel : BASE_URL/access/basiclti/site/SITE_ID/export:EXCEL:TOOL_ID
- CSV : BASE_URL/access/lti/site/SITE_ID/export:CSV:TOOL_ID
- Excel : BASE_URL/access/lti/site/SITE_ID/export:EXCEL:TOOL_ID
2 changes: 1 addition & 1 deletion basiclti/basiclti-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>23-SNAPSHOT</version>
</parent>

<name>BasicLTI API (basiclti-api)</name>
<name>LTI API (basiclti-api)</name>
<groupId>org.sakaiproject.basiclti</groupId>
<artifactId>basiclti-api</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public interface LTIService extends LTISubstitutionsFilter {

/** Constants */
String ADMIN_SITE = "!admin";
String LAUNCH_PREFIX = "/access/basiclti/site/";
String LAUNCH_PREFIX = "/access/lti/site/";

/**
* This string starts the references to resources in this service.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
/**
* Notes:
*
* This program is directly exposed as a URL to receive IMS Basic LTI messages
* This program is directly exposed as a URL to receive IMS LTI messages
* so it must be carefully reviewed and any changes must be looked at carefully.
* Here are some issues:
*
Expand Down Expand Up @@ -150,7 +150,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
protected void doPostForm(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String ipAddress = request.getRemoteAddr();

log.debug("Basic LTI Service Form request from IP={}", ipAddress);
log.debug("LTI Service Form request from IP={}", ipAddress);

String allowOutcomes = ServerConfigurationService.getString(
SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED, SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED_DEFAULT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2197,9 +2197,9 @@ private void resultsForAssignment(String signed_placement, Site site, Assignment

// Indicate "who" is reading this grade - needs to be a real user account
String gb_user_id = ServerConfigurationService.getString(
"basiclti.outcomes.userid", "admin");
"lti.outcomes.userid", "admin");
String gb_user_eid = ServerConfigurationService.getString(
"basiclti.outcomes.usereid", gb_user_id);
"lti.outcomes.usereid", gb_user_id);
sess.setUserId(gb_user_id);
sess.setUserEid(gb_user_eid);

Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-common/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@

===============================================================================

The BasicLTI Utilities (basiclti-util) distribution includes a number of subcomponents
These Utilities 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.
Expand Down
10 changes: 0 additions & 10 deletions basiclti/basiclti-common/NOTICE

This file was deleted.

6 changes: 3 additions & 3 deletions basiclti/basiclti-common/README
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
IMS Global Learning Consortium BasicLTI Utilities
Sakai LTI Utilities

What is it?
-----------

BasicLTI Utilities are a set of utility classes to aid in the development
of BasicLTI consumers and providers. They deal with much of the heavy lifting
These Utilities are a set of utility classes to aid in the development
of LTI consumers and providers. They deal with much of the heavy lifting
and make the process more opaque to the developer.

Licensing
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>23-SNAPSHOT</version>
</parent>

<name>BasicLTI Common (basiclti-common)</name>
<name>LTI Common (basiclti-common)</name>
<groupId>org.sakaiproject.basiclti</groupId>
<artifactId>basiclti-common</artifactId>
<packaging>jar</packaging>
Expand Down
Loading

0 comments on commit 9ed1339

Please sign in to comment.