Reorganize java initialization

Author: jbeers

ModuleConfig.cfc

@@ -52,11 +52,7 @@ component {
 				// 	accessTokenEndpoint : "https://www.googleapis.com/oauth2/v4/token",
 				// 	redirectUri         : getSystemSetting( key = "GOOGLE_REDIRECT_URI", defaultValue = "" )
 				// }
-			],
-			cbjavaloader : {
-				loadPaths         : [ modulePath & "/lib" ],
-				parentClassLoader : createObject( "java", "java.lang.ClassLoader" ).getSystemClassLoader()
-			}
+			]
 		};
 
 		interceptorSettings = { customInterceptionPoints : [ "CBSSOMissingProvider", "CBSSOAuthorization" ] };
@@ -79,6 +75,8 @@ component {
 					interceptorName       = "cbsso@global"
 				);
 		}
+
+		wireBox.getInstance( "loader@cbjavaloader" ).appendPaths( modulePath & "/lib" );
 	}
 
 	/**

box.json

@@ -1,6 +1,6 @@
 {
     "name": "cbsso",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "location": "https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsso/@build.version@/cbsso-@build.version@.zip",
     "author": "Ortus Solutions <info@ortussolutions.com>",
     "homepage": "https://github.com/coldbox-modules/cbsso",

models/providers/MicrosoftSAMLProvider.cfc

@@ -9,8 +9,8 @@ component accessors="true" implements="cbsso.models.ISSOIntegrationProvider" {
 	property name="expectedIssuer";
 
 	property name="wirebox"               inject="wirebox";
-	property name="AuthNRequestGenerator" inject="javaloader:cbsso.opensaml.AuthNRequestGenerator";
-	property name="responseValidator"     inject="javaloader:cbsso.opensaml.AuthResponseValidator";
+	property name="AuthNRequestGenerator";
+	property name="responseValidator";
 
 	variables.name = "Microsoft Entra";
 
@@ -148,4 +148,16 @@ component accessors="true" implements="cbsso.models.ISSOIntegrationProvider" {
 		)[ 1 ].xmlchildren[ 1 ].xmltext;
 	}
 
+	private void function initializeOpenSAMLLib(){
+		if( !isNull( variables.AuthNRequestGenerator ) ){
+			return;
+		}
+
+		variables.AuthNRequestGenerator = wirebox.getInstance( "javaloader:cbsso.opensaml.AuthNRequestGenerator" );
+		variables.responseValidator = wirebox.getInstance( "javaloader:cbsso.opensaml.AuthResponseValidator" );
+		variables.AuthNRequestGenerator.initOpenSAML();
+		
+		responseValidator.cacheCerts( variables.federationMetadataURL );
+	}
+
 }