Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -r0761df64c22d4bca1649836fda23e4526282498b -r25789285b22f2b11797f61c46e176abeffb3b2cf
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 0761df64c22d4bca1649836fda23e4526282498b)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 25789285b22f2b11797f61c46e176abeffb3b2cf)
@@ -12,7 +12,7 @@
         <archive path="/lams_build/lib/autopatch/autopatch-1.4.2-lams.jar"/>
         <archive path="/lams_build/lib/autopatch/discovery-1.0.5-lams.jar"/>
         <archive path="/lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar" source="/3rdParty_sources/basiclti-util/src/main/java"/>
-        <archive path="/lams_build/lib/basiclti-util/oauth-20100527.jar"/>
+        <archive path="/lams_build/lib/basiclti-util/oauth-20100527.jar" source="/3rdParty_sources/oauth"/>
         <archive path="/lams_build/lib/basiclti-util/oauth-provider-20100527.jar"/>
         <archive path="/lams_build/lib/basiclti-util/signpost-commonshttp4-1.2.1.2.jar"/>
         <archive path="/lams_build/lib/basiclti-util/signpost-core-1.2.1.2.jar"/>
Index: lams_build/build_base.xml
===================================================================
diff -u -ra9c813efdd6daf5f1f9995a9efe735b28a9d2709 -r25789285b22f2b11797f61c46e176abeffb3b2cf
--- lams_build/build_base.xml	(.../build_base.xml)	(revision a9c813efdd6daf5f1f9995a9efe735b28a9d2709)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision 25789285b22f2b11797f61c46e176abeffb3b2cf)
@@ -60,6 +60,7 @@
 			<include name="javax/activation/api/main/activation-*.jar" />
 			<include name="javax/persistence/api/main/javax.persistence-api-*.jar" />
 			<include name="org/hibernate/main/hibernate-core-*.Final.jar" />
+			<include name="org/bouncycastle/main/bcprov-*.jar" />
 		</fileset>
 		<!-- Optional project own libraries -->
 		<fileset dir="lib" erroronmissingdir="false">
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -ra9c813efdd6daf5f1f9995a9efe735b28a9d2709 -r25789285b22f2b11797f61c46e176abeffb3b2cf
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision a9c813efdd6daf5f1f9995a9efe735b28a9d2709)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 25789285b22f2b11797f61c46e176abeffb3b2cf)
@@ -58,6 +58,7 @@
       <module name="net.gjerull.etherpad.client" export="true" />
   	  <module name="com.codahale.passpol" export="true" />
   	  <module name="com.zaxxer.sparsebits" export="true" />
+  	  <module name="org.bouncycastle" export="true" />
       
       <!-- Import META-INF/services for ServiceLoader impls as well
       <module name="myservicemodule" services="import"/>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220126.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220126.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220126.sql	(revision 25789285b22f2b11797f61c46e176abeffb3b2cf)
@@ -0,0 +1,27 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+--LDEV-5277 Add LTI Advantage model
+ALTER TABLE lams_ext_server_lesson_map ADD COLUMN lti_adv_deployment_id VARCHAR(255),
+									   ADD COLUMN lti_adv_grading_type  VARCHAR(10),
+									   ADD COLUMN lti_adv_grading_url   VARCHAR(255);
+									   
+ALTER TABLE lams_ext_server_org_map    ADD COLUMN lti_adv_issuer 				VARCHAR(64),
+									   ADD COLUMN lti_adv_client_id 			VARCHAR(64),
+									   ADD COLUMN lti_adv_platform_key_set_url 	VARCHAR(255),
+									   ADD COLUMN lti_adv_oidc_auth_url			VARCHAR(255),
+									   ADD COLUMN lti_adv_access_token_url		VARCHAR(255),
+									   ADD COLUMN lti_adv_tool_key_set_url		VARCHAR(255),
+									   ADD COLUMN lti_adv_tool_key_id			VARCHAR(32),
+									   ADD COLUMN lti_adv_public_key			TEXT,
+									   ADD COLUMN lti_adv_private_key			TEXT;
+									
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
===================================================================
diff -u -r058adba867d104c2148e289a3dacda7f22f6ac60 -r25789285b22f2b11797f61c46e176abeffb3b2cf
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	(.../ExtServer.java)	(revision 058adba867d104c2148e289a3dacda7f22f6ac60)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	(.../ExtServer.java)	(revision 25789285b22f2b11797f61c46e176abeffb3b2cf)
@@ -122,6 +122,33 @@
     @Column(name = "user_id_parameter_name")
     private String userIdParameterName;
 
+    @Column(name = "lti_adv_issuer")
+    private String issuer;
+
+    @Column(name = "lti_adv_client_id")
+    private String clientId;
+
+    @Column(name = "lti_adv_platform_key_set_url")
+    private String platformKeySetUrl;
+
+    @Column(name = "lti_adv_oidc_auth_url")
+    private String oidcAuthUrl;
+
+    @Column(name = "lti_adv_access_token_url")
+    private String accessTokenUrl;
+
+    @Column(name = "lti_adv_tool_key_set_url")
+    private String toolKeySetUrl;
+
+    @Column(name = "lti_adv_tool_key_id")
+    private String toolKeyId;
+
+    @Column(name = "lti_adv_public_key")
+    private String publicKey;
+
+    @Column(name = "lti_adv_private_key")
+    private String privateKey;
+
     public ExtServer() {
 	timeToLiveLoginRequest = 80;
 	userIdParameterName = "user_id";
@@ -356,4 +383,76 @@
     public void setUserIdParameterName(String userIdParameterName) {
 	this.userIdParameterName = userIdParameterName;
     }
+
+    public String getIssuer() {
+	return issuer;
+    }
+
+    public void setIssuer(String issuer) {
+	this.issuer = issuer;
+    }
+
+    public String getClientId() {
+	return clientId;
+    }
+
+    public void setClientId(String clientId) {
+	this.clientId = clientId;
+    }
+
+    public String getPlatformKeySetUrl() {
+	return platformKeySetUrl;
+    }
+
+    public void setPlatformKeySetUrl(String platformKeySetUrl) {
+	this.platformKeySetUrl = platformKeySetUrl;
+    }
+
+    public String getOidcAuthUrl() {
+	return oidcAuthUrl;
+    }
+
+    public void setOidcAuthUrl(String oidcAuthUrl) {
+	this.oidcAuthUrl = oidcAuthUrl;
+    }
+
+    public String getAccessTokenUrl() {
+	return accessTokenUrl;
+    }
+
+    public void setAccessTokenUrl(String accessTokenUrl) {
+	this.accessTokenUrl = accessTokenUrl;
+    }
+
+    public String getToolKeySetUrl() {
+	return toolKeySetUrl;
+    }
+
+    public void setToolKeySetUrl(String toolKeySetUrl) {
+	this.toolKeySetUrl = toolKeySetUrl;
+    }
+
+    public String getToolKeyId() {
+	return toolKeyId;
+    }
+
+    public void setToolKeyId(String toolKeyId) {
+	this.toolKeyId = toolKeyId;
+    }
+
+    public String getPublicKey() {
+	return publicKey;
+    }
+
+    public void setPublicKey(String publicKey) {
+	this.publicKey = publicKey;
+    }
+
+    public String getPrivateKey() {
+	return privateKey;
+    }
+
+    public void setPrivateKey(String privateKey) {
+	this.privateKey = privateKey;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java
===================================================================
diff -u -r35ddbc33e43c3315e9edb0a53346c79f02ccb28c -r25789285b22f2b11797f61c46e176abeffb3b2cf
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java	(.../ExtServerLessonMap.java)	(revision 35ddbc33e43c3315e9edb0a53346c79f02ccb28c)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java	(.../ExtServerLessonMap.java)	(revision 25789285b22f2b11797f61c46e176abeffb3b2cf)
@@ -57,6 +57,15 @@
     @JoinColumn(name = "ext_server_org_map_id")
     private ExtServer extServer;
 
+    @Column(name = "lti_adv_deployment_id")
+    private String deploymentId;
+
+    @Column(name = "lti_adv_grading_type")
+    private String gradingType;
+
+    @Column(name = "lti_adv_grading_url")
+    private String gradingUrl;
+
     public ExtServerLessonMap() {
     }
 
@@ -98,4 +107,28 @@
     public void setExtServer(ExtServer extServer) {
 	this.extServer = extServer;
     }
+
+    public String getDeploymentId() {
+	return deploymentId;
+    }
+
+    public void setDeploymentId(String deploymentId) {
+	this.deploymentId = deploymentId;
+    }
+
+    public String getGradingType() {
+	return gradingType;
+    }
+
+    public void setGradingType(String gradingType) {
+	this.gradingType = gradingType;
+    }
+
+    public String getGradingUrl() {
+	return gradingUrl;
+    }
+
+    public void setGradingUrl(String gradingUrl) {
+	this.gradingUrl = gradingUrl;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
===================================================================
diff -u -r3a817bfe8c85ab09ac85d7f7c8594aaf66a8bae8 -r25789285b22f2b11797f61c46e176abeffb3b2cf
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(.../IIntegrationService.java)	(revision 3a817bfe8c85ab09ac85d7f7c8594aaf66a8bae8)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(.../IIntegrationService.java)	(revision 25789285b22f2b11797f61c46e176abeffb3b2cf)
@@ -112,6 +112,8 @@
      */
     ExtServer getExtServer(String serverId);
 
+    ExtServer getExtServer(String ltiAdvantageIssuer, String ltiAdvantageClientId);
+
     /**
      * Returns ExtServerLessonMap for the LTI Tool Consumer identified by serverId.
      *
@@ -270,4 +272,5 @@
 	    String extCourseName, String parentOrgId, Boolean prefix) throws UserInfoValidationException;
 
     void updateUserRoles(User user, Organisation org, String method);
+
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
diff -u -r3a817bfe8c85ab09ac85d7f7c8594aaf66a8bae8 -r25789285b22f2b11797f61c46e176abeffb3b2cf
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 3a817bfe8c85ab09ac85d7f7c8594aaf66a8bae8)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 25789285b22f2b11797f61c46e176abeffb3b2cf)
@@ -127,6 +127,19 @@
     }
 
     @Override
+    public ExtServer getExtServer(String ltiAdvantageIssuer, String ltiAdvantageClientId) {
+	Map<String, Object> properties = new HashMap<>();
+	properties.put("issuer", ltiAdvantageIssuer);
+	properties.put("clientId", ltiAdvantageClientId);
+	List<ExtServer> list = service.findByProperties(ExtServer.class, properties, true);
+	if (list == null || list.size() == 0) {
+	    return null;
+	} else {
+	    return list.get(0);
+	}
+    }
+
+    @Override
     public ExtCourseClassMap getExtCourseClassMap(Integer sid, String extCourseId) {
 	Map<String, Object> properties = new HashMap<>();
 	properties.put("courseid", extCourseId);
@@ -671,7 +684,7 @@
 
 	    lessonFinishCallbackUrl = lessonFinishCallbackUrl.replaceAll("%activityId%",
 		    finishedActivityId == null ? "" : finishedActivityId.toString());
-	    
+
 	    log.debug(lessonFinishCallbackUrl);
 	}
 	// in case of LTI Tool Consumer - pushMarkToIntegratedServer() method will be invoked from GradebookService on mark update